From 79dca12274b31d3dc681742b5ed0ea792bedbfc2 Mon Sep 17 00:00:00 2001 From: SiriusXT <1160925501@qq.com> Date: Tue, 23 May 2023 20:50:03 +0800 Subject: [PATCH] top --- .vscode/settings.json | 2 +- src/public/app/widgets/title_bar_buttons.js | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 0e4b77b5c..b1cee4342 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,6 +1,6 @@ { "[javascript]": { - "editor.defaultFormatter": "dbaeumer.vscode-eslint" + "editor.defaultFormatter": "vscode.typescript-language-features" }, "[json]": { "editor.defaultFormatter": "dbaeumer.vscode-eslint" diff --git a/src/public/app/widgets/title_bar_buttons.js b/src/public/app/widgets/title_bar_buttons.js index a2f35937b..24188d9ce 100644 --- a/src/public/app/widgets/title_bar_buttons.js +++ b/src/public/app/widgets/title_bar_buttons.js @@ -30,6 +30,9 @@ const TPL = ` height: 40px; width: 40px; } + .title-bar-buttons .top-btn.active{ + background-color:var(--accented-background-color); + } @@ -52,12 +55,12 @@ export default class TitleBarButtonsWidget extends BasicWidget { const $minimizeBtn = this.$widget.find(".minimize-btn"); const $maximizeBtn = this.$widget.find(".maximize-btn"); const $closeBtn = this.$widget.find(".close-btn"); - + //When the window is restarted, the window will not be reset when it is set to the top, so get the window status and set the icon background - (function() { + (function () { const remote = utils.dynamicRequire('@electron/remote'); if (remote.BrowserWindow.getFocusedWindow().isAlwaysOnTop()) { - $topBtn.css("background-color", "var(--accented-background-color)"); + $topBtn.addClass('active'); } }()); $topBtn.on('click', () => { @@ -67,13 +70,13 @@ export default class TitleBarButtonsWidget extends BasicWidget { const isAlwaysOnTop = focusedWindow.isAlwaysOnTop() if (isAlwaysOnTop) { focusedWindow.setAlwaysOnTop(false) - $topBtn.css("background-color", ""); + $topBtn.removeClass('active'); } else { focusedWindow.setAlwaysOnTop(true); - $topBtn.css("background-color", "var(--accented-background-color)"); + $topBtn.addClass('active'); } }); - + $minimizeBtn.on('click', () => { $minimizeBtn.trigger('blur'); const remote = utils.dynamicRequire('@electron/remote');