[mutter/wayland] stack: Never try to focus a DOCK window
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wayland] stack: Never try to focus a DOCK window
- Date: Wed, 9 Oct 2013 22:10:59 +0000 (UTC)
commit d69553e8f539c586027e07fc736d19f4de7f3900
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Mon Oct 7 15:37:45 2013 -0400
stack: Never try to focus a DOCK window
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 85b0f35..96e88e7 100644
--- a/src/core/stack.c
+++ b/src/core/stack.c
@@ -1724,14 +1724,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;
@@ -1757,10 +1755,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 &&
@@ -1778,10 +1772,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 ||
@@ -1803,7 +1793,7 @@ get_default_focus_window (MetaStack *stack,
else if (topmost_overall)
return topmost_overall;
else
- return topmost_dock;
+ return NULL;
}
MetaWindow*
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]