Convert bring-to-current-workspace to a per-dock setting and only bring the target window

Author: zquestz

data/net.launchpad.plank.gschema.xml.in

@@ -31,12 +31,6 @@
 			<summary>Array of names of active/enabled docks</summary>
 			<description>Contains the names of docks which are created and loaded on start up</description>
 		</key>
-
-		<key name="bring-window-to-current-workspace" type="b">
-			<default>false</default>
-			<summary>Bring windows to the current workspace when activated</summary>
-			<description>If true, activating a window located on another workspace moves it to the current workspace instead of switching to the window's workspace.</description>
-		</key>
 	</schema>
 
 	<schema id="net.launchpad.plank.dock.settings" gettext-domain="@GETTEXT_PACKAGE@">
@@ -50,6 +44,11 @@
 			<summary>Automatically pin an application if it seems useful to do</summary>
 			<description>If true, automatically pin applications when it seems useful to do.</description>
 		</key>
+		<key name="bring-to-current-workspace" type="b">
+			<default>false</default>
+			<summary>Bring windows to the current workspace when activated</summary>
+			<description>If true, activating a window located on another workspace moves it to the current workspace instead of switching to the window's workspace.</description>
+		</key>
 		<key name="current-workspace-only" type="b">
 			<default>false</default>
 			<summary>Only show windows from the current workspace</summary>

lib/DockPreferences.vala

