summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--src/tabpopup.c3
2 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 876bff08..68bedcf6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-01-11 Elijah Newren <newren@gmail.com>
+
+ Correct highlighting of windows in workspace switcher popup.
+ Fixes #163450.
+
+ * src/tabpopup.c (meta_select_workspace_expose_event): Remove race
+ between FocusIn/FocusOut events and the expose event by replacing
+ window->has_focus with
+ window==window->display->expected_focus_window.
+
2005-01-09 Elijah Newren <newren@gmail.com>
* configure.in: post-release version bump to 2.9.5
diff --git a/src/tabpopup.c b/src/tabpopup.c
index e4074620..ca255461 100644
--- a/src/tabpopup.c
+++ b/src/tabpopup.c
@@ -781,7 +781,8 @@ meta_select_workspace_expose_event (GtkWidget *widget,
{
windows[i].icon = window->icon;
windows[i].mini_icon = window->mini_icon;
- windows[i].is_active = window->has_focus;
+ windows[i].is_active =
+ (window == window->display->expected_focus_window);
if (window->frame)
{