This commit is contained in:
Eugene Pankov
2017-04-28 16:55:51 +02:00
parent 633ef9e791
commit cfd26ba4ea
8 changed files with 58 additions and 24 deletions

View File

@@ -1,9 +1,9 @@
//title-bar(*ngIf='!config.store.appearance.useNativeFrame && config.store.appearance.dock == "off"')
title-bar(*ngIf='config.store.appearance.frame == "full" && config.store.appearance.dock == "off"')
.content(
[class.tabs-on-top]='config.store.appearance.tabsOnTop'
)
.tab-bar(*ngIf='app.tabs.length > 0')
.tab-bar
.tabs
tab-header(
*ngFor='let tab of app.tabs; let idx = index',
@@ -32,6 +32,22 @@
)
i.fa([class]='"fa fa-" + button.icon')
button.btn.btn-secondary.btn-minimize(
*ngIf='config.store.appearance.frame == "thin"',
(click)='hostApp.minimize()',
)
i.fa.fa-window-minimize
button.btn.btn-secondary.btn-maximize(
*ngIf='config.store.appearance.frame == "thin"',
(click)='hostApp.toggleMaximize()',
)
i.fa.fa-window-maximize
button.btn.btn-secondary.btn-close(
*ngIf='config.store.appearance.frame == "thin"',
(click)='hostApp.quit()',
)
i.fa.fa-close
start-page(*ngIf='app.tabs.length == 0')
tab-body(

View File

@@ -44,6 +44,18 @@ $tab-border-radius: 4px;
color: #aaa;
border: none;
border-radius: 0;
&.btn-minimize {
margin-left: 10px;
}
&.btn-minimize, &.btn-maximize {
font-size: 8px;
}
&.btn-close {
font-size: 12px;
}
}
&>.tabs {

View File

@@ -123,9 +123,6 @@ export class AppRootComponent {
}
}
}
setImmediate(() => {
this.docking.dock()
})
}
getLeftToolbarButtons (): IToolbarButton[] { return this.getToolbarButtons(false) }

View File

@@ -4,4 +4,4 @@ appearance:
dockFill: 50
tabsOnTop: true
theme: 'Standard'
useNativeFrame: false
frame: 'thin'

View File

@@ -52,8 +52,10 @@ export class DockingService {
}
this.hostApp.setAlwaysOnTop(true)
this.hostApp.unmaximize()
this.hostApp.setBounds(newBounds)
//this.hostApp.unmaximize()
setImmediate(() => {
this.hostApp.setBounds(newBounds)
})
}
getCurrentScreen () {

View File

@@ -84,14 +84,10 @@ title-bar {
app-root {
background: $body-bg;
&> .content {
background: $body-bg2;
.tab-bar {
background: $body-bg;
&>button {
&:not(:hover):not(:active) {
background: $body-bg2;