AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

label: Fix get_layout_index

Browse Source 
Properly translate the given coordinates to layout coordinates. Fixes
clicking links and selecting text.
This commit is contained in:
Timm Bäder 2017-07-02 14:16:09 +02:00 committed by Matthias Clasen
parent dd9c3fc8ab
commit e276f1e844
1 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gtk/gtklabel.c
View File

@ -4183,25 +4183,6 @@ gtk_label_unmap (GtkWidget *widget)
GTK_WIDGET_CLASS (gtk_label_parent_class)->unmap (widget);
}
static void
window_to_layout_coords (GtkLabel *label,
gint *x,
gint *y)
{
GtkAllocation allocation;
gint lx, ly;
/* get layout location in widget->window coords */
get_layout_location (label, &lx, &ly);
_gtk_widget_get_allocation (GTK_WIDGET (label), &allocation);
*x += allocation.x; /* go to widget->window */
*x -= lx; /* go to layout */
*y += allocation.y; /* go to widget->window */
*y -= ly; /* go to layout */
}
static gboolean
get_layout_index (GtkLabel *label,
gint x,
@ -4213,12 +4194,16 @@ get_layout_index (GtkLabel *label,
const gchar *cluster;
const gchar *cluster_end;
gboolean inside;
int lx, ly;
*index = 0;
gtk_label_ensure_layout (label);
get_layout_location (label, &lx, &ly);
window_to_layout_coords (label, &x, &y);
/* Translate x/y to layout position */
x -= lx;
y -= ly;
x *= PANGO_SCALE;
y *= PANGO_SCALE;