← Back to branch summary

~ubuntu-branches/ubuntu/trusty/gnome-panel/trusty-updates

« back to all changes in this revision

Viewing changes to debian/patches/git_fix_moving_applets.patch

  • Committer: Package Import Robot
  • Author(s): Dmitry Shachnev
  • Date: 2014-02-24 09:50:50 UTC
  • Revision ID: package-import@ubuntu.com-20140224095050-4voujr65att1tq0o
Tags: 1:3.8.0-1ubuntu8
Backport upstream commit to fix moving applets in panel.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/git_fix_moving_applets.patch
 
1
Description: fix moving applets in panel
 
2
Origin: upstream, https://git.gnome.org/browse/gnome-panel/commit/?id=d7d0efa55a26cc
 
3
Last-Update: 2014-02-24
 
4
 
 
5
--- a/gnome-panel/applet.c
 
6
+++ b/gnome-panel/applet.c
 
7
@@ -557,7 +557,7 @@
 
8
 {
 
9
        GtkAllocation   allocation;
 
10
        GtkRequisition  requisition;
 
11
-       GdkModifierType modifier_mask;
 
12
+       GdkDevice      *device;
 
13
        GdkScreen      *screen;
 
14
        GtkWidget      *parent;
 
15
        int             menu_x = 0;
 
16
@@ -574,7 +574,8 @@
 
17
        gtk_widget_get_preferred_size (GTK_WIDGET (menu), &requisition, NULL);
 
18
 
 
19
        gdk_window_get_origin (gtk_widget_get_window (applet), &menu_x, &menu_y);
 
20
-       gdk_window_get_device_position(gtk_widget_get_window (applet), gtk_get_current_event_device (), &pointer_x, &pointer_y, &modifier_mask);
 
21
+       device = gdk_device_manager_get_client_pointer (gdk_display_get_device_manager (gtk_widget_get_display (applet)));
 
22
+       gdk_window_get_device_position(gtk_widget_get_window (applet), device, &pointer_x, &pointer_y, NULL);
 
23
 
 
24
        gtk_widget_get_allocation (applet, &allocation);
 
25
 
 
26
--- a/gnome-panel/panel-toplevel.c
 
27
+++ b/gnome-panel/panel-toplevel.c
 
28
@@ -925,13 +925,14 @@
 
29
 {
 
30
        GdkScreen       *screen;
 
31
        GdkWindow       *root_window;
 
32
-       GdkModifierType  modifier_mask;
 
33
+       GdkDevice       *device;
 
34
        int              new_x, new_y;
 
35
 
 
36
        screen = gtk_window_get_screen (GTK_WINDOW (toplevel));
 
37
        root_window = gdk_screen_get_root_window (screen);
 
38
 
 
39
-       gdk_window_get_device_position(root_window, gtk_get_current_event_device (), &new_x, &new_y, &modifier_mask);
 
40
+       device = gdk_device_manager_get_client_pointer(gdk_display_get_device_manager(gtk_widget_get_display(GTK_WIDGET(toplevel))));
 
41
+       gdk_window_get_device_position(root_window, device, &new_x, &new_y, NULL);
 
42
 
 
43
        switch (keyval) {
 
44
        case GDK_KEY_Up:
 
45
--- a/gnome-panel/panel-widget.c
 
46
+++ b/gnome-panel/panel-widget.c
 
47
@@ -1509,7 +1509,7 @@
 
48
 {
 
49
        GtkWidget       *widget;
 
50
        GtkAllocation   allocation;
 
51
-       GdkModifierType modifier_mask;
 
52
+       GdkDevice       *device;
 
53
        int             x,y;
 
54
        int             w,h;
 
55
 
 
56
@@ -1522,7 +1522,8 @@
 
57
           !gtk_widget_get_visible(widget))
 
58
                return FALSE;
 
59
 
 
60
-       gdk_window_get_device_position(gtk_widget_get_window (widget), gtk_get_current_event_device (), &x, &y, &modifier_mask);
 
61
+       device = gdk_device_manager_get_client_pointer (gdk_display_get_device_manager (gtk_widget_get_display (widget)));
 
62
+       gdk_window_get_device_position(gtk_widget_get_window (widget), device, &x, &y, NULL);
 
63
 
 
64
        gtk_widget_get_allocation (widget, &allocation);
 
65
        w = allocation.width;
 
66
@@ -1895,11 +1896,12 @@
 
67
 {
 
68
        int             x, y;
 
69
        gboolean        rtl;
 
70
-       GdkModifierType modifier_mask;
 
71
+       GdkDevice      *device;
 
72
 
 
73
        g_return_val_if_fail (PANEL_IS_WIDGET (panel), -1);
 
74
 
 
75
-       gdk_window_get_device_position(gtk_widget_get_window (GTK_WIDGET (panel)), gtk_get_current_event_device (), &x, &y, &modifier_mask);
 
76
+       device = gdk_device_manager_get_client_pointer (gdk_display_get_device_manager (gtk_widget_get_display (GTK_WIDGET (panel))));
 
77
+       gdk_window_get_device_position(gtk_widget_get_window (GTK_WIDGET (panel)), device, &x, &y, NULL);
 
78
        rtl = gtk_widget_get_direction (GTK_WIDGET (panel)) == GTK_TEXT_DIR_RTL;
 
79
        
 
80
        if (panel->orient == GTK_ORIENTATION_HORIZONTAL)
 
81
@@ -2074,13 +2076,14 @@
 
82
        if(panel->currently_dragged_applet && repeat_if_outside) {
 
83
                GtkWidget       *widget;
 
84
                GtkAllocation   allocation;
 
85
-               GdkModifierType modifier_mask;
 
86
+               GdkDevice       *device;
 
87
                int             x,y;
 
88
                int             w,h;
 
89
 
 
90
                widget = panel->currently_dragged_applet->applet;
 
91
 
 
92
-               gdk_window_get_device_position(gtk_widget_get_window (widget), gtk_get_current_event_device (), &x, &y, &modifier_mask);
 
93
+               device = gdk_device_manager_get_client_pointer (gdk_display_get_device_manager (gtk_widget_get_display (widget)));
 
94
+               gdk_window_get_device_position(gtk_widget_get_window (widget), device, &x, &y, NULL);
 
95
 
 
96
                gtk_widget_get_allocation (widget, &allocation);
 
97
                w = allocation.width;
 
98
--- a/libpanel-applet/panel-applet.c
 
99
+++ b/libpanel-applet/panel-applet.c
 
100
@@ -1130,7 +1130,7 @@
 
101
        PanelApplet    *applet;
 
102
        GtkAllocation   allocation;
 
103
        GtkRequisition  requisition;
 
104
-       GdkModifierType modifier_mask;
 
105
+       GdkDevice      *device;
 
106
        GdkScreen      *screen;
 
107
        int             menu_x = 0;
 
108
        int             menu_y = 0;
 
109
@@ -1148,7 +1148,8 @@
 
110
        gtk_widget_get_preferred_size (GTK_WIDGET (menu), &requisition, NULL);
 
111
        gdk_window_get_origin (gtk_widget_get_window (widget),
 
112
                               &menu_x, &menu_y);
 
113
-       gdk_window_get_device_position(gtk_widget_get_window (widget), gtk_get_current_event_device (), &pointer_x, &pointer_y, &modifier_mask);
 
114
+       device = gdk_device_manager_get_client_pointer (gdk_display_get_device_manager (gtk_widget_get_display (widget)));
 
115
+       gdk_window_get_device_position(gtk_widget_get_window (widget), device, &pointer_x, &pointer_y, NULL);
 
116
 
 
117
        gtk_widget_get_allocation (widget, &allocation);
 
118