From 9a284590c2d6f36be24903157102df6aaa867e58 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Thu, 26 Jan 2023 20:59:58 +0800 Subject: [PATCH] :art: https://github.com/siyuan-note/siyuan/issues/2955 --- app/src/util/onGetConfig.ts | 22 ++++++++++++++-------- app/src/window/setHeader.ts | 2 +- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/app/src/util/onGetConfig.ts b/app/src/util/onGetConfig.ts index 6231bdeab..f2ac342b0 100644 --- a/app/src/util/onGetConfig.ts +++ b/app/src/util/onGetConfig.ts @@ -562,15 +562,21 @@ export const initWindow = () => { currentWindow.minimize(); }); closeBtnElement.addEventListener("click", () => { - winOnClose(currentWindow); + if (isWindow()) { + currentWindow.destroy(); + } else { + winOnClose(currentWindow); + } }); /// #else - document.querySelector(".toolbar").classList.add("toolbar--browser"); - window.addEventListener("beforeunload", () => { - exportLayout(false); - }, false); - window.addEventListener("pagehide", () => { - exportLayout(false); - }, false); + if (!isWindow()) { + document.querySelector(".toolbar").classList.add("toolbar--browser"); + window.addEventListener("beforeunload", () => { + exportLayout(false); + }, false); + window.addEventListener("pagehide", () => { + exportLayout(false); + }, false); + } /// #endif }; diff --git a/app/src/window/setHeader.ts b/app/src/window/setHeader.ts index c954b7e88..cc655475f 100644 --- a/app/src/window/setHeader.ts +++ b/app/src/window/setHeader.ts @@ -39,7 +39,7 @@ export const setTabPosition = () => { } } else { if (rect.top <= 0 && rect.right >= window.innerWidth) { - (headerElement.lastElementChild as HTMLElement).style.paddingRight = (42 * 3) + "px"; + (headerElement.lastElementChild as HTMLElement).style.paddingRight = (32 * 3) + "px"; } else { (headerElement.lastElementChild as HTMLElement).style.paddingRight = ""; }