linux options

mtgatool · May 4, 2024 · 5005a49 · 5005a49
1 parent 38e3803
commit 5005a49
Show file tree

Hide file tree

Showing 6 changed files with 87 additions and 6 deletions.
diff --git a/src/common/defaultConfig.ts b/src/common/defaultConfig.ts
@@ -49,6 +49,10 @@ export const defaultConfig = {
   overlayOverview: true,
   overlayHover: true,
   overlaysTransparency: !!(electron && process.platform !== "linux"),
+  overlayResizable: false,
+  overlaySkipTaskbar: false,
+  overlayFrame: false,
+  overlayAcceptFirstMouse: true,
   settingsSection: 1,
   settingsOverlaySection: 0,
   cardsQuality: "normal" as CardQuality,
@@ -80,6 +84,7 @@ export const defaultConfig = {
         ...overlayCfg.bounds,
         width: 280,
         height: 600,
+        y: 64,
       },
       mode: OVERLAY_MIXED,
       autosize: true,
@@ -95,6 +100,7 @@ export const defaultConfig = {
         width: 280,
         height: 600,
         x: 300,
+        y: 64,
       },
       mode: OVERLAY_SEEN,
       autosize: true,
@@ -108,6 +114,7 @@ export const defaultConfig = {
         ...overlayCfg.bounds,
         width: 300,
         height: 600,
+        y: 64,
       },
       mode: OVERLAY_DRAFT,
       clock: false,
@@ -119,6 +126,7 @@ export const defaultConfig = {
         ...overlayCfg.bounds,
         width: 300,
         height: 600,
+        y: 64,
       },
       mode: OVERLAY_LOG,
       clock: false,
@@ -130,6 +138,7 @@ export const defaultConfig = {
         ...overlayCfg.bounds,
         width: 300,
         height: 600,
+        y: 64,
       },
       mode: OVERLAY_FULL,
       autosize: true,

diff --git a/src/components/App.tsx b/src/components/App.tsx
@@ -144,7 +144,13 @@ function App(props: AppProps) {
       <SettingsPersistor />
       <PopupComponent
         open={false}
-        className={isElectron() ? "settings-popup" : ""}
+        className={
+          isElectron()
+            ? os == "linux"
+              ? "settings-popup-linux"
+              : "settings-popup"
+            : ""
+        }
         width="100%"
         height="100%"
         openFnRef={openSettings}

diff --git a/src/components/views/settings/OverlaySettingsPanel.tsx b/src/components/views/settings/OverlaySettingsPanel.tsx
@@ -363,6 +363,34 @@ function setOverlaysTransparency(checked: boolean): void {
   });
 }
 
+// function setOverlaysResizable(checked: boolean): void {
+//   reduxAction(store.dispatch, {
+//     type: "SET_SETTINGS",
+//     arg: { overlayResizable: checked },
+//   });
+// }
+
+// function setOverlaysSkipTaskbar(checked: boolean): void {
+//   reduxAction(store.dispatch, {
+//     type: "SET_SETTINGS",
+//     arg: { overlaySkipTaskbar: checked },
+//   });
+// }
+
+function setOverlaysFrame(checked: boolean): void {
+  reduxAction(store.dispatch, {
+    type: "SET_SETTINGS",
+    arg: { overlayFrame: checked },
+  });
+}
+
+// function setOverlaysAcceptFirstMouse(checked: boolean): void {
+//   reduxAction(store.dispatch, {
+//     type: "SET_SETTINGS",
+//     arg: { overlayAcceptFirstMouse: checked },
+//   });
+// }
+
 export default function OverlaySettingsPanel() {
   const dispatch = useDispatch();
   const settings = useSelector((state: AppState) => state.settings);
@@ -482,6 +510,30 @@ export default function OverlaySettingsPanel() {
         callback={setOverlaysTransparency}
       />
 
+      {/* <Toggle
+        text="Resizable overlays"
+        value={settings.overlayResizable}
+        callback={setOverlaysResizable}
+      />
+
+      <Toggle
+        text="Skip overlays on taskbar"
+        value={settings.overlaySkipTaskbar}
+        callback={setOverlaysSkipTaskbar}
+      /> */}
+
+      <Toggle
+        text="Show frame on overlays"
+        value={settings.overlayFrame}
+        callback={setOverlaysFrame}
+      />
+
+      {/* <Toggle
+        text="Accept first mouse click on overlays"
+        value={settings.overlayAcceptFirstMouse}
+        callback={setOverlaysAcceptFirstMouse}
+      /> */}
+
       <div
         className="settings-note"
         style={{ margin: "24px auto 0px auto", width: "fit-content" }}

diff --git a/src/info.json b/src/info.json
@@ -1 +1 @@
-{"version":"6.6.8","branch":"dev","timestamp":1714786203110}
+{"version":"6.6.8","branch":"dev","timestamp":1714838419904}
diff --git a/src/overlay/createOverlay.ts b/src/overlay/createOverlay.ts
@@ -29,21 +29,23 @@ export default function createOverlay(
   const allSettings = JSON.parse(getLocalSetting("settings")) as Settings;
   const settings: OverlaySettings = allSettings.overlays[id];
 
+  console.warn("allSettings", id, allSettings);
+
   const newWindow = new remote.BrowserWindow({
     transparent: allSettings.overlaysTransparency,
-    // resizable: false,
-    // skipTaskbar: true,
+    // resizable: allSettings.overlayResizable,
+    // skipTaskbar: allSettings.overlaySkipTaskbar,
     focusable: !!allSettings.overlaysTransparency,
     backgroundColor: allSettings.overlaysTransparency ? undefined : "#0d0d0f",
     title: overlayIdToTitle[id],
     show: false,
-    frame: false,
+    frame: allSettings.overlayFrame,
     width: settings.bounds.width,
     height: settings.bounds.height,
     x: settings.bounds.x,
     y: settings.bounds.y,
     alwaysOnTop: true,
-    acceptFirstMouse: true,
+    acceptFirstMouse: allSettings.overlayAcceptFirstMouse,
     webPreferences: {
       webSecurity: false,
       nodeIntegration: true,

diff --git a/src/scss/popups.scss b/src/scss/popups.scss
@@ -302,6 +302,18 @@
   }
 }
 
+.settings-popup-linux {
+  background-color: transparent;
+  pointer-events: none;
+
+  .popup-box {
+    max-width: 100%;
+    max-height: 100%;
+    box-shadow: none;
+    pointer-events: all;
+  }
+}
+
 .electron-popup {
   top: 24px;
   height: calc(100% - 24px);