[DesktopCube@yare] Version 2.0.2 (#796)

- Add APIs used by the "Smart Panel" applet so it can use Desktop Cube in more cases - Fix a case where the Cube was used under the Expo (using the Left/Right arrow keys when the Expo was open). Using the Cube in this case was visually awkward and unnecessary so I disabled using Cube for this scenario - Fix issues when attempting to move a window to an adjacent workspace (Shift+Ctrl+Alt+Left/Right) for a window that is visible on all workspaces
linuxmint · Dec 21, 2024 · b2ba481 · b2ba481
1 parent 4a08b0a
commit b2ba481
Show file tree

Hide file tree

Showing 22 changed files with 198 additions and 24 deletions.
diff --git a/DesktopCube@yare/CHANGELOG.md b/DesktopCube@yare/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Changelog
 
+## 2.0.2
+
+- Added APIs used by the "Smart Panel" applet so it can use Desktop Cube in more cases
+- Fixed a case where the Cube was used under the Expo (using the Left/Right arrow keys when the Expo was open). Using the Cube in this case was visually awkward and unnecessary so I disabled using Cube for this scenario
+- Fixes issues when attempting to move a window to an adjacent workspace (Shift+Ctrl+Alt+Left/Right) for a window that is visible on all workspaces
+
+## 2.0.1
+
+- Allow Desktop Cube to work with the "Smart Panel" applet
+
 ## 2.0.0
 
 * Added ability to use Cube effect when changing the workspace via the "Workspace Switcher" applet
@@ -23,7 +33,7 @@
 ## 1.0.2
 
 * Added an option to remove the panels from the animation effect
-* Fix the Effect Setting options that were broken when the "tween" option widget was removed starting with cinnamon 5.4 
+* Fix the Effect Setting options that were broken when the "tween" option widget was removed starting with cinnamon 5.4
 * Allow Cinnamon to play the workspace switch sound if it is enabled
 * Note: All changed from here on will only be for the Cinnamon 5.4+ version
 * Change info.json author to me, since there is currently no maintainer

diff --git a/DesktopCube@yare/README.md b/DesktopCube@yare/README.md
@@ -28,6 +28,8 @@ There are a number of ways to switch the current workspace, all of following wil
 
 5. When changing the focus to a window on another workspace by using the Window-List or Alt-Tab when they are configured to show windows from other workspaces. (can be disabled in the configuration)
 
+6. When using the "Smart Panel" Applet features that change the workspace (Also plan to change "Desktop Scroller" to use Flipper as well in the near future)
+
 When switching the current workspace using Expo ("workspace selection screen" Default hotkey: Ctrl + Alt + Up_Arrow_Key) by clicking on a different workspace, the Desktop Cube effect will not be used. Since the Expo is not really a "face" on the cube it would break the Cube concept a bit, therefore I left it as is since I felt it was more logical that way.
 
 If you know of other methods of switching the workspace where the Desktop Cube effect is not currently used, please let me know so I can see if I can find a way to enable the Desktop Cube for that path as well.

diff --git a/DesktopCube@yare/files/DesktopCube@yare/5.4/extension.js b/DesktopCube@yare/files/DesktopCube@yare/5.4/extension.js
@@ -27,6 +27,8 @@ let bindings = [
 let original_mw_moveToWorkspace;
 let original_main_activateWindow;
 
+let curDesktopCube;
+
 const isFinalized = function(obj) {
     return obj && GObject.Object.prototype.toString.call(obj).indexOf('FINALIZED') > -1;
 }
@@ -193,7 +195,7 @@ Cube.prototype = {
     },
 
     moveWindow: function(window, direction) {
-        if (!window || window.get_window_type() === Meta.WindowType.DESKTOP) {
+        if (!window || window.is_on_all_workspaces() === true || window.get_window_type() === Meta.WindowType.DESKTOP) {
             return false;
         }
 
@@ -888,9 +890,13 @@ function switchToWorkspace(display, window, binding) {
 // Our version of moveToWorkspace() which will be Monkey Patched over the Cinnamon version
 // This is how we handle the workspace switching initiated by the "Workspace Switcher" applet
 function moveToWorkspace(workspace, direction_hint) {
-    let [transitions_needed, direction] = getTransitionsAndDirection(workspace);
-    if (transitions_needed)
-       new Cube(null, null, null, transitions_needed, direction);
+    if (Main.expo._shown) {
+       original_mw_moveToWorkspace(workspace, direction_hint);
+    } else {
+        let [transitions_needed, direction] = getTransitionsAndDirection(workspace);
+        if (transitions_needed)
+            new Cube(null, null, null, transitions_needed, direction);
+    }
 }
 
 // Our version of activateWindow which will be Monkey Patched over the cinnamon version
@@ -910,6 +916,42 @@ function activateWindow(window, time, workspaceNum) {
       original_main_activateWindow(window, time, workspaceNum);
    }
 }
+// Extension Workspace Switching API
+// This function can be used by other programs to initiate a workspace change using the Cube effect
+// The direction argument must be Meta.MotionDirection.RIGHT or Meta.MotionDirection.LEFT
+// The window argument (optional) is a Meta.Window that will follow the workspace switch
+function ExtSwitchWorkspace(direction, window) {
+    if (direction !== Meta.MotionDirection.RIGHT && direction !== Meta.MotionDirection.LEFT)
+       return;
+    if (window & !(window instanceof Meta.Window))
+       window = null;
+    let new_workspace = global.screen.get_active_workspace().get_neighbor(direction);
+    if (curDesktopCube && curDesktopCube.is_animating) {
+       curDesktopCube.transitions.push(direction);
+    } else {
+       curDesktopCube = new Cube(null, null, null, 1, direction);
+       if (window)
+          curDesktopCube.moveWindow(window, direction);
+    }
+}
+
+// Extension Workspace Switching API
+// This function can be used by other programs to initiate a workspace change using the Cube effect
+// The workspace argument must be a Meta.Workspace instance
+function ExtSwitchToWorkspace(workspace) {
+    if (workspace instanceof Meta.Workspace) {
+       let [transitions_needed, direction] = getTransitionsAndDirection(workspace);
+       if (transitions_needed) {
+          if (curDesktopCube && curDesktopCube.is_animating) {
+             for (let i=0 ; i<transitions_needed ; i++) {
+                curDesktopCube.transitions.push(direction);
+             }
+          } else {
+             curDesktopCube = new Cube(null, null, null, transitions_needed, direction);
+          }
+       }
+    }
+}
 
 function CubeSettings(uuid) {
     this._init(uuid);

diff --git a/DesktopCube@yare/files/DesktopCube@yare/5.4/settings-schema.json b/DesktopCube@yare/files/DesktopCube@yare/5.4/settings-schema.json
@@ -22,6 +22,7 @@
     "includePanels": {
         "type": "checkbox",
         "description": "Include Panels",
+        "tooltip": "Include the panels while animating. In most cases the panels are not properly painted or completely invisible anyhow, so it's best to leave this disabled",
         "default": false
     },
     "patchmoveToWorkspace": {

diff --git a/DesktopCube@yare/files/DesktopCube@yare/metadata.json b/DesktopCube@yare/files/DesktopCube@yare/metadata.json
@@ -16,7 +16,7 @@
     "4.6",
     "5.4"
   ],
-  "version": "2.0.1",
+  "version": "2.0.2",
   "uuid": "DesktopCube@yare",
   "name": "Desktop Cube",
   "description": "Compiz Cube-like animation for workspace switching",

diff --git a/DesktopCube@yare/files/DesktopCube@yare/po/[email protected] b/DesktopCube@yare/files/DesktopCube@yare/po/[email protected]
@@ -5,10 +5,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: DesktopCube@yare 2.0.0\n"
+"Project-Id-Version: DesktopCube@yare 2.0.2\n"
 "Report-Msgid-Bugs-To: https://github.com/linuxmint/cinnamon-spices-"
 "extensions/issues\n"
-"POT-Creation-Date: 2024-11-20 10:20-0500\n"
+"POT-Creation-Date: 2024-12-21 14:16-0500\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -80,6 +80,13 @@ msgstr ""
 msgid "Include Panels"
 msgstr ""
 
+#. 5.4->settings-schema.json->includePanels->tooltip
+msgid ""
+"Include the panels while animating. In most cases the panels are not "
+"properly painted or completely invisible anyhow, so it's best to leave this "
+"disabled"
+msgstr ""
+
 #. 5.4->settings-schema.json->patchmoveToWorkspace->description
 msgid "Use Cube effect with the Workspace Switcher applet"
 msgstr ""

diff --git a/DesktopCube@yare/files/DesktopCube@yare/po/ca.po b/DesktopCube@yare/files/DesktopCube@yare/po/ca.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/linuxmint/cinnamon-spices-"
 "extensions/issues\n"
-"POT-Creation-Date: 2024-11-20 10:20-0500\n"
+"POT-Creation-Date: 2024-12-21 14:16-0500\n"
 "PO-Revision-Date: 2024-08-25 22:27+0200\n"
 "Last-Translator: \n"
 "Language-Team: Odyssey <[email protected]>\n"
@@ -83,6 +83,13 @@ msgstr ""
 msgid "Include Panels"
 msgstr "Incloure els taulers"
 
+#. 5.4->settings-schema.json->includePanels->tooltip
+msgid ""
+"Include the panels while animating. In most cases the panels are not "
+"properly painted or completely invisible anyhow, so it's best to leave this "
+"disabled"
+msgstr ""
+
 #. 5.4->settings-schema.json->patchmoveToWorkspace->description
 msgid "Use Cube effect with the Workspace Switcher applet"
 msgstr ""

diff --git a/DesktopCube@yare/files/DesktopCube@yare/po/da.po b/DesktopCube@yare/files/DesktopCube@yare/po/da.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/linuxmint/cinnamon-spices-"
 "extensions/issues\n"
-"POT-Creation-Date: 2024-11-20 10:20-0500\n"
+"POT-Creation-Date: 2024-12-21 14:16-0500\n"
 "PO-Revision-Date: 2022-08-07 15:06+0200\n"
 "Last-Translator: Alan Mortensen <[email protected]>\n"
 "Language-Team: \n"
@@ -83,6 +83,13 @@ msgstr ""
 msgid "Include Panels"
 msgstr ""
 
+#. 5.4->settings-schema.json->includePanels->tooltip
+msgid ""
+"Include the panels while animating. In most cases the panels are not "
+"properly painted or completely invisible anyhow, so it's best to leave this "
+"disabled"
+msgstr ""
+
 #. 5.4->settings-schema.json->patchmoveToWorkspace->description
 msgid "Use Cube effect with the Workspace Switcher applet"
 msgstr ""

diff --git a/DesktopCube@yare/files/DesktopCube@yare/po/de.po b/DesktopCube@yare/files/DesktopCube@yare/po/de.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/linuxmint/cinnamon-spices-"
 "extensions/issues\n"
-"POT-Creation-Date: 2024-11-20 10:20-0500\n"
+"POT-Creation-Date: 2024-12-21 14:16-0500\n"
 "PO-Revision-Date: 2021-03-02 22:50+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -83,6 +83,13 @@ msgstr ""
 msgid "Include Panels"
 msgstr ""
 
+#. 5.4->settings-schema.json->includePanels->tooltip
+msgid ""
+"Include the panels while animating. In most cases the panels are not "
+"properly painted or completely invisible anyhow, so it's best to leave this "
+"disabled"
+msgstr ""
+
 #. 5.4->settings-schema.json->patchmoveToWorkspace->description
 msgid "Use Cube effect with the Workspace Switcher applet"
 msgstr ""

diff --git a/DesktopCube@yare/files/DesktopCube@yare/po/es.po b/DesktopCube@yare/files/DesktopCube@yare/po/es.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/linuxmint/cinnamon-spices-"
 "extensions/issues\n"
-"POT-Creation-Date: 2024-11-20 10:20-0500\n"
+"POT-Creation-Date: 2024-12-21 14:16-0500\n"
 "PO-Revision-Date: 2024-11-20 18:29-0300\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -82,6 +82,13 @@ msgstr "Tamaño del cubo (porcentaje del tamaño de la pantalla)"
 msgid "Include Panels"
 msgstr "Incluir paneles"
 
+#. 5.4->settings-schema.json->includePanels->tooltip
+msgid ""
+"Include the panels while animating. In most cases the panels are not "
+"properly painted or completely invisible anyhow, so it's best to leave this "
+"disabled"
+msgstr ""
+
 #. 5.4->settings-schema.json->patchmoveToWorkspace->description
 msgid "Use Cube effect with the Workspace Switcher applet"
 msgstr "Utilizar el efecto Cubo con el applet de cambio de espacio de trabajo"

diff --git a/DesktopCube@yare/files/DesktopCube@yare/po/eu.po b/DesktopCube@yare/files/DesktopCube@yare/po/eu.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/linuxmint/cinnamon-spices-"
 "extensions/issues\n"
-"POT-Creation-Date: 2024-11-20 10:20-0500\n"
+"POT-Creation-Date: 2024-12-21 14:16-0500\n"
 "PO-Revision-Date: 2024-05-30 10:18+0200\n"
 "Last-Translator: Muxutruk <[email protected]>\n"
 "Language-Team: Basque <[email protected]>\n"
@@ -82,6 +82,13 @@ msgstr ""
 msgid "Include Panels"
 msgstr ""
 
+#. 5.4->settings-schema.json->includePanels->tooltip
+msgid ""
+"Include the panels while animating. In most cases the panels are not "
+"properly painted or completely invisible anyhow, so it's best to leave this "
+"disabled"
+msgstr ""
+
 #. 5.4->settings-schema.json->patchmoveToWorkspace->description
 msgid "Use Cube effect with the Workspace Switcher applet"
 msgstr ""

diff --git a/DesktopCube@yare/files/DesktopCube@yare/po/fi.po b/DesktopCube@yare/files/DesktopCube@yare/po/fi.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: DesktopCube@yare 1.1.0\n"
 "Report-Msgid-Bugs-To: https://github.com/linuxmint/cinnamon-spices-"
 "extensions/issues\n"
-"POT-Creation-Date: 2024-11-20 10:20-0500\n"
+"POT-Creation-Date: 2024-12-21 14:16-0500\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Kimmo Kujansuu <[email protected]>\n"
 "Language-Team: \n"
@@ -82,6 +82,13 @@ msgstr ""
 msgid "Include Panels"
 msgstr "Sisältää paneelit"
 
+#. 5.4->settings-schema.json->includePanels->tooltip
+msgid ""
+"Include the panels while animating. In most cases the panels are not "
+"properly painted or completely invisible anyhow, so it's best to leave this "
+"disabled"
+msgstr ""
+
 #. 5.4->settings-schema.json->patchmoveToWorkspace->description
 msgid "Use Cube effect with the Workspace Switcher applet"
 msgstr ""

diff --git a/DesktopCube@yare/files/DesktopCube@yare/po/fr.po b/DesktopCube@yare/files/DesktopCube@yare/po/fr.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/linuxmint/cinnamon-spices-"
 "extensions/issues\n"
-"POT-Creation-Date: 2024-11-20 10:20-0500\n"
+"POT-Creation-Date: 2024-12-21 14:16-0500\n"
 "PO-Revision-Date: 2019-02-13 16:49+0100\n"
 "Last-Translator: Claudiux <[email protected]>\n"
 "Language-Team: \n"
@@ -83,6 +83,13 @@ msgstr ""
 msgid "Include Panels"
 msgstr ""
 
+#. 5.4->settings-schema.json->includePanels->tooltip
+msgid ""
+"Include the panels while animating. In most cases the panels are not "
+"properly painted or completely invisible anyhow, so it's best to leave this "
+"disabled"
+msgstr ""
+
 #. 5.4->settings-schema.json->patchmoveToWorkspace->description
 msgid "Use Cube effect with the Workspace Switcher applet"
 msgstr ""

diff --git a/DesktopCube@yare/files/DesktopCube@yare/po/hr.po b/DesktopCube@yare/files/DesktopCube@yare/po/hr.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: DesktopCube@yare\n"
 "Report-Msgid-Bugs-To: https://github.com/linuxmint/cinnamon-spices-"
 "extensions/issues\n"
-"POT-Creation-Date: 2024-11-20 10:20-0500\n"
+"POT-Creation-Date: 2024-12-21 14:16-0500\n"
 "PO-Revision-Date: 2017-04-30 16:57+0200\n"
 "Last-Translator: gogo <[email protected]>\n"
 "Language-Team: \n"
@@ -84,6 +84,13 @@ msgstr ""
 msgid "Include Panels"
 msgstr ""
 
+#. 5.4->settings-schema.json->includePanels->tooltip
+msgid ""
+"Include the panels while animating. In most cases the panels are not "
+"properly painted or completely invisible anyhow, so it's best to leave this "
+"disabled"
+msgstr ""
+
 #. 5.4->settings-schema.json->patchmoveToWorkspace->description
 msgid "Use Cube effect with the Workspace Switcher applet"
 msgstr ""

diff --git a/DesktopCube@yare/files/DesktopCube@yare/po/hu.po b/DesktopCube@yare/files/DesktopCube@yare/po/hu.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/linuxmint/cinnamon-spices-"
 "extensions/issues\n"
-"POT-Creation-Date: 2024-11-20 10:20-0500\n"
+"POT-Creation-Date: 2024-12-21 14:16-0500\n"
 "PO-Revision-Date: 2024-11-25 13:45+0100\n"
 "Last-Translator: Kálmán „KAMI” Szalai <[email protected]>\n"
 "Language-Team: \n"
@@ -81,6 +81,13 @@ msgstr "Kocka mérete (a képernyő méretének százalékában)"
 msgid "Include Panels"
 msgstr "Tartalmazza a paneleket"
 
+#. 5.4->settings-schema.json->includePanels->tooltip
+msgid ""
+"Include the panels while animating. In most cases the panels are not "
+"properly painted or completely invisible anyhow, so it's best to leave this "
+"disabled"
+msgstr ""
+
 #. 5.4->settings-schema.json->patchmoveToWorkspace->description
 msgid "Use Cube effect with the Workspace Switcher applet"
 msgstr "Használja a Kocka effektust a Munkaterület-váltó kisalkalmazással"

diff --git a/DesktopCube@yare/files/DesktopCube@yare/po/it.po b/DesktopCube@yare/files/DesktopCube@yare/po/it.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/linuxmint/cinnamon-spices-"
 "extensions/issues\n"
-"POT-Creation-Date: 2024-11-20 10:20-0500\n"
+"POT-Creation-Date: 2024-12-21 14:16-0500\n"
 "PO-Revision-Date: 2022-06-03 10:52+0200\n"
 "Last-Translator: Dragone2 <[email protected]>\n"
 "Language-Team: \n"
@@ -84,6 +84,13 @@ msgstr ""
 msgid "Include Panels"
 msgstr ""
 
+#. 5.4->settings-schema.json->includePanels->tooltip
+msgid ""
+"Include the panels while animating. In most cases the panels are not "
+"properly painted or completely invisible anyhow, so it's best to leave this "
+"disabled"
+msgstr ""
+
 #. 5.4->settings-schema.json->patchmoveToWorkspace->description
 msgid "Use Cube effect with the Workspace Switcher applet"
 msgstr ""