skip unnecessary ops

This commit is contained in:
Eugene Pankov
2019-02-24 14:39:05 +01:00
parent e6e88272c2
commit 33281b5caf
2 changed files with 12 additions and 6 deletions

View File

@@ -20,21 +20,23 @@ export class DockingService {
} }
dock () { dock () {
let dockSide = this.config.store.appearance.dock
if (dockSide === 'off') {
this.hostApp.setAlwaysOnTop(false)
return
}
let display = this.electron.screen.getAllDisplays() let display = this.electron.screen.getAllDisplays()
.filter((x) => x.id === this.config.store.appearance.dockScreen)[0] .filter((x) => x.id === this.config.store.appearance.dockScreen)[0]
if (!display) { if (!display) {
display = this.getCurrentScreen() display = this.getCurrentScreen()
} }
let dockSide = this.config.store.appearance.dock
let newBounds: Bounds = { x: 0, y: 0, width: 0, height: 0 } let newBounds: Bounds = { x: 0, y: 0, width: 0, height: 0 }
let fill = this.config.store.appearance.dockFill let fill = this.config.store.appearance.dockFill
let [minWidth, minHeight] = this.hostApp.getWindow().getMinimumSize() let [minWidth, minHeight] = this.hostApp.getWindow().getMinimumSize()
if (dockSide === 'off') {
this.hostApp.setAlwaysOnTop(false)
return
}
if (dockSide === 'left' || dockSide === 'right') { if (dockSide === 'left' || dockSide === 'right') {
newBounds.width = Math.max(minWidth, Math.round(fill * display.bounds.width)) newBounds.width = Math.max(minWidth, Math.round(fill * display.bounds.width))
newBounds.height = display.bounds.height newBounds.height = display.bounds.height

View File

@@ -3,7 +3,7 @@ import { TouchBarSegmentedControl, SegmentedControlSegment } from 'electron'
import { AppService } from './app.service' import { AppService } from './app.service'
import { ConfigService } from './config.service' import { ConfigService } from './config.service'
import { ElectronService } from './electron.service' import { ElectronService } from './electron.service'
import { HostAppService } from './hostApp.service' import { HostAppService, Platform } from './hostApp.service'
import { IToolbarButton, ToolbarButtonProvider } from '../api' import { IToolbarButton, ToolbarButtonProvider } from '../api'
@Injectable({ providedIn: 'root' }) @Injectable({ providedIn: 'root' })
@@ -31,6 +31,10 @@ export class TouchbarService {
} }
update () { update () {
if (this.hostApp.platform !== Platform.macOS) {
return
}
let buttons: IToolbarButton[] = [] let buttons: IToolbarButton[] = []
this.config.enabledServices(this.toolbarButtonProviders).forEach(provider => { this.config.enabledServices(this.toolbarButtonProviders).forEach(provider => {
buttons = buttons.concat(provider.provide()) buttons = buttons.concat(provider.provide())