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

Various changes for macos build

Browse source
This commit is contained in:
Core 2022-02-02 17:52:19 +00:00
parent eb97b43e90
commit bd18804ccd
3 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -41,11 +41,13 @@ export class BrowserWindow {
minHeight: 390,
frame: false,
title: "Cider",
vibrancy: "dark",
vibrancy: "fullscreen-ui",
transparent: process.platform === "darwin",
hasShadow: false,
show: false,
backgroundColor: "#1E1E1E",
titleBarStyle: 'customButtonsOnHover',
trafficLightPosition: { x: 960, y: 20 },
webPreferences: {
nodeIntegration: true,
sandbox: true,
@ -383,11 +385,13 @@ export class BrowserWindow {
return await yt.search(u);
});
ipcMain.on("close", () => {
ipcMain.on("close", (_event, mac) => {
if (mac) return
BrowserWindow.win.close();
});
ipcMain.on("maximize", () => {
ipcMain.on("maximize", (_event, mac) => {
if (mac) return
// listen for maximize event
if (BrowserWindow.win.isMaximized()) {
BrowserWindow.win.unmaximize();
@ -400,7 +404,8 @@ export class BrowserWindow {
BrowserWindow.win.unmaximize();
});
ipcMain.on("minimize", () => {
ipcMain.on("minimize", (_event, mac) => {
if (mac) return
// listen for minimize event
BrowserWindow.win.minimize();
});

4
src/renderer/style.less
View file

@ -1072,7 +1072,7 @@ input[type=range].web-slider::-webkit-slider-runnable-track {
body[platform="darwin"] .app-chrome .app-chrome-item > .window-controls > div.minimize {
height: 12px;
width: 12px;
background-color: rgb(0, 202, 86);
background-color: rgb(255, 92, 92);
border-radius: 50%;
display: inline-block;
margin: auto 4px;
@ -1099,7 +1099,7 @@ body[platform="darwin"] .app-chrome .app-chrome-item > .window-controls > div.mi
body[platform="darwin"] .app-chrome .app-chrome-item > .window-controls > div.close {
height: 12px;
width: 12px;
background-color: rgb(255, 92, 92);
background-color: rgb(0, 202, 86);
border-radius: 50%;
display: inline-block;
margin: auto 4px auto 4px;

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

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