Fix FramelessNavigation logic (#2437)

CityOfZion · Sep 30, 2022 · 72d251e · 72d251e
1 parent 96bd240
commit 72d251e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/app/components/FramelessNavigation/FramelessNavigation.jsx b/app/components/FramelessNavigation/FramelessNavigation.jsx
@@ -7,7 +7,7 @@ import Minimize from '../../assets/icons/minimize.svg'
 import Maximize from '../../assets/icons/maximize.svg'
 import styles from './FramelessNavigation.scss'
 
-const { remote } = require('electron')
+const { ipcRenderer } = require('electron')
 
 type Props = {}
 
@@ -33,18 +33,15 @@ const platformsNames = {
 
 export default class HeaderBar extends React.PureComponent<Props> {
   minimize = () => {
-    const win = remote.BrowserWindow.getFocusedWindow()
-    win.minimize()
+    ipcRenderer.invoke('minimize')
   }
 
   maximize = () => {
-    const win = remote.BrowserWindow.getFocusedWindow()
-    win.setFullScreen(!win.isFullScreen())
+    ipcRenderer.invoke('maximize')
   }
 
   close = () => {
-    const win = remote.BrowserWindow.getFocusedWindow()
-    win.close()
+    ipcRenderer.invoke('close')
   }
 
   render() {

diff --git a/main.js b/main.js
@@ -287,6 +287,19 @@ ipcMain.handle('dialog', async (event, method, params) => {
   return result
 })
 
+ipcMain.handle('minimize', () => {
+  const win = BrowserWindow.getFocusedWindow()
+  win.minimize()
+})
+ipcMain.handle('maximize', () => {
+  const win = BrowserWindow.getFocusedWindow()
+  win.setFullScreen(!win.isFullScreen())
+})
+ipcMain.handle('close', () => {
+  const win = BrowserWindow.getFocusedWindow()
+  win.close()
+})
+
 autoUpdater.logger = log
 autoUpdater.logger.transports.file.level = 'info'