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

layout: Add a standard dummy cursor

Browse Source 
Right now we have three "dummy cursor" widgets between the background
menu, the message tray menu, and the IBus candidate popup. Consolidate
these into one "dummy cursor" widget which is tracked in the layout
manager.
This commit is contained in:
Jasper St. Pierre
2013-02-15 04:56:34 -05:00
parent a4dea25d76
commit c8a58dcb69
3 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
js/ui/backgroundMenu.js
View File

@ -13,8 +13,8 @@ const BackgroundMenu = new Lang.Class({
Name: 'BackgroundMenu',
Extends: PopupMenu.PopupMenu,
_init: function(source, layoutManager) {
this.parent(source, 0, St.Side.TOP);
_init: function(layoutManager) {
this.parent(layoutManager.dummyCursor, 0, St.Side.TOP);
this.addSettingsAction(_("Settings"), 'gnome-control-center.desktop');
this.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
@ -28,17 +28,14 @@ const BackgroundMenu = new Lang.Class({
});
function addBackgroundMenu(actor, layoutManager) {
let cursor = new St.Bin({ opacity: 0 });
layoutManager.uiGroup.add_actor(cursor);
actor.reactive = true;
actor._backgroundMenu = new BackgroundMenu(cursor, layoutManager);
actor._backgroundMenu = new BackgroundMenu(layoutManager);
actor._backgroundManager = new PopupMenu.PopupMenuManager({ actor: actor });
actor._backgroundManager.addMenu(actor._backgroundMenu);
function openMenu() {
let [x, y] = global.get_pointer();
cursor.set_position(x, y);
Main.layoutManager.setDummyCursorPosition(x, y);
actor._backgroundMenu.open(BoxPointer.PopupAnimation.NONE);
}
@ -59,10 +56,8 @@ function addBackgroundMenu(actor, layoutManager) {
actor.add_action(clickAction);
actor.connect('destroy', function() {
actor._backgroundMenu.destroy();
actor._backgroundMenu = null;
actor._backgroundManager = null;
cursor.destroy();
});
actor._backgroundMenu.destroy();
actor._backgroundMenu = null;
actor._backgroundManager = null;
});
}