From 5f03df576a81c06b346d4659d7021c078880e1cb Mon Sep 17 00:00:00 2001 From: Vanessa Date: Fri, 27 Jan 2023 10:27:14 +0800 Subject: [PATCH] :green_heart: --- app/src/layout/Wnd.ts | 9 +++++++-- app/src/window/setHeader.ts | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/src/layout/Wnd.ts b/app/src/layout/Wnd.ts index 6b4daef7c..d6a62f666 100644 --- a/app/src/layout/Wnd.ts +++ b/app/src/layout/Wnd.ts @@ -17,6 +17,7 @@ import {Constants} from "../constants"; /// #if !BROWSER import {webFrame} from "electron"; import {getCurrentWindow} from "@electron/remote"; +import {setTabPosition} from "../window/setHeader"; /// #endif import {Search} from "../search"; import {showMessage} from "../dialog/message"; @@ -30,7 +31,6 @@ import {newFile} from "../util/newFile"; import {MenuItem} from "../menus/Menu"; import {escapeHtml} from "../util/escape"; import {isWindow} from "../util/functions"; -import {setTabPosition} from "../window/setHeader"; export class Wnd { public id: string; @@ -109,12 +109,14 @@ export class Wnd { break; } else if (target.tagName === "SPAN" && target.className === "fn__flex-1" && isWindow() && this.headersElement.getBoundingClientRect().top <= 0) { + /// #if !BROWSER const currentWindow = getCurrentWindow(); if (currentWindow.isMaximized()) { currentWindow.unmaximize(); } else { currentWindow.maximize(); } + /// #endif break; } target = target.parentElement; @@ -328,7 +330,9 @@ export class Wnd { switchWnd(newWnd, targetWnd); } } + /// #if !BROWSER setTabPosition(); + /// #endif return; } @@ -504,8 +508,9 @@ export class Wnd { } else if (this.children.length > window.siyuan.config.fileTree.maxOpenTabCount) { this.removeOverCounter(oldFocusIndex); } - + /// #if !BROWSER setTabPosition(); + /// #endif } private renderTabList(event: MouseEvent) { diff --git a/app/src/window/setHeader.ts b/app/src/window/setHeader.ts index b1cf9dcc3..8ee87f38f 100644 --- a/app/src/window/setHeader.ts +++ b/app/src/window/setHeader.ts @@ -1,7 +1,7 @@ import {isWindow} from "../util/functions"; import {Wnd} from "../layout/Wnd"; -import {Layout} from "../layout"; import {getCurrentWindow} from "@electron/remote"; +import {Layout} from "../layout"; const getAllWnds = (layout: Layout, wnds: Wnd[]) => { for (let i = 0; i < layout.children.length; i++) {