Merge pull request #107 from bornova/dev

Dev
bornova · Nov 26, 2024 · 6c377c2 · 6c377c2
2 parents 8d59acf + 65698c7
commit 6c377c2
Show file tree

Hide file tree

Showing 10 changed files with 83 additions and 81 deletions.
diff --git a/build/css/dark.css b/build/css/dark.css
diff --git a/build/css/light.css b/build/css/light.css
diff --git a/build/css/numara.css b/build/css/numara.css
diff --git a/build/js/numara.js b/build/js/numara.js
diff --git a/build/js/numara.js.map b/build/js/numara.js.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "numara",
   "productName": "Numara",
   "description": "Numara Calculator",
-  "version": "5.7.1",
+  "version": "5.7.2",
   "author": {
     "name": "Timur Atalay",
     "email": "[email protected]",
@@ -41,10 +41,10 @@
     "mathjs": "^14.0.0",
     "prettier": "^3.3.3",
     "tinykeys": "^3.0.0",
-    "uikit": "^3.21.14"
+    "uikit": "^3.21.16"
   },
   "dependencies": {
-    "electron-log": "^5.2.2",
+    "electron-log": "^5.2.3",
     "electron-store": "^10.0.0",
     "electron-updater": "^6.3.9"
   }

diff --git a/src/js/app.js b/src/js/app.js
@@ -23,6 +23,9 @@ document.title = description
 if (isElectron) {
   numara.themeUpdate(settings.apply)
   numara.fullscreen()
+  numara.restored(() => {
+    cm.focus()
+  })
 }
 
 // Set headers

diff --git a/src/main.js b/src/main.js
@@ -41,15 +41,12 @@ function appWindow() {
     backgroundColor:
       theme === 'system' ? (nativeTheme.shouldUseDarkColors ? dark : light) : theme === 'dark' ? dark : light,
     frame: false,
-    hasShadow: true,
     height: parseInt(config.get('appHeight')),
     width: parseInt(config.get('appWidth')),
     minHeight: 360,
     minWidth: 420,
-    paintWhenInitiallyHidden: false,
     show: false,
     titleBarStyle: 'hiddenInset',
-    useContentSize: true,
     webPreferences: {
       preload: path.join(import.meta.dirname, 'preload.cjs'),
       spellcheck: false
@@ -94,6 +91,7 @@ function appWindow() {
 
   win.on('maximize', () => win.webContents.send('isMax', true))
   win.on('unmaximize', () => win.webContents.send('isMax', false))
+  win.on('restore', () => win.webContents.send('restored', true))
 
   if (app.isPackaged) {
     win.on('focus', () => globalShortcut.registerAll(['CommandOrControl+R', 'F5'], () => {}))

diff --git a/src/preload.cjs b/src/preload.cjs
@@ -29,6 +29,7 @@ contextBridge.exposeInMainWorld('numara', {
   isMaximized: () => ipcRenderer.sendSync('isMaximized'),
   isResized: () => ipcRenderer.sendSync('isResized'),
   resetSize: () => ipcRenderer.send('resetSize'),
+  restored: (callback) => ipcRenderer.on('restored', callback),
 
   // Import
   import: () => ipcRenderer.send('import'),