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

Bug 589937 - Raise clone on window activation

Browse Source 
We had duplicate code in appDisplay and workspaces for handling activating
a window; unify that inside workspaces, add an API to Main.overlay to
access it from both contexts.

Also, explicitly raise the clone we're activating to the top
before starting the animation to leave the overlay.
This commit is contained in:
Colin Walters
2009-07-31 17:20:26 -04:00
parent a439a58f13
commit 026f014d32
3 changed files with 64 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
js/ui/appDisplay.js
View File

@ -14,6 +14,7 @@ const Mainloop = imports.mainloop;
const DND = imports.ui.dnd;
const GenericDisplay = imports.ui.genericDisplay;
const Main = imports.ui.main;
const Workspaces = imports.ui.workspaces;
const ENTERED_MENU_COLOR = new Clutter.Color();
@ -527,17 +528,10 @@ WellDisplayItem.prototype = {
if (this._windows.length == 0)
this.launch();
else {
/* Pick the first window and activate it, switching to its workspace
* if necessary. In the future, we want to have a menu dropdown here. */
/* Pick the first window and activate it;
* In the future, we want to have a menu dropdown here. */
let first = this._windows[0];
let firstWorkspace = first.get_workspace();
let currentWorkspaceIndex = Shell.Global.get().screen.get_active_workspace_index();
let currentWorkspace = Shell.Global.get().screen.get_workspace_by_index(currentWorkspaceIndex);
let ts = Clutter.get_current_event_time();
if (currentWorkspace != firstWorkspace)
firstWorkspace.activate_with_focus(first, ts);
else
first.activate(ts);
Main.overlay.activateWindow (first, Clutter.get_current_event_time());
}
this.emit('activated');
},