From e81659d2ff02593279f0afb84c93534c0c86c4e9 Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Sat, 7 Aug 2004 03:13:56 +0000 Subject: [PATCH] Focusing a window upon unshowing the desktop in various ways (panel applet 2004-08-06 Elijah Newren * src/display.c (event_callback): Focusing a window upon unshowing the desktop in various ways (panel applet or keybinding) was inconsistent for sloppy and click focus modes. Fix this by calling meta_workspace_focus_default_window after unshowing the desktop via a _NET_SHOWING_DESKTOP message. (resolves #149543) --- ChangeLog | 8 ++++++++ src/display.c | 5 ++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 265cf69e2..7abbb5d63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2004-08-06 Elijah Newren + + * src/display.c (event_callback): Focusing a window upon unshowing + the desktop in various ways (panel applet or keybinding) was + inconsistent for sloppy and click focus modes. Fix this by + calling meta_workspace_focus_default_window after unshowing the + desktop via a _NET_SHOWING_DESKTOP message. (resolves #149543) + 2004-08-06 Elijah Newren * src/workspace.c (meta_workspace_focus_default_window): prevent diff --git a/src/display.c b/src/display.c index 6b0174c5c..29685106f 100644 --- a/src/display.c +++ b/src/display.c @@ -2086,7 +2086,10 @@ event_callback (XEvent *event, if (showing_desktop) meta_screen_show_desktop (screen); else - meta_screen_unshow_desktop (screen); + { + meta_screen_unshow_desktop (screen); + meta_workspace_focus_default_window (screen->active_workspace, NULL); + } } else if (event->xclient.message_type == display->atom_metacity_restart_message)