refined vertical tabs

terminus-core/src/components/appRoot.component.pug

@@ -3,133 +3,105 @@ title-bar(
   [class.inset]='hostApp.platform == Platform.macOS'
 )
 
-.wrap
+.content(
-  .tab-bar.vertical(
+    [class.tabs-on-top]='config.store.appearance.tabsLocation == "top" || config.store.appearance.tabsLocation == "left"',
-    *ngIf='config.store.appearance.tabsLocation == "left"'
+    [class.tabs-on-side]='hasVerticalTabs()',
-  )
+)
-      .inset.background(*ngIf='hostApp.platform == Platform.macOS \
+    .tab-bar
-        && config.store.appearance.frame == "thin"')
+        .inset.background(*ngIf='hostApp.platform == Platform.macOS \
-      .tabs.vertical(
+        && config.store.appearance.frame == "thin" \
-          dnd-sortable-container,
+        && (config.store.appearance.tabsLocation == "top" || config.store.appearance.tabsLocation == "left")')
-          [sortableData]='app.tabs',
+        .tabs(
-      )
+            *ngIf='config.store.appearance.tabsLocation != "bottom"'
-          tab-header(
+            dnd-sortable-container,
-              *ngFor='let tab of app.tabs; let idx = index',
+            [sortableData]='app.tabs',
-              dnd-sortable,
+        )
-              [sortableIndex]='idx',
+            tab-header(
-              (onDragStart)='onTabDragStart()',
+                *ngFor='let tab of app.tabs; let idx = index',
-              (onDragEnd)='onTabDragEnd()',
+                dnd-sortable,
+                [sortableIndex]='idx',
+                (onDragStart)='onTabDragStart()',
+                (onDragEnd)='onTabDragEnd()',
 
-              [index]='idx',
+                [index]='idx',
-              [tab]='tab',
+                [tab]='tab',
-              [active]='tab == app.activeTab',
+                [active]='tab == app.activeTab',
-              [hasActivity]='tab.activity$|async',
+                [hasActivity]='tab.activity$|async',
-              @animateTab,
+                @animateTab,
-              (click)='app.selectTab(tab)',
+                [@.disabled]='hasVerticalTabs()',
-              [class.fully-draggable]='hostApp.platform != Platform.macOS',
+                (click)='app.selectTab(tab)',
-              [class.drag-region]='hostApp.platform == Platform.macOS && !tabsDragging',
+                [class.fully-draggable]='hostApp.platform != Platform.macOS',
-              [class.vertical]='true',
+                [class.drag-region]='hostApp.platform == Platform.macOS && !tabsDragging',
-          )
+            )
 
+        .btn-group.background
+            .d-flex(
+                *ngFor='let button of leftToolbarButtons',
+                ngbDropdown,
+                (openChange)='generateButtonSubmenu(button)',
+            )
+                button.btn.btn-secondary.btn-tab-bar(
+                    [title]='button.title',
+                    (click)='button.click && button.click()',
+                    [fastHtmlBind]='button.icon',
+                    ngbDropdownToggle,
+                )
+                div(*ngIf='button.submenu', ngbDropdownMenu)
+                    button.dropdown-item.d-flex.align-items-center(
+                        *ngFor='let item of button.submenuItems',
+                        (click)='item.click()',
+                        ngbDropdownItem,
+                    )
+                        .icon-wrapper(
+                            *ngIf='hasIcons(button.submenuItems)',
+                            [fastHtmlBind]='item.icon'
+                        )
+                        div([class.ml-3]='hasIcons(button.submenuItems)') {{item.title}}
 
-  .content(
+        .drag-space.background([class.persistent]='config.store.appearance.frame == "thin" && hostApp.platform != Platform.macOS')
-      [class.tabs-on-top]='config.store.appearance.tabsLocation == "top" || config.store.appearance.tabsLocation == "left"',
-      [class.with-side-tab]='config.store.appearance.tabsLocation == "left"',
-  )
-      .tab-bar
-          .inset.background(*ngIf='hostApp.platform == Platform.macOS \
-            && config.store.appearance.frame == "thin" \
-            && (config.store.appearance.tabsLocation == "top" || config.store.appearance.tabsLocation == "left")')
-          .tabs(
-              *ngIf='config.store.appearance.tabsLocation != "left"'
-              dnd-sortable-container,
-              [sortableData]='app.tabs',
-          )
-              tab-header(
-                  *ngFor='let tab of app.tabs; let idx = index',
-                  dnd-sortable,
-                  [sortableIndex]='idx',
-                  (onDragStart)='onTabDragStart()',
-                  (onDragEnd)='onTabDragEnd()',
 
-                  [index]='idx',
+        .btn-group.background
-                  [tab]='tab',
+            .d-flex(
-                  [active]='tab == app.activeTab',
+                *ngFor='let button of rightToolbarButtons',
-                  [hasActivity]='tab.activity$|async',
+                ngbDropdown,
-                  @animateTab,
+                (openChange)='generateButtonSubmenu(button)',
-                  (click)='app.selectTab(tab)',
+            )
-                  [class.fully-draggable]='hostApp.platform != Platform.macOS',
+                button.btn.btn-secondary.btn-tab-bar(
-                  [class.drag-region]='hostApp.platform == Platform.macOS && !tabsDragging',
+                    [title]='button.title',
-              )
+                    (click)='button.click && button.click()',
+                    [fastHtmlBind]='button.icon',
+                    ngbDropdownToggle,
+                )
+                div(*ngIf='button.submenu', ngbDropdownMenu)
+                    button.dropdown-item.d-flex.align-items-center(
+                        *ngFor='let item of button.submenuItems',
+                        (click)='item.click()',
+                        ngbDropdownItem,
+                    )
+                        .icon-wrapper(
+                            *ngIf='hasIcons(button.submenuItems)',
+                            [fastHtmlBind]='item.icon'
+                        )
+                        div([class.ml-3]='hasIcons(button.submenuItems)') {{item.title}}
 
-          .btn-group.background
+            button.btn.btn-secondary.btn-tab-bar.btn-update(
-              .d-flex(
+                *ngIf='updatesAvailable',
-                  *ngFor='let button of leftToolbarButtons',
+                title='Update available - Click to install',
-                  ngbDropdown,
+                (click)='updateApp()',
-                  (openChange)='generateButtonSubmenu(button)',
+                [fastHtmlBind]='updateIcon'
-              )
+            )
-                  button.btn.btn-secondary.btn-tab-bar(
-                      [title]='button.title',
-                      (click)='button.click && button.click()',
-                      [fastHtmlBind]='button.icon',
-                      ngbDropdownToggle,
-                  )
-                  div(*ngIf='button.submenu', ngbDropdownMenu)
-                      button.dropdown-item.d-flex.align-items-center(
-                          *ngFor='let item of button.submenuItems',
-                          (click)='item.click()',
-                          ngbDropdownItem,
-                      )
-                          .icon-wrapper(
-                              *ngIf='hasIcons(button.submenuItems)',
-                              [fastHtmlBind]='item.icon'
-                          )
-                          div([class.ml-3]='hasIcons(button.submenuItems)') {{item.title}}
 
-          .drag-space.background([class.persistent]='config.store.appearance.frame == "thin" && hostApp.platform != Platform.macOS')
+        window-controls.background(
+            *ngIf='config.store.appearance.frame == "thin" \
+            && (hostApp.platform == Platform.Windows || hostApp.platform == Platform.Linux)',
+        )
 
-          .btn-group.background
+    start-page(*ngIf='ready && app.tabs.length == 0')
-              .d-flex(
-                  *ngFor='let button of rightToolbarButtons',
-                  ngbDropdown,
-                  (openChange)='generateButtonSubmenu(button)',
-              )
-                  button.btn.btn-secondary.btn-tab-bar(
-                      [title]='button.title',
-                      (click)='button.click && button.click()',
-                      [fastHtmlBind]='button.icon',
-                      ngbDropdownToggle,
-                  )
-                  div(*ngIf='button.submenu', ngbDropdownMenu)
-                      button.dropdown-item.d-flex.align-items-center(
-                          *ngFor='let item of button.submenuItems',
-                          (click)='item.click()',
-                          ngbDropdownItem,
-                      )
-                          .icon-wrapper(
-                              *ngIf='hasIcons(button.submenuItems)',
-                              [fastHtmlBind]='item.icon'
-                          )
-                          div([class.ml-3]='hasIcons(button.submenuItems)') {{item.title}}
 
-              button.btn.btn-secondary.btn-tab-bar.btn-update(
+    tab-body(
-                  *ngIf='updatesAvailable',
+        *ngFor='let tab of unsortedTabs',
-                  title='Update available - Click to install',
+        [active]='tab == app.activeTab',
-                  (click)='updateApp()',
+        [tab]='tab',
-                  [fastHtmlBind]='updateIcon'
+    )
-              )
-
-          window-controls.background(
-              *ngIf='config.store.appearance.frame == "thin" \
-                && (hostApp.platform == Platform.Windows || hostApp.platform == Platform.Linux)',
-          )
-
-      start-page(*ngIf='ready && app.tabs.length == 0')
-      
-      tab-body(
-          *ngFor='let tab of unsortedTabs',
-          [active]='tab == app.activeTab',
-          [tab]='tab',
-      )
 
 ng-template(ngbModalContainer)

terminus-core/src/components/appRoot.component.scss

@@ -35,26 +35,49 @@ $side-tab-width: 200px;
         flex-direction: column;
     }
 
