mirror of
https://github.com/Eugeny/tabby.git
synced 2025-06-11 06:59:59 +00:00
work around win32 fluent background bugs - #949
This commit is contained in:
parent
2ef3a81dd8
commit
38a6e7fe67
@ -22,11 +22,16 @@ export interface WindowOptions {
|
|||||||
hidden?: boolean
|
hidden?: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
|
abstract class GlasstronWindow extends BrowserWindow {
|
||||||
|
blurType: string
|
||||||
|
abstract setBlur (_: boolean)
|
||||||
|
}
|
||||||
|
|
||||||
export class Window {
|
export class Window {
|
||||||
ready: Promise<void>
|
ready: Promise<void>
|
||||||
private visible = new Subject<boolean>()
|
private visible = new Subject<boolean>()
|
||||||
private closed = new Subject<void>()
|
private closed = new Subject<void>()
|
||||||
private window: BrowserWindow
|
private window: GlasstronWindow
|
||||||
private windowConfig: ElectronConfig
|
private windowConfig: ElectronConfig
|
||||||
private windowBounds: Rectangle
|
private windowBounds: Rectangle
|
||||||
private closing = false
|
private closing = false
|
||||||
@ -84,7 +89,7 @@ export class Window {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
this.window = new BrowserWindow(bwOptions)
|
this.window = new glasstron.BrowserWindow(bwOptions)
|
||||||
|
|
||||||
this.window.once('ready-to-show', () => {
|
this.window.once('ready-to-show', () => {
|
||||||
if (process.platform === 'darwin') {
|
if (process.platform === 'darwin') {
|
||||||
@ -129,21 +134,20 @@ export class Window {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
setVibrancy (enabled: boolean, type?: string): void {
|
setVibrancy (enabled: boolean, type?: string, userRequested?: boolean): void {
|
||||||
this.lastVibrancy = { enabled, type }
|
if (userRequested ?? true) {
|
||||||
|
this.lastVibrancy = { enabled, type }
|
||||||
|
}
|
||||||
if (process.platform === 'win32') {
|
if (process.platform === 'win32') {
|
||||||
if (parseFloat(os.release()) >= 10) {
|
if (parseFloat(os.release()) >= 10) {
|
||||||
glasstron.update(this.window, {
|
this.window.blurType = enabled ? type === 'fluent' ? 'acrylic' : 'blurbehind' : null
|
||||||
windows: { blurType: enabled ? type === 'fluent' ? 'acrylic' : 'blurbehind' : null },
|
this.window.setBlur(enabled)
|
||||||
})
|
|
||||||
} else {
|
} else {
|
||||||
DwmEnableBlurBehindWindow(this.window, enabled)
|
DwmEnableBlurBehindWindow(this.window, enabled)
|
||||||
}
|
}
|
||||||
} else if (process.platform === 'linux') {
|
} else if (process.platform === 'linux') {
|
||||||
glasstron.update(this.window, {
|
|
||||||
linux: { requestBlur: enabled },
|
|
||||||
})
|
|
||||||
this.window.setBackgroundColor(enabled ? '#00000000' : '#131d27')
|
this.window.setBackgroundColor(enabled ? '#00000000' : '#131d27')
|
||||||
|
this.window.setBlur(enabled)
|
||||||
} else {
|
} else {
|
||||||
this.window.setVibrancy(enabled ? 'dark' : null as any) // electron issue 20269
|
this.window.setVibrancy(enabled ? 'dark' : null as any) // electron issue 20269
|
||||||
}
|
}
|
||||||
@ -360,24 +364,21 @@ export class Window {
|
|||||||
this.disableVibrancyWhileDragging = value
|
this.disableVibrancyWhileDragging = value
|
||||||
})
|
})
|
||||||
|
|
||||||
this.window.on('will-move', () => {
|
let moveEndedTimeout: number|null = null
|
||||||
|
const onBoundsChange = () => {
|
||||||
if (!this.lastVibrancy?.enabled || !this.disableVibrancyWhileDragging) {
|
if (!this.lastVibrancy?.enabled || !this.disableVibrancyWhileDragging) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
let timeout: number|null = null
|
this.setVibrancy(false, undefined, false)
|
||||||
const oldVibrancy = this.lastVibrancy
|
if (moveEndedTimeout) {
|
||||||
this.setVibrancy(false)
|
clearTimeout(moveEndedTimeout)
|
||||||
const onMove = () => {
|
|
||||||
if (timeout) {
|
|
||||||
clearTimeout(timeout)
|
|
||||||
}
|
|
||||||
timeout = setTimeout(() => {
|
|
||||||
this.window.off('move', onMove)
|
|
||||||
this.setVibrancy(oldVibrancy.enabled, oldVibrancy.type)
|
|
||||||
}, 500)
|
|
||||||
}
|
}
|
||||||
this.window.on('move', onMove)
|
moveEndedTimeout = setTimeout(() => {
|
||||||
})
|
this.setVibrancy(this.lastVibrancy.enabled, this.lastVibrancy.type)
|
||||||
|
}, 50)
|
||||||
|
}
|
||||||
|
this.window.on('move', onBoundsChange)
|
||||||
|
this.window.on('resize', onBoundsChange)
|
||||||
}
|
}
|
||||||
|
|
||||||
private destroy () {
|
private destroy () {
|
||||||
|
@ -174,10 +174,7 @@ export class HostAppService {
|
|||||||
this.configChangeBroadcast.next()
|
this.configChangeBroadcast.next()
|
||||||
}))
|
}))
|
||||||
|
|
||||||
if (
|
if (isWindowsBuild(WIN_BUILD_FLUENT_BG_SUPPORTED)) {
|
||||||
isWindowsBuild(WIN_BUILD_FLUENT_BG_SUPPORTED) &&
|
|
||||||
!isWindowsBuild(WIN_BUILD_FLUENT_BG_MOVE_BUG_FIXED)
|
|
||||||
) {
|
|
||||||
electron.ipcRenderer.send('window-set-disable-vibrancy-while-dragging', true)
|
electron.ipcRenderer.send('window-set-disable-vibrancy-while-dragging', true)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -4,7 +4,6 @@ export const WIN_BUILD_CONPTY_SUPPORTED = 17692
|
|||||||
export const WIN_BUILD_CONPTY_STABLE = 18309
|
export const WIN_BUILD_CONPTY_STABLE = 18309
|
||||||
export const WIN_BUILD_WSL_EXE_DISTRO_FLAG = 17763
|
export const WIN_BUILD_WSL_EXE_DISTRO_FLAG = 17763
|
||||||
export const WIN_BUILD_FLUENT_BG_SUPPORTED = 17063
|
export const WIN_BUILD_FLUENT_BG_SUPPORTED = 17063
|
||||||
export const WIN_BUILD_FLUENT_BG_MOVE_BUG_FIXED = 18917
|
|
||||||
|
|
||||||
export function isWindowsBuild (build: number): boolean {
|
export function isWindowsBuild (build: number): boolean {
|
||||||
return process.platform === 'win32' && parseFloat(os.release()) >= 10 && parseInt(os.release().split('.')[2]) >= build
|
return process.platform === 'win32' && parseFloat(os.release()) >= 10 && parseInt(os.release().split('.')[2]) >= build
|
||||||
|
Loading…
x
Reference in New Issue
Block a user