Merge lp:~davidmhewitt/wingpanel/fix-focus into lp:~wingpanel-devs/wingpanel/trunk

[David Hewitt]

IndicatorEntry.vala:
* Prevent middle click events on indicators from being propagated to anywhere but the indicator itself.
PopoverManager.vala:
* Don't call set_expanded when mousing in/out of wingpanel, only necessary when opening/closing the popover

There were two problems here that prevented a dialog opened by middle-clicking an indicator from getting focus.

The first was that the set_expanded method was called when the mouse moved in and out of the bound of wingpanel. As far as I can tell, this should only be called when a popover is opened as it looks like it expands/contracts the area that the popover should fit into. Calling it when the mouse left wingpanel was causing wingpanel to activate the window that was activated when the mouse entered wingpanel.

Because the middle click happened between these two events, the wrong window was being focused.

The second issue was that middle click events were also being propagated elsewhere instead of just to the indicator, I believe this was causing gala to give focus to the indicator itself rather than the dialog, meaning you had to click once in the dialog to focus it and then again to perform your action.

I've tested this quite comprehensively and haven't noticed any difference in the way anything works, so I think it is safe to merge this code. However, it would be good to know the reasoning for why it was developed this way in the first place.

A branch of the session indicator that spawns a dialog on middle-clicking the indicator can be found here for testing: https://github.com/elementary/wingpanel-indicator-session/tree/middle-click-shortcut

[Djax (parnold-x)]

Hi, the expand on enter was necessary because of some timing thing inside gtk. Often when a popover expanded right after the window expand, it opened to the top and the popover could not be seen right. Maybe they changed the timing stuff, dunno I have not monitored the development lately.

[David Hewitt (davidmhewitt)]

Thanks, do you have any hints as to where I should look to see if this has changed?

[Djax (parnold-x)]

Not really. If it doesn't appear if you open/close a popover fast many times it should be fine. If I remember right it happend quite often in this case.

[David Hewitt (davidmhewitt)]

Can open/close popovers really fast with the enter/leave code removed, so I'm definitely not seeing that issue. It would be nice if a few more people could test it in case it's related to hardware speed or something strange like that.

[lp:~davidmhewitt/wingpanel/fix-focus]

175. By David Hewitt on 2017-03-26

Merged trunk

[Danielle Foré (danrabbit)]

Been running the branch the past couple days and haven't experienced any issues yet :)

[David Hewitt (davidmhewitt)]

Tested in a virtual machine to emulate much slower hardware and works fine too!

[Danielle Foré (danrabbit)]

Going to merge since nobody has had any issues with this yet. Will get wider testing in Daily

review: Approve

=== modified file 'src/Services/PopoverManager.vala'
--- src/Services/PopoverManager.vala	2017-02-04 20:54:27 +0000
+++ src/Services/PopoverManager.vala	2017-03-26 16:03:34 +0000
@@ -171,8 +171,6 @@
         registered_indicators.set (widg.base_indicator.code_name, widg);
 
         widg.enter_notify_event.connect ((w, e) => {
-            owner.set_expanded (true);
-
             if (mousing) {
                 return Gdk.EVENT_PROPAGATE;
             }
@@ -190,14 +188,6 @@
             return Gdk.EVENT_PROPAGATE;
         });
 
-        widg.leave_notify_event.connect (() => {
-            if (this.current_indicator == null) {
-                owner.set_expanded (false);
-            }
-
-            return Gdk.EVENT_PROPAGATE;
-        });
-
         widg.notify["visible"].connect (() => {
             if (mousing || grabbed) {
                 return;

=== modified file 'src/Widgets/IndicatorEntry.vala'
--- src/Widgets/IndicatorEntry.vala	2017-01-02 21:30:08 +0000
+++ src/Widgets/IndicatorEntry.vala	2017-03-26 16:03:34 +0000
@@ -128,7 +128,7 @@
             /* Call button press on the indicator display widget */
             display_widget.button_press_event (e);
 
-            return Gdk.EVENT_PROPAGATE;
+            return Gdk.EVENT_STOP;
         });
 
         set_reveal (base_indicator.visible);