diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2013-10-07 15:37:45 -0400 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2013-10-09 17:32:05 -0400 |
| commit | 2518d6138fc0625c304648e28b17626e019639e1 (patch) | |
| tree | 410e780823c5eef66b070ee675416227281cca34 | |
| parent | 36be0846552d08fd093dda01a6860cb92387f1b9 (diff) | |
stack: Never try to focus a DOCK window
| -rw-r--r-- | src/core/stack.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/core/stack.c b/src/core/stack.c index 3b05cdbd..da7445fa 100644 --- a/src/core/stack.c +++ b/src/core/stack.c @@ -1484,14 +1484,12 @@ get_default_focus_window (MetaStack *stack, * or top window in same group as not_this_one. */ - MetaWindow *topmost_dock; MetaWindow *transient_parent; MetaWindow *topmost_in_group; MetaWindow *topmost_overall; MetaGroup *not_this_one_group; GList *link; - topmost_dock = NULL; transient_parent = NULL; topmost_in_group = NULL; topmost_overall = NULL; @@ -1517,10 +1515,6 @@ get_default_focus_window (MetaStack *stack, (workspace == NULL || 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 (transient_parent == NULL && @@ -1538,10 +1532,6 @@ get_default_focus_window (MetaStack *stack, 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 && window->type != META_WINDOW_DOCK && (!must_be_at_point || @@ -1563,7 +1553,7 @@ get_default_focus_window (MetaStack *stack, else if (topmost_overall) return topmost_overall; else - return topmost_dock; + return NULL; } MetaWindow* |