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

Main.activateWindow: always exit the overview if it's currently open

Browse Source 
This way, clicking a message tray icon while the overview is open will
close the overview when activating its window.

Remove some other overview-related activation code which is now
redundant.

Also, remove calls to "global.get_current_time()" when calling
Main.activateWindow, since it's unnecessary (activateWindow will call
it itself if you don't pass in that arg).

https://bugzilla.gnome.org/show_bug.cgi?id=609765
This commit is contained in:
Dan Winship
2010-02-17 14:05:06 -05:00
parent 77fe0db623
commit cec62a7ca5
5 changed files with 12 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
js/ui/appDisplay.js
View File

@ -55,7 +55,7 @@ AppDisplayItem.prototype = {
let windows = app.get_windows();
if (windows.length > 0) {
let mostRecentWindow = windows[0];
Main.overview.activateWindow(mostRecentWindow, global.get_current_time());
Main.activateWindow(mostRecentWindow);
} else {
this._appInfo.launch();
}
@ -240,7 +240,7 @@ BaseAppSearchProvider.prototype = {
let windows = app.get_windows();
if (windows.length > 0)
Main.overview.activateWindow(windows[0], global.get_current_time());
Main.activateWindow(windows[0]);
else
app.launch();
},
@ -439,7 +439,7 @@ AppWellIcon.prototype = {
activateMostRecentWindow: function () {
let mostRecentWindow = this.app.get_windows()[0];
Main.overview.activateWindow(mostRecentWindow, global.get_current_time());
Main.activateWindow(mostRecentWindow);
},
highlightWindow: function(metaWindow) {
@ -453,7 +453,7 @@ AppWellIcon.prototype = {
activateWindow: function(metaWindow) {
if (metaWindow) {
this._didActivateWindow = true;
Main.overview.activateWindow(metaWindow, global.get_current_time());
Main.activateWindow(metaWindow);
} else
Main.overview.hide();
},