DataGrid - columnHidingEnabled should not change row height (#7080)

DevExpress · Feb 26, 2019 · c6ea83b · c6ea83b
1 parent dbb41c7
commit c6ea83b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/styles/widgets/generic/gridBase.generic.less b/styles/widgets/generic/gridBase.generic.less
@@ -162,8 +162,13 @@
             }
         }
 
-        .dx-row > td {
-            padding: @GENERIC_GRID_BASE_CELL_PADDING;
+        .dx-row {
+            & > td {
+                padding: @GENERIC_GRID_BASE_CELL_PADDING;
+            }
+            & > td.dx-command-adaptive {
+                padding: @GENERIC_GRID_BASE_CELL_PADDING - 2px @GENERIC_GRID_BASE_CELL_PADDING;
+            }
         }
 
         .dx-@{widgetName}-content .dx-@{widgetName}-table .dx-row {

diff --git a/styles/widgets/material/gridBase.material.less b/styles/widgets/material/gridBase.material.less
@@ -236,11 +236,17 @@
             }
         }
 
-        .dx-row > td {
-            padding-top: @MATERIAL_GRID_BASE_CELL_VERTICAL_PADDING;
-            padding-bottom: @MATERIAL_GRID_BASE_CELL_VERTICAL_PADDING;
-            font-size: @MATERIAL_GRID_BASE_CELL_FONT_SIZE;
-            line-height: @MATERIAL_GRID_BASE_CELL_LINE_HEIGHT;
+        .dx-row {
+            & > td {
+                padding-top: @MATERIAL_GRID_BASE_CELL_VERTICAL_PADDING;
+                padding-bottom: @MATERIAL_GRID_BASE_CELL_VERTICAL_PADDING;
+                font-size: @MATERIAL_GRID_BASE_CELL_FONT_SIZE;
+                line-height: @MATERIAL_GRID_BASE_CELL_LINE_HEIGHT;
+            }
+            & > td.dx-command-adaptive {
+                padding-top: @MATERIAL_GRID_BASE_CELL_VERTICAL_PADDING - 2px;
+                padding-bottom: @MATERIAL_GRID_BASE_CELL_VERTICAL_PADDING - 2px;
+            }
         }
 
         .dx-@{widgetName}-content .dx-@{widgetName}-table .dx-row {