Align switch in toolbar to vertical center in material theme (T119704…

…5) (DevExpress#26246) Co-authored-by: Alexander Bulychev <git@bulychev.net>
Staziz · Dec 14, 2023 · b784a95 · b784a95
1 parent 6468349
commit b784a95
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 1 deletion.
diff --git a/scss/widgets/material/toolbar/_index.scss b/scss/widgets/material/toolbar/_index.scss
@@ -191,6 +191,11 @@
       }
     }
   }
+
+  .dx-switch {
+    display: block;
+    line-height: 0;
+  }
 }
 
 .dx-toolbar .dx-tab {

diff --git a/testing/testcafe/tests/navigation/toolbar/common.ts b/testing/testcafe/tests/navigation/toolbar/common.ts
@@ -9,7 +9,9 @@ import Toolbar from '../../../model/toolbar/toolbar';
 fixture.disablePageReloads`Toolbar_common`
   .page(url(__dirname, '../../container.html'));
 
-const supportedWidgets = ['dxAutocomplete', 'dxCheckBox', 'dxDateBox', 'dxMenu', 'dxSelectBox', 'dxTabs', 'dxTextBox', 'dxButtonGroup', 'dxDropDownButton'];
+const supportedWidgets = [
+  'dxAutocomplete', 'dxCheckBox', 'dxDateBox', 'dxMenu', 'dxSelectBox', 'dxTabs', 'dxTextBox', 'dxButtonGroup', 'dxDropDownButton',
+];
 
 ['never', 'always', 'auto'].forEach((locateInMenu) => {
   [true, false].forEach((rtlEnabled) => {
@@ -157,6 +159,15 @@ const supportedWidgets = ['dxAutocomplete', 'dxCheckBox', 'dxDateBox', 'dxMenu',
           text: 'opts.stylingMode: contained',
         },
       },
+      {
+        location: 'before',
+        locateInMenu,
+        widget: 'dxSwitch',
+        options: {
+          stylingMode: 'contained',
+          text: 'opts.stylingMode: contained',
+        },
+      },
     ];
 
     return createWidget('dxToolbar', {

diff --git a/...lons/Toolbar with dropDownButton,items[]locateInMenu=always (generic-light).png b/...lons/Toolbar with dropDownButton,items[]locateInMenu=always (generic-light).png
diff --git a/...lbar with dropDownButton,items[]locateInMenu=always (generic-light-compact).png b/...lbar with dropDownButton,items[]locateInMenu=always (generic-light-compact).png
diff --git a/...oolbar with dropDownButton,items[]locateInMenu=always (material-blue-light).png b/...oolbar with dropDownButton,items[]locateInMenu=always (material-blue-light).png
diff --git a/...ith dropDownButton,items[]locateInMenu=always (material-blue-light-compact).png b/...ith dropDownButton,items[]locateInMenu=always (material-blue-light-compact).png
diff --git a/...alons/Toolbar with dropDownButton,items[]locateInMenu=never (generic-light).png b/...alons/Toolbar with dropDownButton,items[]locateInMenu=never (generic-light).png
diff --git a/...olbar with dropDownButton,items[]locateInMenu=never (generic-light-compact).png b/...olbar with dropDownButton,items[]locateInMenu=never (generic-light-compact).png
diff --git a/...Toolbar with dropDownButton,items[]locateInMenu=never (material-blue-light).png b/...Toolbar with dropDownButton,items[]locateInMenu=never (material-blue-light).png
diff --git a/...with dropDownButton,items[]locateInMenu=never (material-blue-light-compact).png b/...with dropDownButton,items[]locateInMenu=never (material-blue-light-compact).png