Merge lp:~donadigo/wingpanel/fix-right-click into lp:~wingpanel-devs/wingpanel/trunk

[Adam Bieńkowski]

Fixes bug #1526071: "Right click closes slingshot".

Fixes bug #1526071: "Right click closes slingshot".

Two diffrent events were causing indicators to close on the right click: focus_out_event and leave_notify_event.

From now on, we check if the leave event happened outside or inside the indicator and in focus_out_event we check if there's no focused window (usually the menu window).

Indicators will now stay open when you want e.g: right click on application item in Slingshot.

[lp:~donadigo/wingpanel/fix-right-click]

120. By Adam Bieńkowski on 2016-04-15

Fixes bug #1526071: "Right click closes slingshot".

=== modified file 'src/Services/PopoverManager.vala'
--- src/Services/PopoverManager.vala	2016-04-09 18:39:32 +0000
+++ src/Services/PopoverManager.vala	2016-04-15 14:18:42 +0000
@@ -33,12 +33,12 @@
         widgets = new HashTable<Gtk.Widget? , Gtk.Popover? > (direct_hash, direct_equal);
         popovers = new HashTable<Gtk.Popover? , Wingpanel.Widgets.IndicatorEntry? > (direct_hash, direct_equal);
 
-        owner.focus_out_event.connect (() => {
+        owner.focus_out_event.connect ((e) => {
             if (mousing) {
                 return Gdk.EVENT_PROPAGATE;
             }
 
-            if (visible_popover != null) {
+            if (visible_popover != null && e.window == null) {
                 hide_popover ();
             }
 
@@ -170,7 +170,11 @@
         });
 
         popover.leave_notify_event.connect ((e) => {
-            if (e.mode != Gdk.CrossingMode.NORMAL) {
+            Gtk.Allocation allocation;
+            popover.get_allocation (out allocation);
+
+            if (e.mode != Gdk.CrossingMode.NORMAL
+                && (e.x < allocation.x || e.x > allocation.x + allocation.width) || (e.y < allocation.y || e.y > allocation.y + allocation.height)) {
                 hide_popover ();
             }