Package: marco / 1.8.2+dfsg1-6

0004_dont-switch-workspace-when-switching-to-sticky-window.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
From 0ee6f6db3f405c13c88f75760f88296560cf9fd6 Mon Sep 17 00:00:00 2001
From: Denis Gorodnichev <denis.gorodnichev@gmail.com>
Date: Sat, 28 Jun 2014 16:58:28 +0000
Subject: 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
---
--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -2031,7 +2031,8 @@
                       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");
@@ -2897,7 +2898,8 @@
                       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,
@@ -2927,7 +2929,8 @@
               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
             {