Fixed custom positioning

saif-ellafi · Oct 25, 2023 · 2ef04ac · 2ef04ac
1 parent 331cb47
commit 2ef04ac
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 30 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 1.6.7
+* Enhancement: Improved setting change detection
+* Bugfix: Fixed broken hotbar and navigation custom positioning (Thanks @GambetTV)
+
 ### 1.6.6
 * Bugfix: Fixed several issues with Minimal UI when using Camera views
 * Compatibility: Fixed player list overlapping with other mods in general 

diff --git a/module.json b/module.json
@@ -10,7 +10,7 @@
 		}
 	],
 	"description": "Minimal UI allows customizing Foundry interface, by hiding, collapsing or resizing specific parts.",
-	"version": "1.6.6",
+	"version": "1.6.7",
 	"compatibility": {
 		"minimum": "10",
 		"verified": "11.313",
@@ -49,7 +49,7 @@
 	],
 	"url": "https://github.com/saif-ellafi/foundryvtt-minimal-ui.git",
 	"manifest": "https://github.com/saif-ellafi/foundryvtt-minimal-ui/releases/latest/download/module.json",
-	"download": "https://github.com/saif-ellafi/foundryvtt-minimal-ui/releases/download/1.6.6/foundryvtt-minimal-ui_1.6.6.zip",
+	"download": "https://github.com/saif-ellafi/foundryvtt-minimal-ui/releases/download/1.6.7/foundryvtt-minimal-ui_1.6.7.zip",
 	"readme": "https://github.com/saif-ellafi/foundryvtt-minimal-ui/blob/main/README.md",
 	"license": "https://github.com/saif-ellafi/foundryvtt-minimal-ui/blob/main/LICENSE.md",
 	"changelog": "https://github.com/saif-ellafi/foundryvtt-minimal-ui/blob/main/CHANGELOG.md"

diff --git a/modules/component/hotbar.js b/modules/component/hotbar.js
@@ -18,8 +18,6 @@ export default class MinimalUIHotbar {
     static cssHotbarControlsMargin = '0px';
     static cssHotbarCustomHotbarCompatHover = '10px';
 
-    static cssHotbarBottomWinBottom = '33px'
-
     static htmlHotbarLockButton =
         `
         <a class="minui-lock" id="bar-lock">
@@ -97,7 +95,7 @@ export default class MinimalUIHotbar {
                 break;
             }
             case 'manual': {
-                rootStyle.setProperty('--hotbarxpos', (game.settings.get('minimal-ui', 'hotbarPixelPosition') + webrtcAdjust) + 'px');
+                rootStyle.setProperty('--hotbarxpos', (parseInt(game.settings.get('minimal-ui', 'hotbarPixelPosition')) + webrtcAdjust) + 'px');
                 break;
             }
         }
@@ -207,7 +205,7 @@ export default class MinimalUIHotbar {
             }
         });
 
-        Hooks.on('renderCameraViews', function() {
+        Hooks.on('rtcSettingsChanged', function() {
             MinimalUIHotbar.positionHotbar();
         })
 

diff --git a/modules/component/navigation.js b/modules/component/navigation.js
@@ -3,21 +3,18 @@ import '../../styles/component/navigation.css';
 
 export default class MinimalUINavigation {
 
-    static cssSceneNavNoLogoStart = '-9px';
-    static cssSceneNavNoLogoStartStarfinder = '-2px';
-    static cssSceneNavNoLogoStartRtc = '-115px';
+    static cssSceneNavNoLogoStart = 10;
 
     static async collapseNavigation() {
         await ui.nav.collapse();
     }
 
     static positionNav() {
+        let navixpos = game.settings.get('minimal-ui', 'foundryLogoSize') === 'hidden' ? MinimalUINavigation.cssSceneNavNoLogoStart : 120;
         if (game.webrtc.mode > 0 && !ui.webrtc.element.hasClass('hidden'))
-            rootStyle.setProperty('--navixpos', MinimalUINavigation.cssSceneNavNoLogoStartRtc);
-        else if (game.system.id === 'sfrpg') // starfinder has something, ugly fix
-            rootStyle.setProperty('--navixpos', MinimalUINavigation.cssSceneNavNoLogoStartStarfinder);
-        else
-            rootStyle.setProperty('--navixpos', MinimalUINavigation.cssSceneNavNoLogoStart);
+            if (game.webrtc.settings.client.dockPosition === 'left')
+                navixpos += ui.webrtc.position.width;
+        rootStyle.setProperty('--navixpos', navixpos + 'px');
     }
 
     static initSettings() {
@@ -34,7 +31,7 @@ export default class MinimalUINavigation {
                 "hidden": game.i18n.localize("MinimalUI.SettingsHide")
             },
             default: "collapsed",
-            onChange: debouncedReload
+            onChange: MinimalUINavigation.positionNav
         });
 
         game.settings.register('minimal-ui', 'sceneNavigationSize', {
@@ -101,17 +98,10 @@ export default class MinimalUINavigation {
         });
 
         Hooks.on('renderSceneNavigation', async function () {
-
-            switch (game.settings.get('minimal-ui', 'foundryLogoSize')) {
-                case 'hidden': {
-                    MinimalUINavigation.positionNav();
-                    break;
-                }
-            }
-
+            MinimalUINavigation.positionNav();
         });
 
-        Hooks.on('renderCameraViews', function () {
+        Hooks.on('rtcSettingsChanged', function () {
             MinimalUINavigation.positionNav();
         });
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "foundryvtt-minimal-ui",
-  "version": "1.6.6",
+  "version": "1.6.7",
   "description": "Minimal UI allows customizing Foundry interface, by hiding, collapsing or resizing specific parts.",
   "main": "minimalui.js",
   "scripts": {

diff --git a/styles/component/navigation.css b/styles/component/navigation.css
@@ -1,6 +1,6 @@
 :root {
     --navivis: hidden;
-    --navixpos: 100px;
+    --navixpos: 120px;
     --navixmg: 75px;
     --navilh: 20px;
     --navifs: 14px;
@@ -13,7 +13,7 @@
     visibility: var(--navivis);
     opacity: var(--opacity);
     transition: 0.5s ease-out 0.5s;
-    position: relative;
+    position: fixed;
     margin: 5px 0 0 0;
 }