From 23bf8a3706831d57e2a7d444dea8775367bab8a6 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Fri, 21 Mar 2025 18:41:55 +0300
Subject: [PATCH] Fix window style

---
 apps/common/main/lib/component/Window.js           |  7 ++++---
 .../main/resources/less/colors-table-white.less    |  1 +
 apps/common/main/resources/less/colors-table.less  |  2 ++
 apps/common/main/resources/less/window.less        | 14 +++++++-------
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/apps/common/main/lib/component/Window.js b/apps/common/main/lib/component/Window.js
index b63b1a6397..1aeefd6f2f 100644
--- a/apps/common/main/lib/component/Window.js
+++ b/apps/common/main/lib/component/Window.js
@@ -708,11 +708,12 @@ define([
                         Common.Gateway.on('processmouse', _.bind(_onProcessMouse, this));
                     var tools = this.$window.find('.tools .tool').length;
                     (tools>0) && this.$window.find('> .header > .title').css({'padding-right': tools * 20 + 'px', 'padding-left': tools * 20 + 'px'});
-                } else {
                     this.$window.find('.body').css({
-                        top:0,
-                        'border-radius': '5px'
+                        'border-top-left-radius': '0px',
+                        'border-top-right-radius': '0px'
                     });
+                } else {
+                    this.$window.find('.body').css({top:0});
                 }
 
                 if (this.initConfig.height !== 'auto') {
diff --git a/apps/common/main/resources/less/colors-table-white.less b/apps/common/main/resources/less/colors-table-white.less
index 7f676cd670..8915e02e59 100644
--- a/apps/common/main/resources/less/colors-table-white.less
+++ b/apps/common/main/resources/less/colors-table-white.less
@@ -208,6 +208,7 @@
         --border-radius-button-toolbar: var(--border-radius-button-base);
         --border-radius-button-normal: var(--border-radius-button-base);
         --border-radius-button-category: var(--border-radius-button-base);
+        --border-radius-window: 8px;
 
         --line-height-base: 1.5;
         --input-height-base: 24px;
diff --git a/apps/common/main/resources/less/colors-table.less b/apps/common/main/resources/less/colors-table.less
index d2cfa3042a..7db7671c77 100644
--- a/apps/common/main/resources/less/colors-table.less
+++ b/apps/common/main/resources/less/colors-table.less
@@ -261,6 +261,7 @@
     --border-radius-button-toolbar: 1px;
     --border-radius-button-normal: 2px;
     --border-radius-button-category: 0;
+    --border-radius-window: 5px;
 
     --input-height-base: 22px;
     --line-height-base: 1.428571429;
@@ -423,6 +424,7 @@
 @border-radius-button-toolbar: var(--border-radius-button-toolbar, 1px);
 @border-radius-button-normal: var(--border-radius-button-normal, 2px);
 @border-radius-button-category: var(--border-radius-button-category, 0);
+@border-radius-window: var(--border-radius-window, 5px);
 
 @input-height-base: var(--input-height-base, 22px);
 @line-height-base: var(--line-height-base, 1.5);
diff --git a/apps/common/main/resources/less/window.less b/apps/common/main/resources/less/window.less
index bcce620161..eefd1d3031 100644
--- a/apps/common/main/resources/less/window.less
+++ b/apps/common/main/resources/less/window.less
@@ -72,7 +72,7 @@
     box-sizing: border-box;
     z-index: @zindex-modal-background;
     box-shadow: 0 5px 15px rgba(0,0,0,0.2);
-    border-radius: 5px;
+    border-radius: @border-radius-window;
     background-color: @background-normal-ie;
     background-color: @background-normal;
     border: solid @scaled-one-px-value-ie @border-toolbar-ie;
@@ -87,7 +87,7 @@
 
     > .header {
         height: 34px;
-        border-radius: 5px 5px 0 0;
+        border-radius: @border-radius-window @border-radius-window 0 0;
         position: absolute;
         padding: 5px 6px 6px;
         left: 0;
@@ -103,8 +103,8 @@
         vertical-align: bottom;
         line-height: 26px;
 
-        background: @background-pane-ie;
-        background: @background-pane;
+        background: @background-toolbar-ie;
+        background: @background-toolbar;
         border-bottom: solid @scaled-one-px-value-ie @border-toolbar-ie;
         border-bottom: solid @scaled-one-px-value @border-toolbar;
 
@@ -182,7 +182,7 @@
     }
 
     > .body {
-        border-radius: 0 0 5px 5px;
+        border-radius: @border-radius-window;
         position: absolute;
         top: 34px;
         width: 100%;
@@ -320,8 +320,8 @@
         width: 5px;
         height: 5px;
         z-index: 1;
-        background: @background-pane-ie;
-        background: @background-pane;
+        background: @background-toolbar-ie;
+        background: @background-toolbar;
         border: @scaled-one-px-value-ie none @border-toolbar-ie;
         border: @scaled-one-px-value none @border-toolbar;