From c75c9941c0016d4a85e7c6a10dfc697a16480dba Mon Sep 17 00:00:00 2001
From: Basher <89542751+Basher03@users.noreply.github.com>
Date: Wed, 20 Jul 2022 19:16:55 +0300
Subject: [PATCH] Changed expanded list style

---
 apps/spreadsheeteditor/main/app/view/Toolbar.js        |  3 ++-
 .../spreadsheeteditor/main/resources/less/toolbar.less | 10 ++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js
index df0084182..7febc545f 100644
--- a/apps/spreadsheeteditor/main/app/view/Toolbar.js
+++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js
@@ -1307,6 +1307,7 @@ define([
 
                         if (menu.cmpEl) {
                             var itemEl = $(menu.menuRoot.find('.dataview .item').get(0));
+                            var groupContainerEl = $(menu.menuRoot.find('.dataview .group-items-container').get(0));
                             var itemMargin = parseFloat(itemEl.css('margin-left')) + parseFloat(itemEl.css('margin-right'));
                             Common.Utils.applicationPixelRatio() > 1 && Common.Utils.applicationPixelRatio() < 2 && (itemMargin = -1/Common.Utils.applicationPixelRatio());
                             var itemWidth = itemEl.is(':visible') ? parseFloat(itemEl.css('width')) :
@@ -1321,7 +1322,7 @@ define([
 
                             menu.menuAlign = 'tl-tl';
                             var dataviewEl = $(menu.menuRoot.find('.dataview').get(0));
-                            var menuWidth = columnCount * (itemWidth + itemMargin) + parseFloat(dataviewEl.css('padding-left')) + parseFloat(dataviewEl.css('padding-right'));
+                            var menuWidth = + columnCount * (itemWidth + itemMargin) + parseFloat(groupContainerEl.css('padding-left')) + parseFloat(groupContainerEl.css('padding-right')) + parseFloat(dataviewEl.css('padding-left')) + parseFloat(dataviewEl.css('padding-right'));
                             var offset = cmp.cmpEl.width() - cmp.openButton.$el.width() - menuWidth - 1;
                             menu.setOffset(Math.min(offset, 0));
 
diff --git a/apps/spreadsheeteditor/main/resources/less/toolbar.less b/apps/spreadsheeteditor/main/resources/less/toolbar.less
index d9cb2d7da..a39030146 100644
--- a/apps/spreadsheeteditor/main/resources/less/toolbar.less
+++ b/apps/spreadsheeteditor/main/resources/less/toolbar.less
@@ -149,15 +149,21 @@
 
 .combo-styles {
     .menu-picker-container .dataview {
-      padding: 10px 2px 0 2px;
+      padding: 10px 15px 0 5px;
     }
 
     .group-description {
         padding: 3px 0 3px 10px;
         .font-weight-bold();
-    }    
+    } 
+    
+    .group-items-container {
+        padding-bottom: 1px;
+        padding-right: 1px;
+    }
 
     .grouped-data .group-items-container .item {
+        margin: 0px -1px -1px 0px;
         box-shadow: none;
         &:hover {
             .box-shadow(inset 0 0 0 2px @border-preview-hover-ie) !important;