diff options
| author | Elijah Newren <newren@gmail.com> | 2005-07-24 01:13:41 +0000 |
|---|---|---|
| committer | Elijah Newren <newren@src.gnome.org> | 2005-07-24 01:13:41 +0000 |
| commit | 225407f3b34db9c60048824b8184d4136a62bb5e (patch) | |
| tree | 5dc6e0469b99f3131449fff1dc263b6448ad3149 /src | |
| parent | 845a7fe554a349dbd93568f360256963a2bae597 (diff) | |
| download | metacity-225407f3b34db9c60048824b8184d4136a62bb5e.tar.gz | |
revert the patch from #128380--change _NET_ACTIVE_WINDOW behavior to what
2005-07-23 Elijah Newren <newren@gmail.com>
* src/window.c: (meta_window_activate): revert the patch from
#128380--change _NET_ACTIVE_WINDOW behavior to what it originally
was.
Diffstat (limited to 'src')
| -rw-r--r-- | src/window.c | 33 |
1 files changed, 12 insertions, 21 deletions
diff --git a/src/window.c b/src/window.c index 217fbecf..f5ef79e6 100644 --- a/src/window.c +++ b/src/window.c @@ -2262,31 +2262,22 @@ meta_window_activate (MetaWindow *window, /* disable show desktop mode unless we're a desktop component */ maybe_leave_show_desktop_mode (window); + /* Get window on current workspace */ + if (!meta_window_located_on_workspace (window, + window->screen->active_workspace)) + meta_window_change_workspace (window, + window->screen->active_workspace); + if (window->shaded) meta_window_unshade (window); unminimize_window_and_all_transient_parents (window); - - /* Activate the window, moving to its workspace if necessary */ - if (!meta_window_located_on_workspace (window, - window->screen->active_workspace)) - { - meta_topic (META_DEBUG_FOCUS, - "Focusing and moving to workspace of window %s due to " - "activation\n", - window->desc); - meta_workspace_activate_with_focus (window->workspace, - window, - timestamp); - } - else - { - meta_window_raise (window); - meta_topic (META_DEBUG_FOCUS, - "Focusing window %s due to activation\n", - window->desc); - meta_window_focus (window, timestamp); - } + + meta_window_raise (window); + meta_topic (META_DEBUG_FOCUS, + "Focusing window %s due to activation\n", + window->desc); + meta_window_focus (window, timestamp); } /* returns values suitable for meta_window_move |