okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed the platform check as mac no longer calls it

Browse source
This commit is contained in:
Core 2022-02-04 04:14:38 +00:00
parent 82fa96c329
commit e97a2f35d4
No known key found for this signature in database
GPG key ID: FE9BF1B547F8F3C6
2 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/main/base/browserwindow.ts
View file

@ -440,13 +440,11 @@ export class BrowserWindow {
return await search(u); return await search(u);
}); });
ipcMain.on("close", (_event, platformCheck) => { ipcMain.on("close", (_event) => {
if (platformCheck && process.platform === "darwin") return
BrowserWindow.win.close(); BrowserWindow.win.close();
}); });
ipcMain.on("maximize", (_event, platformCheck) => { ipcMain.on("maximize", (_event) => {
if (platformCheck && process.platform === "darwin") return
// listen for maximize event // listen for maximize event
if (BrowserWindow.win.isMaximized()) { if (BrowserWindow.win.isMaximized()) {
BrowserWindow.win.unmaximize(); BrowserWindow.win.unmaximize();
@ -459,8 +457,7 @@ export class BrowserWindow {
BrowserWindow.win.unmaximize(); BrowserWindow.win.unmaximize();
}); });
ipcMain.on("minimize", (_event, platformCheck) => { ipcMain.on("minimize", () => {
if (platformCheck && process.platform === "darwin") return
// listen for minimize event // listen for minimize event
BrowserWindow.win.minimize(); BrowserWindow.win.minimize();
}); });

14
src/renderer/views/main.ejs
View file

@ -42,12 +42,12 @@
<div class="app-chrome--left"> <div class="app-chrome--left">
<div class="app-chrome-item full-height" v-if="chrome.windowControlPosition == 'left'"> <div class="app-chrome-item full-height" v-if="chrome.windowControlPosition == 'left'">
<div class="window-controls"> <div class="window-controls">
<div class="close" @click="ipcRenderer.send('close', true)"></div> <div class="close" @click="ipcRenderer.send('close')"></div>
<div class="minimize" @click="ipcRenderer.send('minimize', true)"></div> <div class="minimize" @click="ipcRenderer.send('minimize')"></div>
<div class="minmax restore" v-if="chrome.maximized" <div class="minmax restore" v-if="chrome.maximized"
@click="ipcRenderer.send('maximize', true)"> @click="ipcRenderer.send('maximize')">
</div> </div>
<div class="minmax" v-else @click="ipcRenderer.send('maximize', true)"></div> <div class="minmax" v-else @click="ipcRenderer.send('maximize')"></div>
</div> </div>
</div> </div>
<div class="app-chrome-item full-height" v-else> <div class="app-chrome-item full-height" v-else>
@ -174,12 +174,12 @@
</div> </div>
<div class="app-chrome-item full-height" id="window-controls-container" v-if="chrome.windowControlPosition == 'right'"> <div class="app-chrome-item full-height" id="window-controls-container" v-if="chrome.windowControlPosition == 'right'">
<div class="window-controls"> <div class="window-controls">
<div class="minimize" @click="ipcRenderer.send('minimize', true)"></div> <div class="minimize" @click="ipcRenderer.send('minimize')"></div>
<div class="minmax restore" v-if="chrome.maximized" <div class="minmax restore" v-if="chrome.maximized"
@click="ipcRenderer.send('maximize', true)"> @click="ipcRenderer.send('maximize')">
</div> </div>
<div class="minmax" v-else @click="ipcRenderer.send('maximize')"></div> <div class="minmax" v-else @click="ipcRenderer.send('maximize')"></div>
<div class="close" @click="ipcRenderer.send('close', true)"></div> <div class="close" @click="ipcRenderer.send('close')"></div>
</div> </div>
</div> </div>
</div> </div>