From 1df4e2e70405fd65ff2c28342251d45dc659e8fe Mon Sep 17 00:00:00 2001
From: SimplestStudio <Oleg.Kozhukharenko@onlyoffice.com>
Date: Tue, 24 Sep 2024 15:30:51 +0300
Subject: [PATCH] [win-linux] fix applying custom theme

---
 win-linux/src/cthemes.cpp | 23 ++++++++++++++++++++---
 win-linux/src/cthemes.h   |  2 +-
 win-linux/src/utils.cpp   | 11 +++++++++++
 win-linux/src/utils.h     |  1 +
 4 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/win-linux/src/cthemes.cpp b/win-linux/src/cthemes.cpp
index 277ef7dd9..9995ad809 100644
--- a/win-linux/src/cthemes.cpp
+++ b/win-linux/src/cthemes.cpp
@@ -90,6 +90,7 @@ namespace NSTheme {
             {"brand-word", "toolbar-header-document"},
             {"brand-slide", "toolbar-header-presentation"},
             {"brand-cell", "toolbar-header-spreadsheet"},
+            {"brand-pdf", "toolbar-header-pdf"},
 
             {"window-background", "background-toolbar"},
 //            {CTheme::ColorRole::ecrWindowBorder, "window-border"},
@@ -621,7 +622,7 @@ auto CThemes::parseThemeName(const std::wstring& wjson) -> std::wstring
 //    return false;
 //}
 
-auto CThemes::addLocalTheme(const QJsonObject& jsonobj, const QString& filepath) -> bool
+auto CThemes::addLocalTheme(QJsonObject& jsonobj, const QString& filepath) -> bool
 {
     if ( m_priv->validateTheme(jsonobj) ) {
         if ( !filepath.isEmpty() ) {
@@ -631,10 +632,26 @@ auto CThemes::addLocalTheme(const QJsonObject& jsonobj, const QString& filepath)
                 if ( QFile::exists(dest_file_path) )
                     QFile::remove(dest_file_path);
 
-                if (!QFile::copy(filepath, dest_file_path))
+                QJsonObject colors = jsonobj["colors"].toObject();
+                auto theme_template = (jsonobj.contains("type") && jsonobj["type"].toString() == NSTheme::theme_type_dark) ?
+                                          THEME_DEFAULT_DARK_ID : THEME_DEFAULT_LIGHT_ID;
+                QJsonObject template_obj = Utils::parseJsonFile(m_priv->rc_themes[theme_template]);
+                QJsonObject values = template_obj["values"].toObject();
+                for (auto it = values.begin(); it != values.end(); it++) {
+                    if (!colors.contains(it.key())) {
+                        const auto alias_it = NSTheme::map_alias_names.find(it.key());
+                        if (alias_it == NSTheme::map_alias_names.end()) {
+                            colors.insert(it.key(), it.value());
+                        } else
+                        if (!colors.contains(alias_it->second))
+                            colors.insert(alias_it->second, it.value());
+                    }
+                }
+                jsonobj["colors"] = colors;
+                QByteArray data = QJsonDocument(jsonobj).toJson(QJsonDocument::Compact);
+                if (!Utils::writeFile(dest_file_path, data))
                     return false;
                 else {
-                    QByteArray data = QJsonDocument(jsonobj).toJson(QJsonDocument::Compact);
 //                    m_priv->local_themes[jsonobj.value("id").toString()] = std::make_pair("", data);
                     m_priv->local_themes[jsonobj.value("id").toString()] = std::make_pair(dest_file_path, data);
 
diff --git a/win-linux/src/cthemes.h b/win-linux/src/cthemes.h
index aeb7e5f52..e6c4adfbb 100644
--- a/win-linux/src/cthemes.h
+++ b/win-linux/src/cthemes.h
@@ -97,7 +97,7 @@ public:
     auto defaultLight() -> const CTheme&;
 
 //    auto addLocalTheme(const std::wstring&) -> bool;
-    auto addLocalTheme(const QJsonObject&, const QString& filepath) -> bool;
+    auto addLocalTheme(QJsonObject&, const QString& filepath) -> bool;
     auto setCurrentTheme(const std::wstring&) -> void;
     auto isThemeCurrent(const std::wstring& id) -> bool;
 //    auto isThemeDark(const std::wstring& id) -> bool;
diff --git a/win-linux/src/utils.cpp b/win-linux/src/utils.cpp
index a20236114..9124b7407 100644
--- a/win-linux/src/utils.cpp
+++ b/win-linux/src/utils.cpp
@@ -304,6 +304,17 @@ bool Utils::makepath(const QString& p)
     return QDir().mkpath(p);
 }
 
+bool Utils::writeFile(const QString &filePath, const QByteArray &data)
+{
+    QFile file(filePath);
+    if (file.open(QIODevice::WriteOnly | QIODevice::Text)) {
+        auto bytes_written = file.write(data);
+        file.close();
+        return bytes_written == data.size();
+    }
+    return false;
+}
+
 QRect Utils::getScreenGeometry(const QPoint& leftTop)
 {
 //    int _scr_num = QApplication::desktop()->screenNumber(leftTop); - return the wrong number
diff --git a/win-linux/src/utils.h b/win-linux/src/utils.h
index aa2a96898..a6ddf8412 100644
--- a/win-linux/src/utils.h
+++ b/win-linux/src/utils.h
@@ -107,6 +107,7 @@ public:
     static bool isFileLocal(const QString&);
     static QString uniqFileName(const QString& path);
     static bool makepath(const QString&);
+    static bool writeFile(const QString &filePath, const QByteArray &data);
 
     static QString systemLocationCode();
     static QIcon appIcon();