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

fix: force display title-bar when tab-bar on left/right

Browse Source
This commit is contained in:
Clem Fern 2023-11-18 17:29:39 +01:00
parent 72149d2cb0
commit f4af21bf71
3 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tabby-core/src/components/appRoot.component.pug
View File

@ -1,6 +1,6 @@
title-bar( title-bar(
*ngIf='ready && !hostWindow.isFullscreen && config.store.appearance.frame == "full" && config.store.appearance.dock == "off"', *ngIf='ready && !hostWindow.isFullscreen && config.store.appearance.dock == "off" && (config.store.appearance.frame == "full" || isTilteBarNeeded())',
(dblclick)='hostWindow.toggleMaximize()', (dblclick)='toggleMaximize()',
[hideControls]='hostApp.platform !== Platform.Linux && !hostWindow.isFullscreen', [hideControls]='hostApp.platform !== Platform.Linux && !hostWindow.isFullscreen',
[class.inset]='hostApp.platform == Platform.macOS && !hostWindow.isFullscreen' [class.inset]='hostApp.platform == Platform.macOS && !hostWindow.isFullscreen'
) )
@ -9,13 +9,13 @@ title-bar(
*ngIf='ready', *ngIf='ready',
[class.tabs-on-top]='config.store.appearance.tabsLocation == "top" || config.store.appearance.tabsLocation == "left"', [class.tabs-on-top]='config.store.appearance.tabsLocation == "top" || config.store.appearance.tabsLocation == "left"',
[class.tabs-on-left]='hasVerticalTabs() && config.store.appearance.tabsLocation == "left"', [class.tabs-on-left]='hasVerticalTabs() && config.store.appearance.tabsLocation == "left"',
[class.tabs-titlebar-enabled]='config.store.appearance.frame == "full"', [class.tabs-titlebar-enabled]='config.store.appearance.frame == "full" || isTilteBarNeeded()',
[class.tabs-on-right]='hasVerticalTabs() && config.store.appearance.tabsLocation == "right"', [class.tabs-on-right]='hasVerticalTabs() && config.store.appearance.tabsLocation == "right"',
) )
.tab-bar( .tab-bar(
*ngIf='!hostWindow.isFullscreen || config.store.appearance.tabsInFullscreen', *ngIf='!hostWindow.isFullscreen || config.store.appearance.tabsInFullscreen',
[class.tab-bar-no-controls-overlay]='hostApp.platform == Platform.macOS', [class.tab-bar-no-controls-overlay]='hostApp.platform == Platform.macOS',
(dblclick)='hostWindow.toggleMaximize()' (dblclick)='toggleMaximize(config.store.appearance.frame == "full" || isTilteBarNeeded())'
) )
.inset.background(*ngIf='hostApp.platform == Platform.macOS \ .inset.background(*ngIf='hostApp.platform == Platform.macOS \
&& !hostWindow.isFullscreen \ && !hostWindow.isFullscreen \
@ -64,7 +64,12 @@ title-bar(
(transfersChange)='onTransfersChange()' (transfersChange)='onTransfersChange()'
) )
.drag-space.background([class.persistent]='config.store.appearance.frame == "thin"') .btn-space.background(
[class.persistent]='config.store.appearance.frame == "thin"',
[class.drag]='config.store.appearance.frame == "thin" \
&& config.store.appearance.tabsLocation != "left" \
&& config.store.appearance.tabsLocation != "right"'
)
.btn-group.background .btn-group.background
.d-flex( .d-flex(
@ -84,7 +89,9 @@ title-bar(
window-controls.background( window-controls.background(
*ngIf='config.store.appearance.frame == "thin" \ *ngIf='config.store.appearance.frame == "thin" \
&& (hostApp.platform == Platform.Linux)', && config.store.appearance.tabsLocation != "left" \
&& config.store.appearance.tabsLocation != "right" \
&& hostApp.platform == Platform.Linux',
) )
div.window-controls-spacer( div.window-controls-spacer(

9
tabby-core/src/components/appRoot.component.scss
View File

@ -62,7 +62,7 @@ $tab-border-radius: 4px;
} }
} }
.drag-space { .btn-space {
flex: auto; flex: auto;
} }
@ -126,15 +126,18 @@ $tab-border-radius: 4px;
min-width: 0; min-width: 0;
} }
&>.drag-space { &>.btn-space {
min-width: 1px; min-width: 1px;
flex: 1 0 1%; flex: 1 0 1%;
-webkit-app-region: drag;
.tabs-on-top & { .tabs-on-top & {
margin-top: 2px; // for window resizing margin-top: 2px; // for window resizing
} }
&.drag {
-webkit-app-region: drag;
}
&.persistent { &.persistent {
// min-width: 72px; // 2 x 36 px height, ie 2 squares // min-width: 72px; // 2 x 36 px height, ie 2 squares
// Given WCO on Windows, the min-width of the window buttons is about 138px. // Given WCO on Windows, the min-width of the window buttons is about 138px.

10
tabby-core/src/components/appRoot.component.ts
View File

@ -240,4 +240,14 @@ export class AppRootComponent {
return (await this.commands.getCommands({ tab: this.app.activeTab ?? undefined })) return (await this.commands.getCommands({ tab: this.app.activeTab ?? undefined }))
.filter(x => x.locations?.includes(aboveZero ? CommandLocation.RightToolbar : CommandLocation.LeftToolbar)) .filter(x => x.locations?.includes(aboveZero ? CommandLocation.RightToolbar : CommandLocation.LeftToolbar))
} }
toggleMaximize (ignore=false): void {
if (!ignore) {
this.hostWindow.toggleMaximize()
}
}
isTilteBarNeeded (): boolean {
return this.config.store.appearance.frame === 'thin' && this.config.store.appearance.tabsLocation !== 'top' && this.config.store.appearance.tabsLocation !== 'bottom'
}
} }