From d4840bafaf88b07ee85ae3d6a8a8c847c5afb12f Mon Sep 17 00:00:00 2001
From: Eugene Pankov <john.pankov@gmail.com>
Date: Fri, 30 Jun 2017 19:39:01 +0200
Subject: [PATCH] Some docking fixes (fixed #13)

---
 terminus-core/src/services/docking.service.ts             | 4 ++--
 .../src/components/settingsTab.component.pug              | 8 ++++----
 terminus-settings/src/components/settingsTab.component.ts | 2 ++
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/terminus-core/src/services/docking.service.ts b/terminus-core/src/services/docking.service.ts
index c740ec1c..933232a7 100644
--- a/terminus-core/src/services/docking.service.ts
+++ b/terminus-core/src/services/docking.service.ts
@@ -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
         }
diff --git a/terminus-settings/src/components/settingsTab.component.pug b/terminus-settings/src/components/settingsTab.component.pug
index 48879d67..e20606a3 100644
--- a/terminus-settings/src/components/settingsTab.component.pug
+++ b/terminus-settings/src/components/settingsTab.component.pug
@@ -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'
diff --git a/terminus-settings/src/components/settingsTab.component.ts b/terminus-settings/src/components/settingsTab.component.ts
index 2ffb8d09..e3733121 100644
--- a/terminus-settings/src/components/settingsTab.component.ts
+++ b/terminus-settings/src/components/settingsTab.component.ts
@@ -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 {