@@ -37,6 +37,9 @@ namespace Plank {
     [Description (nick = "current-workspace-only", blurb = "Whether to show only windows of the current workspace.")]
     public bool CurrentWorkspaceOnly { get; set; }
 
+    [Description (nick = "bring-to-current-workspace", blurb = "Whether to bring windows to the current workspace when activated instead of switching to the window's workspace.")]
+    public bool BringToCurrentWorkspace { get; set; }
+
     [Description (nick = "icon-size", blurb = "The size of dock icons (in pixels).")]
     public int IconSize { get; set; }
 

lib/Items/ApplicationDockItem.vala

@@ -358,7 +358,7 @@ namespace Plank {
       }
 
       if (button == PopupButton.LEFT && App != null && Helpers.window_count (App, default_provider) > 0) {
-        WindowControl.smart_focus (App, event_time);
+        WindowControl.smart_focus (App, event_time, Helpers.bring_to_current_workspace (default_provider));
         return AnimationType.DARKEN;
       }
 
@@ -494,6 +494,7 @@ namespace Plank {
           items.add (new Gtk.SeparatorMenuItem ());
 
         bool cw_only = Helpers.current_workspace_only (default_provider);
+        bool bring_to_current = Helpers.bring_to_current_workspace (default_provider);
         unowned Wnck.Workspace? active_workspace = Wnck.Screen.get_default ().get_active_workspace ();
 
         foreach (var window in windows) {
@@ -573,7 +574,7 @@ namespace Plank {
             }
 
             if (!window.is_active ()) {
-              WindowControl.focus_window (window, event_time);
+              WindowControl.focus_window (window, event_time, bring_to_current);
             }
           });
 

lib/Services/Helpers.vala

@@ -58,6 +58,16 @@ namespace Plank {
       return current_workspace_only;
     }
 
+    public static bool bring_to_current_workspace (DefaultApplicationDockItemProvider? provider) {
+      bool bring_to_current_workspace = false;
+
+      if (provider != null) {
+        bring_to_current_workspace = provider.Prefs.BringToCurrentWorkspace;
+      }
+
+      return bring_to_current_workspace;
+    }
+
     public static int window_count (Bamf.Application? app, DefaultApplicationDockItemProvider? provider) {
       int window_count = 0;
 

lib/Services/WindowControl.vala

@@ -43,9 +43,6 @@ namespace Plank {
     static uint delayed_focus_timer_id = 0U;
     static ulong delayed_focus_xid = 0UL;
 
-    static GLib.Settings? global_settings = null;
-    static bool bring_window_to_current_workspace = false;
-
     // Action type for pending operations
     enum PendingActionType {
       MINIMIZE,
@@ -190,12 +187,6 @@ namespace Plank {
     public static void initialize () {
       Wnck.set_client_type (Wnck.ClientType.PAGER);
 
-      global_settings = create_settings ("net.launchpad.plank");
-      bring_window_to_current_workspace = global_settings.get_boolean ("bring-window-to-current-workspace");
-      global_settings.changed["bring-window-to-current-workspace"].connect (() => {
-        bring_window_to_current_workspace = global_settings.get_boolean ("bring-window-to-current-workspace");
-      });
-
       unowned Wnck.Screen screen = Wnck.Screen.get_default ();
 
       // Make sure internal window-list of Wnck is most up to date
@@ -512,15 +503,15 @@ namespace Plank {
       }
     }
 
-    public static void focus_window (Bamf.Window window, uint32 event_time) {
+    public static void focus_window (Bamf.Window window, uint32 event_time, bool bring_to_current = false) {
       unowned Wnck.Window w = Wnck.Window.@get (window.get_xid ());
 
       warn_if_fail (w != null);
 
       if (w == null)
         return;
 
-      center_and_focus_window (w, event_time);
+      center_and_focus_window (w, event_time, bring_to_current);
     }
 
     static void focus_window_by_xid (uint32 xid, uint32 event_time) {
@@ -637,7 +628,7 @@ namespace Plank {
       return windows;
     }
 
-    public static void smart_focus (Bamf.Application app, uint32 event_time) {
+    public static void smart_focus (Bamf.Application app, uint32 event_time, bool bring_to_current = false) {
       var windows = get_ordered_window_stack (app);
 
       var not_in_viewport = true;
@@ -657,7 +648,7 @@ namespace Plank {
             continue;
 
           if (!window.is_skip_tasklist ()) {
-            intelligent_focus_off_viewport_window (window, windows, event_time);
+            intelligent_focus_off_viewport_window (window, windows, event_time, bring_to_current);
             return;
           }
         }
@@ -701,15 +692,22 @@ namespace Plank {
       }
 
       // Focus most-top window and all others on its workspace
-      intelligent_focus_off_viewport_window (windows.nth_data (0), windows, event_time);
+      intelligent_focus_off_viewport_window (windows.nth_data (0), windows, event_time, bring_to_current);
     }
 
     static void intelligent_focus_off_viewport_window (Wnck.Window? targetWindow,
-                                                       GLib.List<unowned Wnck.Window> additional_windows, uint32 event_time) {
+                                                       GLib.List<unowned Wnck.Window> additional_windows, uint32 event_time,
+                                                       bool bring_to_current = false) {
       if (targetWindow == null) {
         return;
       }
 
+      // Bring only the target window to the current workspace, the others stay put
+      if (bring_to_current) {
+        center_and_focus_window (targetWindow, event_time, true);
+        return;
+      }
+
       additional_windows.reverse ();
 
       var windows_to_focus = new Gee.ArrayList<unowned Wnck.Window> ();
@@ -817,12 +815,12 @@ namespace Plank {
       return active_workspace != null && window.is_in_viewport (active_workspace);
     }
 
-    static void center_and_focus_window (Wnck.Window w, uint32 event_time) {
+    static void center_and_focus_window (Wnck.Window w, uint32 event_time, bool bring_to_current = false) {
       unowned Wnck.Workspace? workspace = w.get_workspace ();
       unowned Wnck.Workspace? active_workspace = w.get_screen ().get_active_workspace ();
 
       if (!w.is_pinned () && !w.is_sticky () && workspace != null && active_workspace != null && workspace != active_workspace) {
-        if (bring_window_to_current_workspace)
+        if (bring_to_current)
           w.move_to_workspace (active_workspace);
         else
           workspace.activate (event_time);

lib/Widgets/PreferencesWindow.vala

@@ -26,7 +26,6 @@ namespace Plank {
     public DockController controller { get; construct set; }
 
     DockPreferences prefs;
-    GLib.Settings global_settings;
 
     bool refreshing_display_plugs = false;
 
@@ -107,10 +106,6 @@ namespace Plank {
 
       prefs = controller.prefs;
 
-      global_settings = create_settings ("net.launchpad.plank");
-      global_settings.bind ("bring-window-to-current-workspace", sw_bring_to_workspace,
-                            "active", SettingsBindFlags.DEFAULT);
-
       init_dock_tab ();
       init_docklets_tab ();
       connect_signals ();
@@ -142,6 +137,9 @@ namespace Plank {
       case "CurrentWorkspaceOnly":
         sw_workspace_only.set_active (prefs.CurrentWorkspaceOnly);
         break;
+      case "BringToCurrentWorkspace":
+        sw_bring_to_workspace.set_active (prefs.BringToCurrentWorkspace);
+        break;
       case "IconSize":
         adj_iconsize.value = prefs.IconSize;
         break;
@@ -280,6 +278,10 @@ namespace Plank {
       prefs.CurrentWorkspaceOnly = ((Gtk.Switch) widget).get_active ();
     }
 
+    void bring_to_workspace_toggled (GLib.Object widget, ParamSpec param) {
+      prefs.BringToCurrentWorkspace = ((Gtk.Switch) widget).get_active ();
+    }
+
     void show_unpinned_toggled (GLib.Object widget, ParamSpec param) {
       prefs.PinnedOnly = !((Gtk.Switch) widget).get_active ();
     }
@@ -419,6 +421,7 @@ namespace Plank {
       sw_active_display.notify["active"].connect (active_display_toggled);
       adj_active_display_polling_interval.value_changed.connect (active_display_polling_interval_changed);
       sw_workspace_only.notify["active"].connect (workspace_only_toggled);
+      sw_bring_to_workspace.notify["active"].connect (bring_to_workspace_toggled);
       sw_show_unpinned.notify["active"].connect (show_unpinned_toggled);
       sw_lock_items.notify["active"].connect (lock_items_toggled);
       sw_tooltips_enabled.notify["active"].connect (tooltips_enabled_toggled);
@@ -451,6 +454,7 @@ namespace Plank {
       sw_active_display.notify["active"].disconnect (active_display_toggled);
       adj_active_display_polling_interval.value_changed.disconnect (active_display_polling_interval_changed);
       sw_workspace_only.notify["active"].disconnect (workspace_only_toggled);
+      sw_bring_to_workspace.notify["active"].disconnect (bring_to_workspace_toggled);
       sw_show_unpinned.notify["active"].disconnect (show_unpinned_toggled);
       sw_lock_items.notify["active"].disconnect (lock_items_toggled);
       sw_tooltips_enabled.notify["active"].disconnect (tooltips_enabled_toggled);
@@ -504,6 +508,7 @@ namespace Plank {
         s_active_display_polling_interval.sensitive = false;
       }
       sw_workspace_only.set_active (prefs.CurrentWorkspaceOnly);
+      sw_bring_to_workspace.set_active (prefs.BringToCurrentWorkspace);
       sw_show_unpinned.set_active (!prefs.PinnedOnly);
       sw_lock_items.set_active (prefs.LockItems);
       sw_tooltips_enabled.set_active (prefs.TooltipsEnabled);