use WCO to replace the window controls

mayswind · mayswind · commit 91c30a9df4ab · 2025-01-19T16:57:57.000+08:00
diff --git a/app/index.html b/app/index.html
@@ -86,26 +86,8 @@ <h3 translate>Create New Task</h3>
             </div>
         </div>
 
-        <nav class="navbar navbar-static-top" role="navigation">
-            <div class="navbar-app-title pull-right">
-                <ul class="nav navbar-nav">
-                    <li>
-                        <a id="native-title-minimize-btn" class="toolbar btn-title-minimize" title="{{'Minimize' | translate}}" ng-click="minimizeWindow()">
-                            <i id="native-title-minimize-icon" class="fa fa-window-minimize"></i>
-                        </a>
-                    </li>
-                    <li>
-                        <a id="native-title-maximize-btn" class="toolbar btn-title-maximize" title="{{'Maximize' | translate}}" ng-click="maximizeOrRestoreWindow()">
-                            <i id="native-title-maximize-icon" class="fa fa-window-maximize"></i>
-                        </a>
-                    </li>
-                    <li>
-                        <a id="native-title-close-btn" class="toolbar btn-title-close" title="{{'Close' | translate}}" ng-click="exitApp()">
-                            <i id="native-title-close-icon" class="fa fa-lg fa-close"></i>
-                        </a>
-                    </li>
-                </ul>
-            </div>
+        <nav id="window-title-bar" class="navbar navbar-static-top" role="navigation">
+            <div class="navbar-app-title pull-right"></div>
             <div class="navbar-toolbar">
                 <ul class="nav navbar-nav">
                     <li>
diff --git a/app/langs/cz_CZ.txt b/app/langs/cz_CZ.txt
@@ -349,9 +349,6 @@ Access Denied!=Přístup byl odepřen!
 You cannot use AriaNg because this browser does not meet the minimum requirements for data storage.=Nelze používat AriaNg, protože tento prohlížeč nesplňuje minimální požadavky pro ukládání dat.
 AriaNg Native Updates=
 A new version has been released=
-Minimize=
-Maximize=
-Restore Down=
 Runtime Environment=
 Reload AriaNg Native=
 Create New Task=
diff --git a/app/langs/es.txt b/app/langs/es.txt
@@ -349,9 +349,6 @@ Access Denied!=¡Acceso denegado!
 You cannot use AriaNg because this browser does not meet the minimum requirements for data storage.=No puedes utilizar AriaNg porque este navegador no cumple con los requisitos mínimos de almacenamiento de datos.
 AriaNg Native Updates=
 A new version has been released=
-Minimize=
-Maximize=
-Restore Down=
 Runtime Environment=
 Reload AriaNg Native=
 Create New Task=
diff --git a/app/langs/fr_FR.txt b/app/langs/fr_FR.txt
@@ -349,9 +349,6 @@ Access Denied!=Accès refusé!
 You cannot use AriaNg because this browser does not meet the minimum requirements for data storage.=Vous ne pouvez pas utiliser AriaNg car votre navigateur ne respecte pas les prérequis minimum pour du stockage de donnée.
 AriaNg Native Updates=
 A new version has been released=
-Minimize=
-Maximize=
-Restore Down=
 Runtime Environment=
 Reload AriaNg Native=
 Create New Task=
diff --git a/app/langs/it_IT.txt b/app/langs/it_IT.txt
@@ -349,9 +349,6 @@ Access Denied!=Accesso negato!
 You cannot use AriaNg because this browser does not meet the minimum requirements for data storage.=Non puoi utilizzare AriaNg perché questo browser non soddisfa i requisiti minimi di archiviazione dati.
 AriaNg Native Updates=
 A new version has been released=
-Minimize=
-Maximize=
-Restore Down=
 Runtime Environment=
 Reload AriaNg Native=
 Create New Task=
diff --git a/app/langs/ru_RU.txt b/app/langs/ru_RU.txt
@@ -349,9 +349,6 @@ Access Denied!=Доступ запрещен!
 You cannot use AriaNg because this browser does not meet the minimum requirements for data storage.=Вы не можете использовать AriaNg, потому что этот браузер не соответствует минимальным требованиям для хранения данных.
 AriaNg Native Updates=
 A new version has been released=
-Minimize=
-Maximize=
-Restore Down=
 Runtime Environment=
 Reload AriaNg Native=
 Create New Task=
