fix: use old mask offset for plasma 6.1.x or lower

Author: luisbocanegra

package/contents/ui/code/version.js

@@ -0,0 +1,106 @@
+/**
+ * @enum
+ */
+const VersionDifference = {
+    Lower: 0,
+    Greater: 1,
+    Equal: 2,
+};
+
+class Version {
+    /**
+     *
+     * @param {string} version Version string e.g 1.2.3
+     */
+    constructor(version) {
+        this._version = version;
+    }
+
+    get version() {
+        return this._version;
+    }
+
+    /**
+     * Compare two versions
+     * @param {string} version1 Version 1
+     * @param {string} version2 Version 2
+     * @returns {VersionDifference}
+     */
+    compareVersions(version1, version2) {
+        var v1 = version1.split("-")[0].split(".").map(Number);
+        var v2 = version2.split("-")[0].split(".").map(Number);
+
+        for (var i = 0; i < v1.length; ++i) {
+            if (v2.length == i) {
+                return VersionDifference.Greater;
+            }
+            if (v1[i] == v2[i]) {
+                continue;
+            } else if (v1[i] > v2[i]) {
+                return VersionDifference.Greater;
+            } else {
+                return VersionDifference.Lower;
+            }
+        }
+
+        if (version1.includes("-") && !version2.includes("-")) {
+            return VersionDifference.Lower;
+        } else if (!version1.includes("-") && version2.includes("-")) {
+            return VersionDifference.Greater;
+        } else if (version1.includes("-") && version2.includes("-")) {
+            let suffix1 = version1.split("-")[1];
+            let suffix2 = version2.split("-")[1];
+            if (suffix1 > suffix2) {
+                return VersionDifference.Greater;
+            } else if (suffix1 < suffix2) {
+                return VersionDifference.Lower;
+            }
+        }
+
+        return v1.length != v2.length
+            ? VersionDifference.Lower
+            : VersionDifference.Equal;
+    }
+
+    /**
+     * Compare version
+     * @param {string} version2 Version to compare against
+     * @returns {VersionDifference} Difference between versions
+     */
+    compare(version2) {
+        return this.compareVersions(this._version, version2);
+    }
+
+    /**
+     * Check if is Lower
+     * @param {string} version2 Version to compare against
+     * @returns {bool} Whether or not `version2` is Lower
+     */
+    isLowerThan(version2) {
+        return VersionDifference.Lower === this.compare(version2);
+    }
+
+    /**
+     * Check if is Greater
+     * @param {string} version2 Version to compare against
+     * @returns {bool} Whether or not `version2` is Greater
+     */
+    isGreaterThan(version2) {
+        return VersionDifference.Greater === this.compare(version2);
+    }
+
+    /**
+     * Check if is equal
+     * @param {string} version2 Version to compare against
+     * @returns {bool} Whether or not `version2` is equal
+     */
+    isEqual(version2) {
+        return VersionDifference.Equal === this.compare(version2);
+    }
+}
+
+// console.log(new Version("6.3.80").isLowerThan("6.2.0")); // false
+// console.log(new Version("6.3.80").isGreaterThan("6.2.0")); // true
+// console.log(new Version("6.3.80").isLowerThan("6.2.0")); // false
+// console.log(new Version("6.3").isLowerThan("6.2.5")); // false
+// console.log(new Version("6.1.5").isLowerThan("6.2.0")); // true

package/contents/ui/main.qml

@@ -19,6 +19,7 @@ import "components" as Components
 import "code/utils.js" as Utils
 import "code/globals.js" as Globals
 import "code/enum.js" as Enum
+import "code/version.js" as VersionUtil
 
 PlasmoidItem {
     id: main
@@ -147,6 +148,7 @@ PlasmoidItem {
     property var panelWidth: panelElement?.width ?? 0
     property var panelHeight: panelElement?.height ?? 0
     property bool debug: plasmoid.configuration.enableDebug
+    property var plasmaVersion: new VersionUtil.Version("999.999.999") // to assume latest
     signal recolorCountChanged()
     signal refreshNeeded()
     signal updateUnified()
@@ -1136,12 +1138,14 @@ PlasmoidItem {
 
         // TODO find where does 16 and 8 come from instead of blindly hardcoding them
         property real moveX: {
-            let m = horizontal ? 0 : (panelElement?.floating && plasmoid.location === PlasmaCore.Types.RightEdge ? 16 : 0)
+            const edge = main.plasmaVersion.isLowerThan("6.2.0") ? PlasmaCore.Types.LeftEdge : PlasmaCore.Types.RightEdge
+            const m = horizontal ? 0 : (panelElement?.floating && plasmoid.location === edge ? 16 : 0)
             return floatigness > 0 ? 8 : m
         }
 
         property real moveY: {
-            let m = horizontal ? (panelElement?.floating && plasmoid.location === PlasmaCore.Types.BottomEdge ? 16 : 0) : 0
+            const edge = main.plasmaVersion.isLowerThan("6.2.0") ? PlasmaCore.Types.TopEdge : PlasmaCore.Types.BottomEdge
+            const m = horizontal ? (panelElement?.floating && plasmoid.location === edge ? 16 : 0) : 0
             return floatigness > 0 ? 8 : m
         }
 
@@ -1228,8 +1232,6 @@ PlasmoidItem {
         delayed: true
     }
 
-    // TODO: should we remove option for blur from per-widget settings?
-    // IMO doesn't make much sense to have only some widgets blurred...
     Binding {
         target: panelElement
         property: "panelMask"
@@ -1617,6 +1619,7 @@ PlasmoidItem {
 
     Component.onCompleted: {
         bindPlasmoidStatus()
+        runCommand.run("plasmashell --version")
         Qt.callLater(function() {
             const config = Utils.mergeConfigs(Globals.defaultConfig, cfg)
             plasmoid.configuration.globalSettings = Utils.stringify(config)
@@ -1646,9 +1649,10 @@ PlasmoidItem {
                 console.error(cmd, exitCode, exitStatus, stdout, stderr)
                 return
             }
+            stdout = stdout.trim()
             if (cmd.startsWith("cat")) {
                 try {
-                    presetContent = JSON.parse(stdout.trim())
+                    presetContent = JSON.parse(stdout)
                 } catch (e) {
                     console.error(`Error reading preset (${cmd}): ${e}`)
                     return
@@ -1657,6 +1661,11 @@ PlasmoidItem {
                 plasmoid.configuration.lastPreset = lastPreset
                 plasmoid.configuration.writeConfig();
             }
+            if (cmd === "plasmashell --version") {
+                const parts = stdout.split(" ")
+                if (parts.length < 2) return
+                main.plasmaVersion = new VersionUtil.Version(parts[1])
+            }
         }
     }