[gnome-shell/T29763: 29/249] systemMenu: Disable automatic rollover mechanism for popup menus



commit 76798e7d9148d95270b76c8cdf369db17123ea4c
Author: Mario Sanchez Prada <mario endlessm com>
Date:   Wed May 3 15:19:32 2017 +0100

    systemMenu: Disable automatic rollover mechanism for popup menus

 js/ui/popupMenu.js | 35 ++---------------------------------
 1 file changed, 2 insertions(+), 33 deletions(-)
---
diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index ad827ac5b3..5bb4680eea 100644
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -1301,20 +1301,11 @@ var PopupMenuManager = class {
             menu,
             openStateChangeId: menu.connect('open-state-changed', this._onMenuOpenState.bind(this)),
             destroyId:         menu.connect('destroy', this._onMenuDestroy.bind(this)),
-            enterId:           0,
-            focusInId:         0,
         };
 
         let source = menu.sourceActor;
-        if (source) {
-            if (!menu.blockSourceEvents)
-                this._grabHelper.addActor(source);
-            menudata.enterId = source.connect('enter-event',
-                () => this._onMenuSourceEnter(menu));
-            menudata.focusInId = source.connect('key-focus-in', () => {
-                this._onMenuSourceEnter(menu);
-            });
-        }
+        if (source && !menu.blockSourceEvents)
+            this._grabHelper.addActor(source);
 
         if (position == undefined)
             this._menus.push(menudata);
@@ -1334,11 +1325,6 @@ var PopupMenuManager = class {
         menu.disconnect(menudata.openStateChangeId);
         menu.disconnect(menudata.destroyId);
 
-        if (menudata.enterId)
-            menu.sourceActor.disconnect(menudata.enterId);
-        if (menudata.focusInId)
-            menu.sourceActor.disconnect(menudata.focusInId);
-
         if (menu.sourceActor)
             this._grabHelper.removeActor(menu.sourceActor);
         this._menus.splice(position, 1);
@@ -1370,23 +1356,6 @@ var PopupMenuManager = class {
         }
     }
 
-    _changeMenu(newMenu) {
-        newMenu.open(this.activeMenu
-            ? BoxPointer.PopupAnimation.FADE
-            : BoxPointer.PopupAnimation.FULL);
-    }
-
-    _onMenuSourceEnter(menu) {
-        if (!this._grabHelper.grabbed)
-            return Clutter.EVENT_PROPAGATE;
-
-        if (this._grabHelper.isActorGrabbed(menu.actor))
-            return Clutter.EVENT_PROPAGATE;
-
-        this._changeMenu(menu);
-        return Clutter.EVENT_PROPAGATE;
-    }
-
     _onMenuDestroy(menu) {
         this.removeMenu(menu);
     }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]