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

[AppDisplay] Popup the menu on left-click/hold

Browse Source 
Left-clicking an app icon and holding the button used to pop up the
app menu, but regressed when rewriting appDisplay.
Restore the previous behavior.

https://bugzilla.gnome.org/show_bug.cgi?id=609013
This commit is contained in:
Florian Müllner 2010-03-10 14:52:28 +01:00
parent d1a178301f
commit d9f43e27a0
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
js/ui/appDisplay.js
View File

@ -23,6 +23,7 @@ const Workspace = imports.ui.workspace;
const APPICON_SIZE = 48; const APPICON_SIZE = 48;
const WELL_MAX_COLUMNS = 8; const WELL_MAX_COLUMNS = 8;
const MENU_POPUP_TIMEOUT = 600;
function AllAppView() { function AllAppView() {
this._init(); this._init();
@ -416,6 +417,7 @@ AppWellIcon.prototype = {
this.actor.connect('destroy', Lang.bind(this, this._onHideDestroy)); this.actor.connect('destroy', Lang.bind(this, this._onHideDestroy));
this._appWindowChangedId = 0; this._appWindowChangedId = 0;
this._menuTimeoutId = 0;
}, },
_onShow: function() { _onShow: function() {
@ -428,6 +430,14 @@ AppWellIcon.prototype = {
_onHideDestroy: function() { _onHideDestroy: function() {
if (this._appWindowChangedId > 0) if (this._appWindowChangedId > 0)
this.app.disconnect(this._appWindowChangedId); this.app.disconnect(this._appWindowChangedId);
this._removeMenuTimeout();
},
_removeMenuTimeout: function() {
if (this._menuTimeoutId > 0) {
Mainloop.source_remove(this._menuTimeoutId);
this._menuTimeoutId = 0;
}
}, },
_updateStyleClass: function() { _updateStyleClass: function() {
@ -446,6 +456,15 @@ AppWellIcon.prototype = {
let [stageX, stageY] = event.get_coords(); let [stageX, stageY] = event.get_coords();
this._dragStartX = stageX; this._dragStartX = stageX;
this._dragStartY = stageY; this._dragStartY = stageY;
let button = event.get_button();
if (button == 1) {
this._removeMenuTimeout();
this._menuTimeoutId = Mainloop.timeout_add(MENU_POPUP_TIMEOUT,
Lang.bind(this, function() {
this.popupMenu(button);
}));
}
}, },
_onHoverChange: function(actor) { _onHoverChange: function(actor) {
@ -453,6 +472,7 @@ AppWellIcon.prototype = {
if (!hover) { if (!hover) {
if (this.actor.held && this._dragStartX != null) { if (this.actor.held && this._dragStartX != null) {
this.actor.fake_release(); this.actor.fake_release();
this._removeMenuTimeout();
this._draggable.startDrag(this._dragStartX, this._dragStartY, this._draggable.startDrag(this._dragStartX, this._dragStartY,
global.get_current_time()); global.get_current_time());
} else { } else {
@ -463,6 +483,8 @@ AppWellIcon.prototype = {
}, },
_onClicked: function(actor, event) { _onClicked: function(actor, event) {
this._removeMenuTimeout();
let button = event.get_button(); let button = event.get_button();
if (button == 1) { if (button == 1) {
this._onActivate(event); this._onActivate(event);
@ -479,6 +501,9 @@ AppWellIcon.prototype = {
}, },
popupMenu: function(activatingButton) { popupMenu: function(activatingButton) {
this._removeMenuTimeout();
this.actor.fake_release();
if (!this._menu) { if (!this._menu) {
this._menu = new AppIconMenu(this); this._menu = new AppIconMenu(this);
this._menu.connect('highlight-window', Lang.bind(this, function (menu, window) { this._menu.connect('highlight-window', Lang.bind(this, function (menu, window) {