From 1c9294117560e6e3f6a3856c73e69ce95f78aa1a Mon Sep 17 00:00:00 2001
From: SimplestStudio <Oleg.Kozhukharenko@onlyoffice.com>
Date: Fri, 23 May 2025 16:37:43 +0300
Subject: [PATCH] [win-linux] ceditorwindow: fix border color

---
 win-linux/res/styles/theme-dark.json    |  2 +-
 win-linux/src/windows/ceditorwindow_p.h | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/win-linux/res/styles/theme-dark.json b/win-linux/res/styles/theme-dark.json
index ac1e31577..a5bb17356 100644
--- a/win-linux/res/styles/theme-dark.json
+++ b/win-linux/res/styles/theme-dark.json
@@ -9,7 +9,7 @@
         "brand-draw": "#2a2a2a",
 
         "window-background": "#404040",
-        "window-border": "#2a2a2a",
+        "window-border": "#616161",
 
         "text-normal": "#d9d9d9",
         "text-pretty": "#d9d9d9",
diff --git a/win-linux/src/windows/ceditorwindow_p.h b/win-linux/src/windows/ceditorwindow_p.h
index 26fc82abb..9f338eb3c 100644
--- a/win-linux/src/windows/ceditorwindow_p.h
+++ b/win-linux/src/windows/ceditorwindow_p.h
@@ -495,31 +495,30 @@ public:
         switch (panel()->data()->contentType()) {
         case AscEditorType::etDocument:
             background = GetColorValueByRole(ecrTabWordActive);
-            border = background;
+            // border = background;
             break;
         case AscEditorType::etPresentation:
             background = GetColorValueByRole(ecrTabSlideActive);
-            border = background;
+            // border = background;
             break;
         case AscEditorType::etSpreadsheet:
             background = GetColorValueByRole(ecrTabCellActive);
-            border = background;
+            // border = background;
             break;
         case AscEditorType::etDocumentMasterForm:
         case AscEditorType::etPdf:
             background = GetColorValueByRole(ecrTabViewerActive);
-            border = background;
+            // border = background;
             break;
         case AscEditorType::etDraw:
             background = GetColorValueByRole(ecrTabDrawActive);
-            border = background;
+            // border = background;
             break;
         default:
             background = GetColorValueByRole(ecrWindowBackground);
-            border = GetColorValueByRole(ecrWindowBorder);
+            // border = GetColorValueByRole(ecrWindowBorder);
         }
-        if (GetCurrentTheme().id() == L"theme-gray" || GetCurrentTheme().id() == L"theme-white")
-            border = GetColorValueByRole(ecrWindowBorder);
+        border = GetColorValueByRole(ecrWindowBorder);
 
         window->setWindowColors(QColor(QString::fromStdWString(background)), QColor(QString::fromStdWString(border)), window->isActiveWindow());
     }