brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

windowMenu: Do a better job with faking the source actor

Browse Source 
The 0x0 dummyCursor works well when the menu pops up directly underneath
the pointer (e.g. when triggered by right-clicking the titlebar) or by
keyboard, but not when triggered by the menu button - the menu does not
point to the center of the button's bottom edge, and unless the user
keeps holding the mouse button while moving into the menu, the menu will
be dismissed immediately on button release.
Address these issues by using the button geometry to overlay the window
button with an appropriately sized actor that acts as a proper sourceActor,
to make the window menu behavior consistent with other shell menus.

https://bugzilla.gnome.org/show_bug.cgi?id=731058
This commit is contained in:
Florian Müllner 2014-05-31 05:19:20 +02:00
parent 5b61f2d642
commit e51eb723fc
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
js/ui/windowMenu.js
View File

@ -15,8 +15,8 @@ const WindowMenu = new Lang.Class({
Name: 'WindowMenu', Name: 'WindowMenu',
Extends: PopupMenu.PopupMenu, Extends: PopupMenu.PopupMenu,
_init: function(window) { _init: function(window, sourceActor) {
this.parent(Main.layoutManager.dummyCursor, 0, St.Side.TOP); this.parent(sourceActor, 0, St.Side.TOP);
this.actor.add_style_class_name('window-menu'); this.actor.add_style_class_name('window-menu');
@ -129,10 +129,10 @@ const AppMenu = new Lang.Class({
Name: 'AppMenu', Name: 'AppMenu',
Extends: RemoteMenu.RemoteMenu, Extends: RemoteMenu.RemoteMenu,
_init: function(window) { _init: function(window, sourceActor) {
let app = Shell.WindowTracker.get_default().get_window_app(window); let app = Shell.WindowTracker.get_default().get_window_app(window);
this.parent(Main.layoutManager.dummyCursor, app.menu, app.action_group); this.parent(sourceActor, app.menu, app.action_group);
this.actor.add_style_class_name('fallback-app-menu'); this.actor.add_style_class_name('fallback-app-menu');
let variant = window.get_gtk_theme_variant(); let variant = window.get_gtk_theme_variant();
@ -149,11 +149,18 @@ const WindowMenuManager = new Lang.Class({
_init: function() { _init: function() {
this._manager = new PopupMenu.PopupMenuManager({ actor: Main.layoutManager.dummyCursor }); this._manager = new PopupMenu.PopupMenuManager({ actor: Main.layoutManager.dummyCursor });
this._sourceActor = new St.Widget({ reactive: true, visible: false });
this._sourceActor.connect('button-press-event', Lang.bind(this,
function() {
this._manager.activeMenu.toggle();
}));
Main.uiGroup.add_actor(this._sourceActor);
}, },
showWindowMenuForWindow: function(window, type, rect) { showWindowMenuForWindow: function(window, type, rect) {
let menu = (type == Meta.WindowMenuType.WM) ? new WindowMenu(window) let menuType = (type == Meta.WindowMenuType.WM) ? WindowMenu : AppMenu;
: new AppMenu(window); let menu = new menuType(window, this._sourceActor);
this._manager.addMenu(menu); this._manager.addMenu(menu);
@ -161,12 +168,18 @@ const WindowMenuManager = new Lang.Class({
window.check_alive(global.get_current_time()); window.check_alive(global.get_current_time());
}); });
Main.layoutManager.setDummyCursorGeometry(rect.x, rect.y, 0, 0); this._sourceActor.set_size(rect.width, rect.height);
this._sourceActor.set_position(rect.x, rect.y);
this._sourceActor.show();
menu.open(BoxPointer.PopupAnimation.NONE); menu.open(BoxPointer.PopupAnimation.NONE);
menu.actor.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false); menu.actor.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
menu.connect('open-state-changed', Lang.bind(this, function(menu_, isOpen) { menu.connect('open-state-changed', Lang.bind(this, function(menu_, isOpen) {
if (!isOpen) if (isOpen)
menu.destroy(); return;
this._sourceActor.hide();
menu.destroy();
})); }));
} }
}); });