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

Some docking fixes (fixed #13)

Browse Source
This commit is contained in:
Eugene Pankov 2017-06-30 19:39:01 +02:00
parent 9badd88c80
commit d4840bafaf
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
terminus-core/src/services/docking.service.ts
View File

@ -40,12 +40,12 @@ export class DockingService {
newBounds.height = Math.round(fill * display.bounds.height)
}
if (dockSide === 'right') {
newBounds.x = display.bounds.x + display.bounds.width * (1.0 - fill)
newBounds.x = display.bounds.x + Math.round(display.bounds.width * (1.0 - fill))
} else {
newBounds.x = display.bounds.x
}
if (dockSide === 'bottom') {
newBounds.y = display.bounds.y + display.bounds.height * (1.0 - fill)
newBounds.y = display.bounds.y + Math.round(display.bounds.height * (1.0 - fill))
} else {
newBounds.y = display.bounds.y
}

8
terminus-settings/src/components/settingsTab.component.pug
View File

@ -109,17 +109,17 @@ ngb-tabset.vertical(type='tabs')
label Display on
br
div(
'[(ngModel)]'='config.store.appearance.dockScreen'
'(ngModelChange)'='config.save(); docking.dock()'
[(ngModel)]='config.store.appearance.dockScreen',
(ngModelChange)='config.save(); docking.dock()',
ngbRadioGroup
)
label.btn.btn-secondary
input(
type='radio',
[value]='"current"'
value='current'
)
| Current
label.btn.btn-secondary(*ngFor='let screen of docking.getScreens()')
label.btn.btn-secondary(*ngFor='let screen of screens')
input(
type='radio',
[value]='screen.id'

2
terminus-settings/src/components/settingsTab.component.ts
View File

@ -14,6 +14,7 @@ import { SettingsTabProvider } from '../api'
export class SettingsTabComponent extends BaseTabComponent {
hotkeyFilter = ''
private hotkeyDescriptions: IHotkeyDescription[]
private screens
constructor (
public config: ConfigService,
@ -28,6 +29,7 @@ export class SettingsTabComponent extends BaseTabComponent {
this.hotkeyDescriptions = hotkeyProviders.map(x => x.hotkeys).reduce((a, b) => a.concat(b))
this.title$.next('Settings')
this.scrollable = true
this.screens = this.docking.getScreens()
}
getRecoveryToken (): any {