diff --git a/app/langs/zh_Hans.txt b/app/langs/zh_Hans.txt
@@ -349,9 +349,6 @@ Access Denied!=拒绝访问!
 You cannot use AriaNg because this browser does not meet the minimum requirements for data storage.=您无法使用 AriaNg, 因为这个浏览器不满足数据存储的最低要求.
 AriaNg Native Updates=AriaNg Native 更新
 A new version has been released=新的版本 {{version}} 已经发布
-Minimize=最小化
-Maximize=最大化
-Restore Down=向下还原
 Runtime Environment=运行环境
 Reload AriaNg Native=重新加载 AriaNg Native
 Create New Task=创建新任务
diff --git a/app/langs/zh_Hant.txt b/app/langs/zh_Hant.txt
@@ -349,9 +349,6 @@ Access Denied!=拒絕訪問!
 You cannot use AriaNg because this browser does not meet the minimum requirements for data storage.=您無法使用 AriaNg, 因為此瀏覽器不滿足資料儲存的最低要求.
 AriaNg Native Updates=AriaNg Native 更新
 A new version has been released=新的版本 {{version}} 已經發布
-Minimize=最小化
-Maximize=最大化
-Restore Down=向下還原
 Runtime Environment=運行環境
 Reload AriaNg Native=重新載入 AriaNg Native
 Create New Task=建立新工作
diff --git a/app/scripts/config/defaultLanguage.js b/app/scripts/config/defaultLanguage.js
@@ -353,9 +353,6 @@
             'You cannot use AriaNg because this browser does not meet the minimum requirements for data storage.': 'You cannot use AriaNg because this browser does not meet the minimum requirements for data storage.',
             'AriaNg Native Updates': 'AriaNg Native Updates',
             'A new version has been released': 'A new version {{version}} has been released',
-            'Minimize': 'Minimize',
-            'Maximize': 'Maximize',
-            'Restore Down': 'Restore Down',
             'Runtime Environment': 'Runtime Environment',
             'Reload AriaNg Native': 'Reload AriaNg Native',
             'Create New Task': 'Create New Task',
diff --git a/app/scripts/controllers/main.js b/app/scripts/controllers/main.js
@@ -443,18 +443,6 @@
             }
         };
 
-        $scope.minimizeWindow = function () {
-            ariaNgNativeElectronService.minimizeWindow();
-        };
-
-        $scope.maximizeOrRestoreWindow = function () {
-            ariaNgNativeElectronService.maximizeOrRestoreWindow();
-        };
-
-        $scope.exitApp = function () {
-            ariaNgNativeElectronService.exitApp();
-        };
-
         $scope.openProjectLink = function () {
             ariaNgNativeElectronService.openProjectLink();
         };
diff --git a/app/scripts/core/root.js b/app/scripts/core/root.js
@@ -28,14 +28,23 @@
             return false;
         };
 
+        var setTitleBarColor = function () {
+            var computedStyle = window.getComputedStyle(document.getElementById('window-title-bar'));
+            var backgroundColor = computedStyle.getPropertyValue('background-color');
+            var symbolColor = computedStyle.getPropertyValue('color');
+            ariaNgNativeElectronService.setTitleBarColor(backgroundColor, symbolColor);
+        };
+
         var setLightTheme = function () {
             $rootScope.currentTheme = 'light';
             angular.element('body').removeClass('theme-dark');
+            setTitleBarColor();
         };
 
         var setDarkTheme = function () {
             $rootScope.currentTheme = 'dark';
             angular.element('body').addClass('theme-dark');
+            setTitleBarColor();
         };
 
         var setThemeBySystemSettings = function () {
@@ -210,16 +219,6 @@
             return angular.element('body').hasClass('sidebar-open');
         };
 
