Change ToggleButton theme in other controls

AvaloniaCommunity · Apr 28, 2024 · 3f4540c · 3f4540c
1 parent 4ba5ca6
commit 3f4540c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/Material.Styles/Resources/Themes/ComboBox.axaml b/Material.Styles/Resources/Themes/ComboBox.axaml
@@ -165,7 +165,7 @@
     <Setter Property="Template">
       <ControlTemplate>
         <StackPanel Name="PART_TemplateRoot">
-          <ToggleButton Classes="NoFeedback TransparentBack"
+          <ToggleButton Classes="no-ripple"
                         MinHeight="48" BorderThickness="0"
                         HorizontalContentAlignment="Stretch"
                         IsChecked="{TemplateBinding IsDropDownOpen, Mode=TwoWay}"

diff --git a/Material.Styles/Resources/Themes/DatePicker.axaml b/Material.Styles/Resources/Themes/DatePicker.axaml
@@ -42,9 +42,8 @@
             </TextBox.Text>
             <TextBox.InnerRightContent>
               <ToggleButton Name="CalendarButton"
-                            Classes="Icon"
-                            Width="36"
-                            Height="36"
+                            Theme="{StaticResource MaterialFlatToggleButton}"
+                            Width="36" Height="36"
                             Margin="8 8 8 6">
                 <controls:MaterialInternalIcon Kind="Calendar"
                                                Width="20"

diff --git a/Material.Styles/Resources/Themes/TextBox.axaml b/Material.Styles/Resources/Themes/TextBox.axaml
@@ -121,7 +121,7 @@
   </ControlTheme>
 
   <ControlTheme x:Key="RevealTextMaskToggleButtonTheme"
-                BasedOn="{StaticResource MaterialFlatToggleButton}"
+                BasedOn="{StaticResource MaterialFlatButton}"
                 TargetType="ToggleButton">
     <Setter Property="Height" Value="32" />
     <Setter Property="Width" Value="32" />

diff --git a/Material.Styles/Resources/Themes/TimePicker.axaml b/Material.Styles/Resources/Themes/TimePicker.axaml
@@ -33,9 +33,8 @@
             </TextBox.Text>
             <TextBox.InnerRightContent>
               <ToggleButton Name="PART_TimePickerPopupButton"
-                            Classes="Icon"
-                            Width="36"
-                            Height="36"
+                            Theme="{StaticResource MaterialFlatToggleButton}"
+                            Width="36" Height="36"
                             Margin="8 8 8 6">
                 <controls:MaterialInternalIcon Kind="Clock"
                                                Width="20"