summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorDenis Gorodnichev <[email protected]>2014-06-28 20:58:28 +0400
committerStefano Karapetsas <[email protected]>2014-10-24 12:10:56 +0200
commit0ee6f6db3f405c13c88f75760f88296560cf9fd6 (patch)
treefc583f622a593d49f785cea1af1826b62705e753 /src/core
parentea3d424d7ea4824121498ae15af82d56c8378ed5 (diff)
downloadmarco-0ee6f6db3f405c13c88f75760f88296560cf9fd6.tar.bz2
marco-0ee6f6db3f405c13c88f75760f88296560cf9fd6.tar.xz
don't switch workspace when switching to sticky window
Closes https://github.com/mate-desktop/marco/pull/121 Closes https://github.com/mate-desktop/marco/issues/18
Diffstat (limited to 'src/core')
-rw-r--r--src/core/keybindings.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/core/keybindings.c b/src/core/keybindings.c
index 63e33059..9ddaf885 100644
--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -2031,7 +2031,8 @@ process_tab_grab (MetaDisplay *display,
target_window->desc);
display->mouse_mode = FALSE;
meta_window_activate (target_window, event->xkey.time);
- meta_workspace_activate (target_window->workspace, event->xkey.time);
+ if (!target_window->on_all_workspaces)
+ meta_workspace_activate (target_window->workspace, event->xkey.time);
meta_topic (META_DEBUG_KEYBINDINGS,
"Ending grab early so we can focus the target window\n");
@@ -2905,7 +2906,8 @@ do_choose_window (MetaDisplay *display,
initial_selection->desc);
display->mouse_mode = FALSE;
meta_window_activate (initial_selection, event->xkey.time);
- meta_workspace_activate (initial_selection->workspace, event->xkey.time);
+ if (!initial_selection->on_all_workspaces)
+ meta_workspace_activate (initial_selection->workspace, event->xkey.time);
}
else if (meta_display_begin_grab_op (display,
screen,
@@ -2935,7 +2937,8 @@ do_choose_window (MetaDisplay *display,
meta_display_end_grab_op (display, event->xkey.time);
display->mouse_mode = FALSE;
meta_window_activate (initial_selection, event->xkey.time);
- meta_workspace_activate (initial_selection->workspace, event->xkey.time);
+ if (!initial_selection->on_all_workspaces)
+ meta_workspace_activate (initial_selection->workspace, event->xkey.time);
}
else
{