Merge from 'release/v8.2.0'

ONLYOFFICE · Sep 18, 2024 · 6ee8649 · 6ee8649
1 parent 15b95e4
commit 6ee8649
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/common/loginpage/src/panelsettings.js b/common/loginpage/src/panelsettings.js
@@ -603,12 +603,6 @@
                             }
 
 
-                            if ( nativevars.localthemes ) {
-                                for ( const t of nativevars.localthemes ) {
-                                    const _theme_title = t.l10n[utils.Lang.id] || t.name;
-                                    _combo.append(`<option value=${t.id} ml10n>${_theme_title}</option>`);
-                                }
-                            }
 
                             if ( !$optsUITheme ) {
                                 ($optsUITheme = _combo)

diff --git a/win-linux/extras/update-daemon/src/classes/csvcmanager.cpp b/win-linux/extras/update-daemon/src/classes/csvcmanager.cpp
@@ -82,7 +82,6 @@
 #ifndef URL_APPCAST_DEV_CHANNEL
 # define URL_APPCAST_DEV_CHANNEL ""
 #endif
-#define CMD_ARGUMENT_UPDATES_CHANNEL _T("--updates-appcast-channel")
 #define UPDATE_PATH      _T("/" REG_APP_NAME "Updates")
 #define BACKUP_PATH      _T("/" REG_APP_NAME "Backup")
 #define SUCCES_UNPACKED  _T("/success_unpacked.txt")
@@ -258,8 +257,7 @@ CSvcManager::CSvcManager():
     m_pDownloader(new CDownloader),
     m_pUnzip(new CUnzip)
 {
-    m_checkUrl = (NS_Utils::cmdArgContains(CMD_ARGUMENT_UPDATES_CHANNEL) && NS_Utils::cmdArgValue(CMD_ARGUMENT_UPDATES_CHANNEL) == _T("dev"))
-                    ? _T(URL_APPCAST_DEV_CHANNEL) : _T(URL_APPCAST_UPDATES);
+    m_checkUrl = NS_Utils::cmdArgContains(_T("--appcast-dev-channel")) ? _T(URL_APPCAST_DEV_CHANNEL) : _T(URL_APPCAST_UPDATES);
     NS_Logger::WriteLog(m_checkUrl.empty() ? _T("Updates is off, URL is empty.") : _T("Updates is on, URL: ") + m_checkUrl);
     init();
 }

diff --git a/win-linux/src/windows/platform_win/cwindowplatform.cpp b/win-linux/src/windows/platform_win/cwindowplatform.cpp
@@ -138,7 +138,11 @@ static QColor calcBorderColor(bool isActive = true, const QColor &bkgColor = QCo
                     *(FARPROC*)&DwmGetColorizationColor = GetProcAddress(module, "DwmGetColorizationColor");
             }
             if (DwmGetColorizationColor && SUCCEEDED(DwmGetColorizationColor(&dwcolor, &opaque))) {
-                return QColor((dwcolor & 0xff0000) >> 16, (dwcolor & 0xff00) >> 8, dwcolor & 0xff);
+                float a = (float)((dwcolor >> 24) & 0xff)/255;
+                int r = (int)(((dwcolor >> 16) & 0xff) * a + 255 * (1 - a));
+                int g = (int)(((dwcolor >> 8) & 0xff) * a + 255 * (1 - a));
+                int b = (int)((dwcolor & 0xff) * a + 255 * (1 - a));
+                return QColor(r, g, b);
             }
         } else {
             QSettings reg_lt("HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize", QSettings::NativeFormat);