[gimp/gtk3-port: 246/249] app: use gdk_device_get_position() inetad of gdk_display_get_pointer()
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gtk3-port: 246/249] app: use gdk_device_get_position() inetad of gdk_display_get_pointer()
- Date: Mon, 21 Mar 2011 20:57:56 +0000 (UTC)
commit c6ce9ad5b7598199c7e9d4e445c818b34391a6b0
Author: Michael Natterer <mitch gimp org>
Date: Sat Mar 5 21:29:21 2011 +0100
app: use gdk_device_get_position() inetad of gdk_display_get_pointer()
app/widgets/gimpuimanager.c | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/app/widgets/gimpuimanager.c b/app/widgets/gimpuimanager.c
index 855cd1a..e5ae9a5 100644
--- a/app/widgets/gimpuimanager.c
+++ b/app/widgets/gimpuimanager.c
@@ -796,20 +796,24 @@ gimp_ui_manager_menu_position (GtkMenu *menu,
gint *y,
gpointer data)
{
- GdkScreen *screen;
- GtkRequisition requisition;
- GdkRectangle rect;
- gint monitor;
- gint pointer_x;
- gint pointer_y;
+ GdkDeviceManager *device_manager;
+ GdkDevice *device;
+ GdkScreen *screen;
+ GtkRequisition requisition;
+ GdkRectangle rect;
+ gint monitor;
+ gint pointer_x;
+ gint pointer_y;
g_return_if_fail (GTK_IS_MENU (menu));
g_return_if_fail (x != NULL);
g_return_if_fail (y != NULL);
g_return_if_fail (GTK_IS_WIDGET (data));
- gdk_display_get_pointer (gtk_widget_get_display (GTK_WIDGET (data)),
- &screen, &pointer_x, &pointer_y, NULL);
+ device_manager = gdk_display_get_device_manager (gtk_widget_get_display (data));
+ device = gdk_device_manager_get_client_pointer (device_manager);
+
+ gdk_device_get_position (device, &screen, &pointer_x, &pointer_y);
monitor = gdk_screen_get_monitor_at_point (screen, pointer_x, pointer_y);
gdk_screen_get_monitor_geometry (screen, monitor, &rect);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]