[win-nix] debug for portal's tab color

ONLYOFFICE · Nov 3, 2023 · 303530e · 303530e
1 parent aca6c84
commit 303530e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/win-linux/src/components/asctabwidget.cpp b/win-linux/src/components/asctabwidget.cpp
@@ -522,6 +522,10 @@ void CAscTabWidget::setTabTheme(int index, const QString& type, const QString& c
 
         if ( !color.isEmpty() ) {
             m_pBar->setActiveTabColor(index, color);
+
+            if ( type.isEmpty() ) {
+                m_pBar->setTabThemeType(index, CThemes::isColorDark(color) ? CTabBar::DarkTab : CTabBar::LightTab);
+            }
         }
     }
 }

diff --git a/win-linux/src/cthemes.h b/win-linux/src/cthemes.h
@@ -67,8 +67,8 @@ class CThemes
 //    auto isThemeDark(const std::wstring& id) -> bool;
     auto themeActualId(const std::wstring& id) const -> std::wstring;
 
-    auto isColorDark(const std::wstring&) -> bool;
-    auto isColorDark(const QString&) -> bool;
+    static auto isColorDark(const std::wstring&) -> bool;
+    static auto isColorDark(const QString&) -> bool;
 
     auto onSystemDarkColorScheme(bool isdark) -> void;
     auto isSystemSchemeDark() -> const bool;

diff --git a/win-linux/src/windows/cmainwindow.cpp b/win-linux/src/windows/cmainwindow.cpp
@@ -696,10 +696,14 @@ void CMainWindow::onPortalLogin(int viewid, const std::wstring &json)
 
         if( jerror.error == QJsonParseError::NoError ) {
             QJsonObject objRoot = jdoc.object();
-            QString _ui_theme = objRoot["uiTheme"].toString();
+            QJsonValue value = objRoot["uiTheme"];
+
+            if ( value.isString() )
+                onPortalUITheme(viewid, value.toString().toStdWString());
+            else
+            if ( value.isObject() )
+                onPortalUITheme(viewid, QString(QJsonDocument(value.toObject()).toJson(QJsonDocument::Compact)).toStdWString());
 
-            if ( !_ui_theme.isEmpty() )
-                onPortalUITheme(viewid, _ui_theme.toStdWString());
         }
     }
 }