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

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
child_duckling 2022-02-03 20:15:58 -08:00
commit 7395086bea
3 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -46,8 +46,8 @@ export class BrowserWindow {
hasShadow: false, hasShadow: false,
show: false, show: false,
backgroundColor: "#1E1E1E", backgroundColor: "#1E1E1E",
titleBarStyle: 'customButtonsOnHover', titleBarStyle: 'hidden',
trafficLightPosition: {x: 960, y: 20}, trafficLightPosition: {x: 15, y: 20},
webPreferences: { webPreferences: {
nodeIntegration: true, nodeIntegration: true,
sandbox: true, sandbox: true,
@ -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();
}); });

2
src/renderer/style.less
View file

@ -876,6 +876,7 @@ input[type=range].web-slider::-webkit-slider-runnable-track {
.app-chrome .app-chrome--left { .app-chrome .app-chrome--left {
width: 30%; width: 30%;
justify-content: left; justify-content: left;
-webkit-app-region: drag;
} }
.app-chrome .app-chrome--center { .app-chrome .app-chrome--center {
@ -5961,6 +5962,7 @@ body[platform='darwin'] {
.app-chrome .app-chrome-item > .app-mainmenu { .app-chrome .app-chrome-item > .app-mainmenu {
opacity: 0; opacity: 0;
pointer-events: none; pointer-events: none;
-webkit-app-region: drag;
} }
} }

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>