Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

textview: Fix placement of Emoji chooser

Browse Source 
If the selection extends beyond the visible range,
place the Emoji chooser over the center of the window.

Fixes: #3109
This commit is contained in:
Matthias Clasen
2020-09-02 08:04:15 -04:00
parent 70c5dee968
commit 9512e461d5
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gtk/gtktextview.c
View File

@@ -9623,6 +9623,7 @@ gtk_text_view_insert_emoji (GtkTextView *text_view)
GtkWidget *chooser; GtkWidget *chooser;
GtkTextIter iter; GtkTextIter iter;
GdkRectangle rect; GdkRectangle rect;
GdkRectangle rect2;
GtkTextBuffer *buffer; GtkTextBuffer *buffer;
if (gtk_widget_get_ancestor (GTK_WIDGET (text_view), GTK_TYPE_EMOJI_CHOOSER) != NULL) if (gtk_widget_get_ancestor (GTK_WIDGET (text_view), GTK_TYPE_EMOJI_CHOOSER) != NULL)
@@ -9639,6 +9640,7 @@ gtk_text_view_insert_emoji (GtkTextView *text_view)
} }
buffer = get_buffer (text_view); buffer = get_buffer (text_view);
gtk_text_buffer_get_iter_at_mark (buffer, &iter, gtk_text_buffer_get_iter_at_mark (buffer, &iter,
gtk_text_buffer_get_insert (buffer)); gtk_text_buffer_get_insert (buffer));
@@ -9646,6 +9648,18 @@ gtk_text_view_insert_emoji (GtkTextView *text_view)
gtk_text_view_buffer_to_window_coords (text_view, GTK_TEXT_WINDOW_TEXT, gtk_text_view_buffer_to_window_coords (text_view, GTK_TEXT_WINDOW_TEXT,
rect.x, rect.y, &rect.x, &rect.y); rect.x, rect.y, &rect.x, &rect.y);
_text_window_to_widget_coords (text_view, &rect.x, &rect.y); _text_window_to_widget_coords (text_view, &rect.x, &rect.y);
gtk_text_view_get_visible_rect (text_view, &rect2);
gtk_text_view_buffer_to_window_coords (text_view, GTK_TEXT_WINDOW_TEXT,
rect2.x, rect2.y, &rect2.x, &rect2.y);
_text_window_to_widget_coords (text_view, &rect2.x, &rect2.y);
if (!gdk_rectangle_intersect (&rect2, &rect, &rect))
{
rect.x = rect2.width / 2;
rect.y = rect2.height / 2;
rect.width = 0;
rect.height = 0;
}
gtk_popover_set_pointing_to (GTK_POPOVER (chooser), &rect); gtk_popover_set_pointing_to (GTK_POPOVER (chooser), &rect);