-    &.with-side-tab {
+    &.tabs-on-side {
-        width: calc(100% - #{$side-tab-width});
+        flex-direction: row-reverse;
+
+        &.tabs-on-top {
+            flex-direction: row;
+        }
     }
 
 }
 
+.content.tabs-on-side > .tab-bar {
+    height: 100%;
+    width: $side-tab-width;
+    overflow-y: auto;
+    overflow-x: hidden;
+    flex-direction: column;
+    background: rgba(0, 0, 0, 0.25);
+
+    .tabs {
+        width: $side-tab-width;
+        flex: none;
+        flex-direction: column;
+
+        tab-header {
+            flex: 0 0 $tabs-height;
+        }
+    }
+
+    .drag-space {
+        flex: auto;
+    }
+}
+
+
 .tab-bar {
     flex: none;
     height: $tabs-height;
     display: flex;
     width: 100%;
-    &.vertical {
-        height: 100%;
-        width: $side-tab-width;
-        overflow-y: auto;
-        overflow-x: hidden;
-    }
 
     .btn-tab-bar {
         line-height: $tabs-height + 2px;
+        height: $tabs-height;
         cursor: pointer;
 
         display: flex;
@@ -79,12 +102,6 @@ $side-tab-width: 200px;
         flex: 0 1 auto;
         display: flex;
         min-width: 0;
-
-        &.vertical {
-          width: $side-tab-width;
-          flex: auto;
-          flex-direction: column;
-        }
     }
 
     &>.drag-space {
@@ -100,7 +117,10 @@ $side-tab-width: 200px;
 
     & > .inset {
         width: 85px;
+        height: $tabs-height;
         flex: none;
+        opacity: 0;
+        -webkit-app-region: drag;
     }
 
     window-controls {

terminus-core/src/components/appRoot.component.ts

@@ -184,6 +184,10 @@ export class AppRootComponent {
         return false
     }
 
+    hasVerticalTabs () {
+        return this.config.store.appearance.tabsLocation === 'left' || this.config.store.appearance.tabsLocation === 'right'
+    }
+
     async updateApp () {
         if ((await this.electron.showMessageBox(
             this.hostApp.getWindow(),

terminus-settings/src/components/settingsTab.component.pug

@@ -43,21 +43,28 @@ ngb-tabset.vertical(type='pills', [activeId]='activeTab')
                             ngbButton,
                             [value]='"top"'
                         )
-                        | On the top
+                        | Top
                     label.btn.btn-secondary(ngbButtonLabel)
                         input(
                             type='radio',
                             ngbButton,
                             [value]='"bottom"'
                         )
-                        | At the bottom
+                        | Bottom
                     label.btn.btn-secondary(ngbButtonLabel)
                         input(
                             type='radio',
                             ngbButton,
                             [value]='"left"'
                         )
-                        | At the left
+                        | Left
+                    label.btn.btn-secondary(ngbButtonLabel)
+                        input(
+                            type='radio',
+                            ngbButton,
+                            [value]='"right"'
+                        )
+                        | Right
 
             .form-line
                 .header