Merge pull request lost-ark-dev#21 from raphlau/patch-1

Add setting to toggle alwaysOnTop on or off
TheDarkNoise · Jul 12, 2023 · 2da7221 · 2da7221
2 parents b2e5a3c + 586bc36
commit 2da7221
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 2 deletions.
diff --git a/src-electron/electron-main.ts b/src-electron/electron-main.ts
@@ -331,6 +331,7 @@ const ipcFunctions: {
     });
 
     damageMeterWindow?.setOpacity(appSettings.damageMeter.design.opacity);
+    damageMeterWindow?.setAlwaysOnTop(appSettings.damageMeter.design.alwaysOnTop, "normal");
   },
   "get-settings": (event) => {
     event.reply("on-settings-change", appSettings);

diff --git a/src-electron/electron-windows/damage-meter-window.ts b/src-electron/electron-windows/damage-meter-window.ts
@@ -24,7 +24,7 @@ export function createDamageMeterWindow(
     resizable: true,
     autoHideMenuBar: true,
     fullscreenable: false,
-    alwaysOnTop: true,
+    alwaysOnTop: appSettings?.damageMeter?.design?.alwaysOnTop ?? true,
     useContentSize: true,
     webPreferences: {
       devTools: process.env.DEBUGGING,
@@ -49,7 +49,7 @@ export function createDamageMeterWindow(
       initWindow(damageMeterWindow, "damage_meter");
     });
 
-  damageMeterWindow.setAlwaysOnTop(true, "normal");
+  damageMeterWindow.setAlwaysOnTop(appSettings?.damageMeter?.design?.alwaysOnTop ?? true, "normal");
 
   // Event listeners
   liveParser.on("reset-state", (state: GameState) => {

diff --git a/src-electron/util/app-settings.ts b/src-electron/util/app-settings.ts
@@ -114,6 +114,7 @@ export type Settings = {
       pinUserToTop: boolean;
       transparency: boolean;
       opacity: number;
+      alwaysOnTop: boolean;
     };
     header: {
       [key: string]: {
@@ -204,6 +205,7 @@ const defaultSettings: Settings = {
       pinUserToTop: false,
       transparency: true,
       opacity: 0.9,
+      alwaysOnTop: true,
     },
     header: {
       damage: {

diff --git a/src/components/SettingsPage/DamageMeterPage.vue b/src/components/SettingsPage/DamageMeterPage.vue
@@ -264,6 +264,21 @@
       </q-item-section>
     </q-item>
 
+    <q-item tag="label">
+      <q-item-section side top>
+        <q-checkbox
+          v-model="settingsStore.settings.damageMeter.design.alwaysOnTop"
+        />
+      </q-item-section>
+
+      <q-item-section>
+        <q-item-label>Always on top</q-item-label>
+        <q-item-label caption>
+          Keeps the damage meter above other windows.
+        </q-item-label>
+      </q-item-section>
+    </q-item>
+
     <q-item tag="label">
       <q-item-section side top>
         <q-checkbox

diff --git a/src/stores/settings.ts b/src/stores/settings.ts
@@ -71,6 +71,7 @@ export const useSettingsStore = defineStore("settings", {
           pinUserToTop: false,
           opacity: 0.9,
           transparency: false,
+          alwaysOnTop: true,
         },
         header: {
           damage: {