gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-04 05:28:59 +01:00
Code Issues Actions 26 Packages Projects Releases Wiki Activity

fix(native-buttons): regressions on server

Browse Source
This commit is contained in:
Elian Doran 2024-12-07 00:20:02 +02:00
parent 88a93e3a7b
commit 0f48ccd53c
No known key found for this signature in database
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/public/app/layouts/desktop_layout.js
View File

@ -84,6 +84,7 @@ import CopyImageReferenceButton from "../widgets/floating_buttons/copy_image_ref
import ScrollPaddingWidget from "../widgets/scroll_padding.js"; import ScrollPaddingWidget from "../widgets/scroll_padding.js";
import ClassicEditorToolbar from "../widgets/ribbon_widgets/classic_editor_toolbar.js"; import ClassicEditorToolbar from "../widgets/ribbon_widgets/classic_editor_toolbar.js";
import options from "../services/options.js"; import options from "../services/options.js";
import utils from "../services/utils.js";
export default class DesktopLayout { export default class DesktopLayout {
constructor(customWidgets) { constructor(customWidgets) {
@ -95,6 +96,7 @@ export default class DesktopLayout {
const launcherPaneIsHorizontal = (options.get("layoutOrientation") === "horizontal"); const launcherPaneIsHorizontal = (options.get("layoutOrientation") === "horizontal");
const launcherPane = this.#buildLauncherPane(launcherPaneIsHorizontal); const launcherPane = this.#buildLauncherPane(launcherPaneIsHorizontal);
const isElectron = (utils.isElectron());
const isMac = (window.glob.platform === "darwin"); const isMac = (window.glob.platform === "darwin");
const isWindows = (window.glob.platform === "win32"); const isWindows = (window.glob.platform === "win32");
const hasNativeTitleBar = (window.glob.hasNativeTitleBar); const hasNativeTitleBar = (window.glob.hasNativeTitleBar);
@ -103,7 +105,7 @@ export default class DesktopLayout {
* If true, the tab bar is displayed above the launcher pane with full width; if false (default), the tab bar is displayed in the rest pane. * If true, the tab bar is displayed above the launcher pane with full width; if false (default), the tab bar is displayed in the rest pane.
* On macOS we need to force the full-width tab bar on Electron in order to allow the semaphore (window controls) enough space. * On macOS we need to force the full-width tab bar on Electron in order to allow the semaphore (window controls) enough space.
*/ */
const fullWidthTabBar = (launcherPaneIsHorizontal || (!hasNativeTitleBar && isMac)); const fullWidthTabBar = (launcherPaneIsHorizontal || (isElectron && !hasNativeTitleBar && isMac));
const customTitleBarButtons = (hasNativeTitleBar && !isMac && !isWindows); const customTitleBarButtons = (hasNativeTitleBar && !isMac && !isWindows);
return new RootContainer(true) return new RootContainer(true)