-        var toggleMaximizeButton = function () {
-            angular.element('#native-title-maximize-icon').addClass('fa-window-maximize').removeClass('fa-window-restore');
-            angular.element('#native-title-maximize-btn').attr('title', ariaNgLocalizationService.getLocalizedText('Maximize'));
-        };
-
-        var toggleRestoreButton = function () {
-            angular.element('#native-title-maximize-icon').addClass('fa-window-restore').removeClass('fa-window-maximize');
-            angular.element('#native-title-maximize-btn').attr('title', ariaNgLocalizationService.getLocalizedText('Restore Down'));
-        };
-
         var autoCheckUpdates = function () {
             ariaNgVersionService.getTheLatestVersion()
                 .then(function onSuccess(response) {
@@ -627,14 +626,6 @@
 
         $rootScope.useCustomAppTitle = ariaNgNativeElectronService.useCustomAppTitle();
 
-        ariaNgNativeElectronService.getWindowMaximizedAsync(function (maximized) {
-            if (maximized) {
-                toggleRestoreButton();
-            } else {
-                toggleMaximizeButton();
-            }
-        });
-
         $window.addEventListener('contextmenu', function (event) {
             event.preventDefault();
             event.stopPropagation();
@@ -686,14 +677,6 @@
             }
         }, true);
 
-        ariaNgNativeElectronService.onMainWindowMaximize(function () {
-            toggleRestoreButton();
-        });
-
-        ariaNgNativeElectronService.onMainWindowUnmaximize(function () {
-            toggleMaximizeButton();
-        });
-
         ariaNgNativeElectronService.onMainProcessNavigateTo(function (event, routeUrl) {
             angular.element('.modal.in:visible').modal('hide');
             angular.element('.modal-backdrop').remove();
diff --git a/app/scripts/services/ariaNgNativeElectronService.js b/app/scripts/services/ariaNgNativeElectronService.js
@@ -73,26 +73,12 @@
             setNativeTheme: function (theme) {
                 invokeMainProcessMethod('render-set-native-theme', theme);
             },
-            getWindowMaximizedAsync: function (callback) {
-                return invokeMainProcessMethodAsync('render-get-native-window-maximized')
-                    .then(function onReceive(maximized) {
-                        if (callback) {
-                            callback(maximized);
-                        }
-                    });
-            },
-            minimizeWindow: function () {
-                invokeMainProcessMethod('render-minimize-native-window');
-            },
-            maximizeOrRestoreWindow: function () {
-                invokeMainProcessMethod('render-maximize-or-restore-native-window');
+            setTitleBarColor: function (titleBarBackgroundColor, titleBarSymbolColor) {
+                invokeMainProcessMethod('render-set-titlebar-color', titleBarBackgroundColor, titleBarSymbolColor);
             },
             reload: function () {
                 invokeMainProcessMethod('render-reload-native-window');
             },
-            exitApp: function () {
-                invokeMainProcessMethod('render-exit-native-app');
-            },
             showTextboxContextMenu: function (context) {
                 invokeMainProcessMethod('render-show-textbox-context-menu', context);
             },
@@ -332,12 +318,6 @@
             notifyMainProcessorNewDropText: function (message) {
                 invokeMainProcessMethod('on-render-new-drop-text', message);
             },
-            onMainWindowMaximize: function (callback) {
-                onMainProcessEvent('on-main-window-maximized', callback);
-            },
-            onMainWindowUnmaximize: function (callback) {
-                onMainProcessEvent('on-main-window-unmaximized', callback);
-            },
             onMainProcessChangeDevMode: function (callback) {
                 onMainProcessEvent('on-main-change-dev-mode', callback);
             },
diff --git a/app/styles/core/app-title.css b/app/styles/core/app-title.css
@@ -44,63 +44,9 @@
 
 .custom-app-title .main-header .navbar-app-title {
     height: 24px;
-    padding-top: 4px;
     display: inline-block;
 }
 
-.custom-app-title .main-header .navbar-app-title li {
-    -webkit-app-region: no-drag;
-}
-
-.custom-app-title .main-header .navbar-app-title .navbar-nav > li > a:active {
-    background: inherit !important;
-}
-
-.custom-app-title .main-header .navbar-app-title .navbar-nav > li > a {
-    font-size: 12px !important;
-    padding: 0 8px 0 8px;
-}
-
-.custom-app-title .main-header .navbar-app-title .navbar-nav > li > a.btn-title-maximize {
-    padding: 0 6px 0 8px;
-}
-
-.custom-app-title .main-header .navbar-app-title .navbar-nav > li > a.btn-title-close {
-    padding: 0 8px 0 6px;
-}
-
-.custom-app-title .main-header .navbar-app-title .navbar-nav > li > a:active {
-    -webkit-box-shadow: none;
-    -moz-box-shadow: none;
-    box-shadow: none;
-}
-
-.custom-app-title .main-header .navbar-app-title .navbar-nav > li > a.btn-title-minimize:hover,
-.custom-app-title .main-header .navbar-app-title .navbar-nav > li > a.btn-title-minimize:focus,
-.custom-app-title .main-header .navbar-app-title .navbar-nav > li > a.btn-title-maximize:hover,
-.custom-app-title .main-header .navbar-app-title .navbar-nav > li > a.btn-title-maximize:focus{
-    color: #0080ff !important;
-}
-
-.custom-app-title .main-header .navbar-app-title .navbar-nav > li > a.btn-title-minimize:active,
-.custom-app-title .main-header .navbar-app-title .navbar-nav > li > a.btn-title-maximize:active{
-    color: #0069c3 !important;
-}
-
-.custom-app-title .main-header .navbar-app-title .navbar-nav > li > a.btn-title-close:hover,
-.custom-app-title .main-header .navbar-app-title .navbar-nav > li > a.btn-title-close:focus {
-    color: #f94e41 !important;
-}
-
-.custom-app-title .main-header .navbar-app-title .navbar-nav > li > a.btn-title-close:active {
-    color: #bf1c00 !important;
-}
-
-.custom-app-title .main-header .navbar-app-title .navbar-nav > li > a > i.fa {
-    width: 1.1em;
-    text-align: center;
-}
-
 .custom-app-title .main-header .navbar-toolbar {
     margin-top: 24px;
 }
diff --git a/i18n/en.sample.txt b/i18n/en.sample.txt
@@ -349,9 +349,6 @@ Access Denied!=Access Denied!
 You cannot use AriaNg because this browser does not meet the minimum requirements for data storage.=You cannot use AriaNg because this browser does not meet the minimum requirements for data storage.
 AriaNg Native Updates=AriaNg Native Updates
 A new version has been released=A new version {{version}} has been released
-Minimize=Minimize
-Maximize=Maximize
-Restore Down=Restore Down
 Runtime Environment=Runtime Environment
 Reload AriaNg Native=Reload AriaNg Native
 Create New Task=Create New Task
diff --git a/main/components/titlebar.js b/main/components/titlebar.js
@@ -0,0 +1,17 @@
+'use strict';
+
+const core = require('../core');
+
+let updateWindowTitleBar = function (backgroundColor, symbolColor) {
+    if (core.useCustomAppTitle) {
+        core.mainWindow.setTitleBarOverlay({
+            color: backgroundColor,
+            symbolColor: symbolColor,
+            height: 30
+        });
+    }
+}
+
+module.exports = {
+    updateWindowTitleBar: updateWindowTitleBar
+};
diff --git a/main/ipc/main-process.js b/main/ipc/main-process.js
@@ -4,6 +4,7 @@ const electron = require('electron');
 
 const core = require('../core');
 const config = require('../config/config');
+const titlebar = require('../components/titlebar');
 const menu = require('../components/menu');
 const tray = require('../components/tray');
 const notification = require('../components/notification');
@@ -68,32 +69,16 @@ ipcMain.on('render-set-native-theme', (event, theme) => {
     } else {
         nativeTheme.themeSource = 'system';
     }
-})
-
-ipcMain.handle('render-get-native-window-maximized', (event) => {
-    return core.mainWindow.isMaximized();
 });
 
-ipcMain.on('render-minimize-native-window', (event) => {
-    core.mainWindow.minimize();
-});
-
-ipcMain.on('render-maximize-or-restore-native-window', (event) => {
-    if (!core.mainWindow.isMaximized()) {
-        core.mainWindow.maximize();
-    } else {
-        core.mainWindow.unmaximize();
-    }
+ipcMain.on('render-set-titlebar-color', (event, titleBarBackgroundColor, titleBarSymbolColor) => {
+    titlebar.updateWindowTitleBar(titleBarBackgroundColor, titleBarSymbolColor);
 });
 
 ipcMain.on('render-reload-native-window', (event) => {
     core.mainWindow.reload();
 });
 
-ipcMain.on('render-exit-native-app', (event) => {
-    core.mainWindow.close();
-});
-
 ipcMain.on('render-show-textbox-context-menu', (event, context) => {
     const contextMenu = menu.getTextboxContentMenu(context);
 
diff --git a/main/ipc/render-proecss.js b/main/ipc/render-proecss.js
diff --git a/main/main.js b/main/main.js
diff --git a/package-lock.json b/package-lock.json
