isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-21 23:50:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

stack: Never try to focus a DOCK window

Browse Source
This commit is contained in:
Jasper St. Pierre 2013-10-07 15:37:45 -04:00
parent 36be084655
commit 2518d6138f
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/stack.c
View File

@ -1484,14 +1484,12 @@ get_default_focus_window (MetaStack *stack,
* or top window in same group as not_this_one. * or top window in same group as not_this_one.
*/ */
MetaWindow *topmost_dock;
MetaWindow *transient_parent; MetaWindow *transient_parent;
MetaWindow *topmost_in_group; MetaWindow *topmost_in_group;
MetaWindow *topmost_overall; MetaWindow *topmost_overall;
MetaGroup *not_this_one_group; MetaGroup *not_this_one_group;
GList *link; GList *link;
topmost_dock = NULL;
transient_parent = NULL; transient_parent = NULL;
topmost_in_group = NULL; topmost_in_group = NULL;
topmost_overall = NULL; topmost_overall = NULL;
@ -1517,10 +1515,6 @@ get_default_focus_window (MetaStack *stack,
(workspace == NULL || (workspace == NULL ||
meta_window_located_on_workspace (window, workspace))) meta_window_located_on_workspace (window, workspace)))
{ {
if (topmost_dock == NULL &&
window->type == META_WINDOW_DOCK)
topmost_dock = window;
if (not_this_one != NULL) if (not_this_one != NULL)
{ {
if (transient_parent == NULL && if (transient_parent == NULL &&
@ -1538,10 +1532,6 @@ get_default_focus_window (MetaStack *stack,
topmost_in_group = window; topmost_in_group = window;
} }
/* Note that DESKTOP windows can be topmost_overall so
* we prefer focusing desktop or other windows over
* focusing dock, even though docks are stacked higher.
*/
if (topmost_overall == NULL && if (topmost_overall == NULL &&
window->type != META_WINDOW_DOCK && window->type != META_WINDOW_DOCK &&
(!must_be_at_point || (!must_be_at_point ||
@ -1563,7 +1553,7 @@ get_default_focus_window (MetaStack *stack,
else if (topmost_overall) else if (topmost_overall)
return topmost_overall; return topmost_overall;
else else
return topmost_dock; return NULL;
} }
MetaWindow* MetaWindow*