GuanM/tabby
1
0
Fork 0
mirror of https://github.com/Eugeny/tabby.git synced 2025-07-20 02:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed macOS vibrancy

Browse Source
This commit is contained in:
Eugene Pankov
2021-01-02 13:08:00 +01:00
parent 4d237baf33
commit fef19615bb
4 changed files with 64 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/lib/window.ts
View File

@@ -9,6 +9,8 @@ import { BrowserWindow, app, ipcMain, Rectangle, Menu, screen, BrowserWindowCons
import ElectronConfig = require('electron-config')
import * as os from 'os'
import * as path from 'path'
import macOSRelease from 'macos-release'
import * as compareVersions from 'compare-versions'
import { parseArgs } from './cli'
import { loadConfig } from './config'
@@ -27,6 +29,8 @@ abstract class GlasstronWindow extends BrowserWindow {
abstract setBlur (_: boolean)
}
const macOSVibrancyType = compareVersions.compare(macOSRelease().version, '10.14', '>=') ? 'fullscreen-ui' : 'dark'
export class Window {
ready: Promise<void>
private visible = new Subject<boolean>()
@@ -89,11 +93,15 @@ export class Window {
}
}
this.window = new glasstron.BrowserWindow(bwOptions)
if (process.platform === 'darwin') {
this.window = new BrowserWindow(bwOptions) as GlasstronWindow
} else {
this.window = new glasstron.BrowserWindow(bwOptions)
}
this.window.once('ready-to-show', () => {
if (process.platform === 'darwin') {
this.window.setVibrancy('window')
this.window.setVibrancy(macOSVibrancyType)
} else if (process.platform === 'win32' && (this.configStore.appearance || {}).vibrancy) {
this.setVibrancy(true)
}
@@ -149,7 +157,7 @@ export class Window {
this.window.setBackgroundColor(enabled ? '#00000000' : '#131d27')
this.window.setBlur(enabled)
} else {
this.window.setVibrancy(enabled ? 'dark' : null as any) // electron issue 20269
this.window.setVibrancy(enabled ? macOSVibrancyType : null)
}
}