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

switcherPopup: Add a timestamp argument to _finish()

Browse Source 
And use it elsewhere.

https://bugzilla.gnome.org/show_bug.cgi?id=689653
This commit is contained in:
Jasper St. Pierre 2012-12-04 13:45:52 -05:00
parent a43ee41b0b
commit 7ff7ced504
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/ui/altTab.js
View File

@ -261,7 +261,7 @@ const AppSwitcherPopup = new Lang.Class({
this._select(this._selectedIndex, n); this._select(this._selectedIndex, n);
}, },
_finish : function() { _finish : function(timestamp) {
this.parent(); this.parent();
let appIcon = this._items[this._selectedIndex]; let appIcon = this._items[this._selectedIndex];
@ -270,7 +270,7 @@ const AppSwitcherPopup = new Lang.Class({
window = appIcon.cachedWindows[this._currentWindow]; window = appIcon.cachedWindows[this._currentWindow];
else else
window = null; window = null;
appIcon.app.activate_window(window, global.get_current_time()); appIcon.app.activate_window(window, timestamp);
}, },
_onDestroy : function() { _onDestroy : function() {

12
js/ui/ctrlAltTab.js
View File

@ -52,11 +52,11 @@ const CtrlAltTabManager = new Lang.Class({
} }
}, },
focusGroup: function(item) { focusGroup: function(item, timestamp) {
if (item.window) { if (item.window) {
Main.activateWindow(item.window); Main.activateWindow(item.window, timestamp);
} else if (item.focusCallback) { } else if (item.focusCallback) {
item.focusCallback(); item.focusCallback(timestamp);
} else { } else {
if (global.stage_input_mode == Shell.StageInputMode.NONREACTIVE || if (global.stage_input_mode == Shell.StageInputMode.NONREACTIVE ||
global.stage_input_mode == Shell.StageInputMode.NORMAL) global.stage_input_mode == Shell.StageInputMode.NORMAL)
@ -164,9 +164,9 @@ const CtrlAltTabPopup = new Lang.Class({
this._select(this._next()); this._select(this._next());
}, },
_finish : function() { _finish : function(time) {
this.parent(); this.parent(time);
Main.ctrlAltTabManager.focusGroup(this._items[this._selectedIndex]); Main.ctrlAltTabManager.focusGroup(this._items[this._selectedIndex], time);
}, },
}); });

8
js/ui/switcherPopup.js
View File

@ -151,7 +151,7 @@ const SwitcherPopup = new Lang.Class({
// selection.) // selection.)
let [x, y, mods] = global.get_pointer(); let [x, y, mods] = global.get_pointer();
if (!(mods & this._modifierMask)) { if (!(mods & this._modifierMask)) {
this._finish(); this._finish(global.get_current_time());
return false; return false;
} }
@ -198,7 +198,7 @@ const SwitcherPopup = new Lang.Class({
let state = mods & this._modifierMask; let state = mods & this._modifierMask;
if (state == 0) if (state == 0)
this._finish(); this._finish(event.get_time());
return true; return true;
}, },
@ -224,7 +224,7 @@ const SwitcherPopup = new Lang.Class({
_itemActivated: function(switcher, n) { _itemActivated: function(switcher, n) {
this._itemActivatedHandler(n); this._itemActivatedHandler(n);
this._finish(); this._finish(global.get_current_time());
}, },
_itemEnteredHandler: function(n) { _itemEnteredHandler: function(n) {
@ -274,7 +274,7 @@ const SwitcherPopup = new Lang.Class({
this.actor.destroy(); this.actor.destroy();
}, },
_finish: function() { _finish: function(timestamp) {
this.destroy(); this.destroy();
}, },