[gnome-shell-extensions] window-list: Sync hover after closing menus
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell-extensions] window-list: Sync hover after closing menus
- Date: Tue, 18 Feb 2014 21:46:28 +0000 (UTC)
commit c2fe2b5505bcbeb77dc5c7b15e5c83bc79a8083f
Author: Florian Müllner <fmuellner gnome org>
Date: Fri Feb 14 18:35:07 2014 +0100
window-list: Sync hover after closing menus
StButton takes the hover state into account to decide whether a
series of events should be considered a click. So when dismissing
a menu by clicking on a different window/app button, its menu
cannot be triggered before leaving and re-entering the button
(and thus syncing the hover state).
Fix this by always syncing the hover state after a grab is dropped.
https://bugzilla.gnome.org/show_bug.cgi?id=724688
extensions/window-list/extension.js | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
---
diff --git a/extensions/window-list/extension.js b/extensions/window-list/extension.js
index b107047..0531b40 100644
--- a/extensions/window-list/extension.js
+++ b/extensions/window-list/extension.js
@@ -47,6 +47,16 @@ function _openMenu(menu) {
menu.actor.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
}
+function _onMenuStateChanged(menu, isOpen) {
+ if (isOpen)
+ return;
+
+ let [x, y,] = global.get_pointer();
+ let actor = global.stage.get_actor_at_pos(Clutter.PickMode.REACTIVE, x, y);
+ if (windowList.actor.contains(actor))
+ actor.sync_hover();
+}
+
const WindowContextMenu = new Lang.Class({
Name: 'WindowContextMenu',
@@ -187,6 +197,7 @@ const WindowButton = new Lang.Class({
this._menuManager = new PopupMenu.PopupMenuManager(this);
this._contextMenu = new WindowContextMenu(this.actor, this.metaWindow);
+ this._contextMenu.connect('open-state-changed', _onMenuStateChanged);
this._contextMenu.actor.hide();
this._menuManager.addMenu(this._contextMenu);
Main.uiGroup.add_actor(this._contextMenu.actor);
@@ -370,6 +381,7 @@ const AppButton = new Lang.Class({
this._menuManager = new PopupMenu.PopupMenuManager(this);
this._menu = new PopupMenu.PopupMenu(this.actor, 0.5, St.Side.BOTTOM);
+ this._menu.connect('open-state-changed', _onMenuStateChanged);
this._menu.actor.hide();
this._menu.connect('activate', Lang.bind(this, this._onMenuActivate));
this._menuManager.addMenu(this._menu);
@@ -377,6 +389,7 @@ const AppButton = new Lang.Class({
this._contextMenuManager = new PopupMenu.PopupMenuManager(this);
this._appContextMenu = new AppContextMenu(this.actor, this.app);
+ this._appContextMenu.connect('open-state-changed', _onMenuStateChanged);
this._appContextMenu.actor.hide();
this._contextMenuManager.addMenu(this._appContextMenu);
Main.uiGroup.add_actor(this._appContextMenu.actor);
@@ -451,6 +464,8 @@ const AppButton = new Lang.Class({
this._windowTitle = new WindowTitle(this.metaWindow);
this._singleWindowTitle.child = this._windowTitle.actor;
this._windowContextMenu = new WindowContextMenu(this.actor, this.metaWindow);
+ this._windowContextMenu.connect('open-state-changed',
+ _onMenuStateChanged);
Main.uiGroup.add_actor(this._windowContextMenu.actor);
this._windowContextMenu.actor.hide();
this._contextMenuManager.addMenu(this._windowContextMenu);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]