summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2002-11-12 21:53:52 +0000
committerHavoc Pennington <hp@src.gnome.org>2002-11-12 21:53:52 +0000
commit5590e8878b77568b603b1ebbec6ef7b7c83cf313 (patch)
treef95b151863901157bac8fb78bf4f2080921fb9ec
parentde703edfd766893449560e459a89c3620fef83f9 (diff)
downloadmetacity-5590e8878b77568b603b1ebbec6ef7b7c83cf313.tar.gz
never use a window with input = FALSE take_focus = FALSE as the default
2002-11-12 Havoc Pennington <hp@redhat.com> * src/stack.c (meta_stack_get_default_focus_window): never use a window with input = FALSE take_focus = FALSE as the default focus window #95454 fix from Hidetoshi Tajima
-rw-r--r--ChangeLog6
-rw-r--r--src/stack.c1
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 6758728c..e85f51c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-11-12 Havoc Pennington <hp@redhat.com>
+
+ * src/stack.c (meta_stack_get_default_focus_window): never use a
+ window with input = FALSE take_focus = FALSE as the default focus
+ window #95454 fix from Hidetoshi Tajima
+
2002-11-10 James M. Cape <jcape@ignore-your.tv>
* src/themes/Esco/metacity-theme-1.xml: Major changes
diff --git a/src/stack.c b/src/stack.c
index 4b994339..050360c0 100644
--- a/src/stack.c
+++ b/src/stack.c
@@ -1339,6 +1339,7 @@ meta_stack_get_default_focus_window (MetaStack *stack,
window != not_this_one &&
(window->unmaps_pending == 0) &&
!window->minimized &&
+ (window->input || window->take_focus) &&
(workspace == NULL ||
meta_window_visible_on_workspace (window, workspace)))
{