gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix title bar buttons visibility

Browse Source
This commit is contained in:
zadam 2020-02-08 18:25:07 +01:00
parent 60d07a6871
commit 08687b76ea
2 changed files with 33 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/public/javascripts/widgets/tab_caching_widget.js
View File

@ -36,7 +36,7 @@ export default class TabCachingWidget extends TabAwareWidget {
if (!widget) { if (!widget) {
widget = this.widgets[this.tabContext.tabId] = this.widgetFactory(); widget = this.widgets[this.tabContext.tabId] = this.widgetFactory();
this.children.push(widget);console.log("Creating widget",widget.componentId,"for", this.tabContext.tabId); this.children.push(widget);
this.$widget.after(widget.render()); this.$widget.after(widget.render());
widget.eventReceived('setTabContext', {tabContext: this.tabContext}); widget.eventReceived('setTabContext', {tabContext: this.tabContext});

67
src/public/javascripts/widgets/title_bar_buttons.js
View File

@ -8,7 +8,6 @@ const TPL = `
.title-bar-buttons { .title-bar-buttons {
margin-top: 4px; margin-top: 4px;
min-width: 100px; min-width: 100px;
display: none;
} }
</style> </style>
@ -19,42 +18,40 @@ const TPL = `
export default class TitleBarButtonsWidget extends BasicWidget { export default class TitleBarButtonsWidget extends BasicWidget {
doRender() { doRender() {
if (!options.is('nativeTitleBarVisible')) { if (!utils.isElectron() || options.is('nativeTitleBarVisible')) {
this.$widget = $(TPL); return this.$widget = $('<div>');
this.$widget.show();
const $minimizeBtn = this.$widget.find(".minimize-btn");
const $maximizeBtn = this.$widget.find(".maximize-btn");
const $closeBtn = this.$widget.find(".close-btn");
$minimizeBtn.on('click', () => {
$minimizeBtn.trigger('blur');
const {remote} = require('electron');
remote.BrowserWindow.getFocusedWindow().minimize();
});
$maximizeBtn.on('click', () => {
$maximizeBtn.trigger('blur');
const {remote} = require('electron');
const focusedWindow = remote.BrowserWindow.getFocusedWindow();
if (focusedWindow.isMaximized()) {
focusedWindow.unmaximize();
} else {
focusedWindow.maximize();
}
});
$closeBtn.on('click', () => {
$closeBtn.trigger('blur');
const {remote} = require('electron');
remote.BrowserWindow.getFocusedWindow().close();
});
}
else {
this.$widget = $('<div>');
} }
this.$widget = $(TPL);
const $minimizeBtn = this.$widget.find(".minimize-btn");
const $maximizeBtn = this.$widget.find(".maximize-btn");
const $closeBtn = this.$widget.find(".close-btn");
$minimizeBtn.on('click', () => {
$minimizeBtn.trigger('blur');
const {remote} = require('electron');
remote.BrowserWindow.getFocusedWindow().minimize();
});
$maximizeBtn.on('click', () => {
$maximizeBtn.trigger('blur');
const {remote} = require('electron');
const focusedWindow = remote.BrowserWindow.getFocusedWindow();
if (focusedWindow.isMaximized()) {
focusedWindow.unmaximize();
} else {
focusedWindow.maximize();
}
});
$closeBtn.on('click', () => {
$closeBtn.trigger('blur');
const {remote} = require('electron');
remote.BrowserWindow.getFocusedWindow().close();
});
return this.$widget; return this.$widget;
} }
} }