[gtk+/xi2: 143/148] GtkLabel: use gdk_window_get_device_position() to find out device coordinates.
- From: Carlos Garnacho <carlosg src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gtk+/xi2: 143/148] GtkLabel: use gdk_window_get_device_position() to find out device coordinates.
- Date: Thu, 10 Dec 2009 21:13:43 +0000 (UTC)
commit e4d91f3cfc7fa091158142f34926669a581503e1
Author: Carlos Garnacho <carlos gnome org>
Date: Wed Dec 9 23:25:07 2009 +0100
GtkLabel: use gdk_window_get_device_position() to find out device coordinates.
A useless gdk_window_get_pointer() call was also removed, as the coordinates
are those from the event.
gtk/gtklabel.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index acf7f53..3fb069f 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -4235,7 +4235,6 @@ gtk_label_motion (GtkWidget *widget,
GtkLabel *label = GTK_LABEL (widget);
GtkLabelSelectionInfo *info = label->select_info;
gint index;
- gint x, y;
if (info == NULL)
return FALSE;
@@ -4248,8 +4247,7 @@ gtk_label_motion (GtkWidget *widget,
if (info->selection_anchor == info->selection_end)
{
- gdk_window_get_pointer (event->window, &x, &y, NULL);
- if (get_layout_index (label, x, y, &index))
+ if (get_layout_index (label, event->x, event->y, &index))
{
for (l = info->links; l != NULL; l = l->next)
{
@@ -4291,8 +4289,6 @@ gtk_label_motion (GtkWidget *widget,
if ((event->state & GDK_BUTTON1_MASK) == 0)
return FALSE;
- gdk_window_get_pointer (info->window, &x, &y, NULL);
-
if (info->in_drag)
{
if (gtk_drag_check_threshold (widget,
@@ -4317,6 +4313,9 @@ gtk_label_motion (GtkWidget *widget,
}
else
{
+ gint x, y;
+
+ gdk_window_get_device_position (info->window, event->device, &x, &y, NULL);
get_layout_index (label, x, y, &index);
if (info->select_words)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]