Merge pull request #57 from maykbrito/feat/dimensions

Feat: Custom dimensions
maykbrito · Nov 14, 2021 · 0e9ae44 · 0e9ae44
2 parents 4851c42 + f1e4ed2
commit 0e9ae44
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 5 deletions.
diff --git a/electron/lib/ScreenController.ts b/electron/lib/ScreenController.ts
@@ -1,4 +1,5 @@
 import { BrowserWindow, screen } from 'electron'
+import { userPreferences } from '../store'
 
 type ScreenSize = 'initial' | 'large'
 
@@ -35,7 +36,13 @@ export class ScreenController {
     this.currentScreenEdge = initialScreenEdge
     this.currentScreenSize = initialScreenSize
 
-    this.screenSizes = { initial: 300, large: 600 }
+    const {
+      store: { screen },
+    } = userPreferences
+    this.screenSizes = {
+      initial: screen.initial.width,
+      large: screen.large.width,
+    }
 
     const { x, y } = this.browserWindow.getBounds()
 

diff --git a/electron/main.ts b/electron/main.ts
@@ -231,14 +231,20 @@ async function createTrayContextMenu() {
  * Create main electron window
  */
 async function createWindow() {
+  const {
+    store: {
+      screen: { initial },
+    },
+  } = userPreferences
+
   win = new BrowserWindow({
     icon: nativeImage.createFromPath(
       path.join(assetsPath, 'assets', 'icon.png')
     ),
-    width: 300,
-    height: 300,
-    maxWidth: 300,
-    maxHeight: 300,
+    width: initial.width,
+    height: initial.height,
+    maxWidth: initial.width,
+    maxHeight: initial.height,
     frame: false,
     titleBarStyle: 'customButtonsOnHover',
     transparent: true,

diff --git a/electron/store.ts b/electron/store.ts
@@ -65,6 +65,33 @@ const userPreferencesSchema: Schema<unknown> = {
       },
     },
   },
+  screen: {
+    type: JSONSchemaType.Object,
+    properties: {
+      initial: {
+        type: JSONSchemaType.Object,
+        properties: {
+          width: {
+            type: JSONSchemaType.Number,
+          },
+          height: {
+            type: JSONSchemaType.Number,
+          },
+        },
+      },
+      large: {
+        type: JSONSchemaType.Object,
+        properties: {
+          width: {
+            type: JSONSchemaType.Number,
+          },
+          height: {
+            type: JSONSchemaType.Number,
+          },
+        },
+      },
+    },
+  },
   rounded: {
     type: JSONSchemaType.Boolean,
   },
@@ -112,6 +139,16 @@ export const userPreferences = new Store({
       },
       hideCamera: 'Shift+Alt+CommandOrControl+3',
     },
+    screen: {
+      initial: {
+        width: 300,
+        height: 300,
+      },
+      large: {
+        width: 600,
+        heigth: 600,
+      },
+    },
     rounded: true,
     clipPath: '',
     flipHorizontal: false,

diff --git a/src/config.ts b/src/config.ts
@@ -12,6 +12,10 @@ const config = {
   borderColorCss: userPreferences.borderColorCss,
   showBorder: userPreferences.showBorder,
   clipPath: userPreferences.clipPath,
+  screenInitialWidth: userPreferences.screen.initial.width,
+  screenInitialHeight: userPreferences.screen.initial.height,
+  screenLargeWidth: userPreferences.screen.large.width,
+  screenLargeHeight: userPreferences.screen.large.height,
 }
 
 export { config }