Skip to content

Commit 4026f9d

Browse files
ButchersBoyButchersBoy
committed
Add MaterialDesignSwitchAccentToggleButton. (Note slight change in name compared to GitHub issue). Fixes #282 
1 parent 8a9ca62 commit 4026f9d

File tree

3 files changed

+56
-29
lines changed

3 files changed

+56
-29
lines changed

‎MainDemo.Wpf/Buttons.xaml‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@
124124
</Button>
125125
</StackPanel>
126126
<StackPanel Grid.Row="3" Margin="256 16 0 0" Orientation="Horizontal">
127-
<Button Style="{StaticResource MaterialDesignFlatButton}" Click="ButtonBase_OnClick">ACCEPT</Button>
128-
<Button Style="{StaticResource MaterialDesignFlatButton}">CANCEL</Button>
127+
<Button Style="{StaticResource MaterialDesignFlatButton}" Click="ButtonBase_OnClick" ToolTip="MaterialDesignFlatButton">ACCEPT</Button>
128+
<Button Style="{StaticResource MaterialDesignFlatButton}" ToolTip="MaterialDesignFlatButton">CANCEL</Button>
129129
</StackPanel>
130130
<TextBlock Margin="0 24 0 0" Grid.Row="4">Toggles</TextBlock>
131131
<StackPanel Grid.Row="5" Margin="0 24 0 0" Orientation="Horizontal">
@@ -169,20 +169,30 @@
169169
</CheckBox>
170170
</StackPanel>
171171
<StackPanel Grid.Row="7" Margin="0 16 0 0" Orientation="Horizontal">
172-
<ToggleButton Style="{StaticResource MaterialDesignSwitchToggleButton}" VerticalAlignment="Center" />
173-
<ToggleButton Style="{StaticResource MaterialDesignSwitchToggleButton}" VerticalAlignment="Center" Margin="8 0 0 0" IsChecked="True" />
172+
<ToggleButton Style="{StaticResource MaterialDesignSwitchToggleButton}" VerticalAlignment="Center"
173+
ToolTip="Default ToggleButton Style"/>
174174
<ToggleButton Style="{StaticResource MaterialDesignSwitchToggleButton}" VerticalAlignment="Center" Margin="8 0 0 0" IsEnabled="False" />
175+
<ToggleButton Style="{StaticResource MaterialDesignSwitchLightToggleButton}" VerticalAlignment="Center" Margin="8 0 0 0"
176+
ToolTip="MaterialDesignSwitchLightToggleButton" IsChecked="True" />
177+
<ToggleButton Style="{StaticResource MaterialDesignSwitchToggleButton}" VerticalAlignment="Center" Margin="8 0 0 0"
178+
ToolTip="MaterialDesignSwitchToggleButton" IsChecked="True" />
179+
<ToggleButton Style="{StaticResource MaterialDesignSwitchDarkToggleButton}" VerticalAlignment="Center" Margin="8 0 0 0"
180+
ToolTip="MaterialDesignSwitchDarkToggleButton" IsChecked="True" />
181+
<ToggleButton Style="{StaticResource MaterialDesignSwitchAccentToggleButton}" VerticalAlignment="Center" Margin="8 0 0 0"
182+
ToolTip="MaterialDesignSwitchAccentToggleButton" IsChecked="True" />
175183
</StackPanel>
176184
<StackPanel Grid.Row="8" Margin="0 16 0 0" Orientation="Horizontal">
177-
<ToggleButton Style="{StaticResource MaterialDesignFlatToggleButton}">
185+
<ToggleButton Style="{StaticResource MaterialDesignFlatToggleButton}" ToolTip="MaterialDesignFlatToggleButton">
178186
<materialDesign:PackIcon Kind="Paperclip" Height="21" Width="21" />
179187
</ToggleButton>
180188
<ToggleButton Style="{StaticResource MaterialDesignFlatPrimaryToggleButton}"
181189
Margin="8 0 0 0"
190+
ToolTip="MaterialDesignFlatPrimaryToggleButton"
182191
IsChecked="True">
183192
<materialDesign:PackIcon Kind="Heart" Height="21" Width="21" />
184193
</ToggleButton>
185194
<ToggleButton Style="{StaticResource MaterialDesignFlatPrimaryToggleButton}"
195+
ToolTip="MaterialDesignFlatPrimaryToggleButton"
186196
IsEnabled="False" Margin="8 0 0 0">
187197
<materialDesign:PackIcon Kind="Heart" Height="21" Width="21" />
188198
</ToggleButton>

‎MainDemo.Wpf/ColorZones.xaml‎

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -35,33 +35,37 @@
3535
</materialDesign:ColorZone>
3636
<TextBlock Margin="0 16 0 0" FontSize="10">Use primary mid colours, and nest colour zones!</TextBlock>
3737
<materialDesign:ColorZone Mode="PrimaryMid" Padding="16">
38-
<StackPanel Orientation="Horizontal"
38+
<DockPanel>
39+
<ToggleButton Style="{StaticResource MaterialDesignSwitchAccentToggleButton}" VerticalAlignment="Center"
40+
DockPanel.Dock="Right" />
41+
<StackPanel Orientation="Horizontal"
3942
materialDesign:RippleAssist.IsCentered="True">
40-
<ToggleButton Style="{DynamicResource MaterialDesignHamburgerToggleButton}" />
41-
<materialDesign:ColorZone Mode="Standard" Padding="8 4 8 4" CornerRadius="2" Panel.ZIndex="1"
43+
<ToggleButton Style="{DynamicResource MaterialDesignHamburgerToggleButton}" />
44+
<materialDesign:ColorZone Mode="Standard" Padding="8 4 8 4" CornerRadius="2" Panel.ZIndex="1"
4245
Margin="16 0 0 0"
4346
materialDesign:ShadowAssist.ShadowDepth="Depth1">
44-
<Grid>
45-
<Grid.ColumnDefinitions>
46-
<ColumnDefinition Width="Auto" />
47-
<ColumnDefinition Width="*" />
48-
<ColumnDefinition Width="Auto" />
49-
</Grid.ColumnDefinitions>
50-
<Button Style="{DynamicResource MaterialDesignToolButton}">
51-
<materialDesign:PackIcon Kind="Magnify" Opacity=".56" />
52-
</Button>
53-
<TextBox Grid.Column="1" Margin="8 0 0 0" materialDesign:TextFieldAssist.Hint="Build a search bar"
47+
<Grid>
48+
<Grid.ColumnDefinitions>
49+
<ColumnDefinition Width="Auto" />
50+
<ColumnDefinition Width="*" />
51+
<ColumnDefinition Width="Auto" />
52+
</Grid.ColumnDefinitions>
53+
<Button Style="{DynamicResource MaterialDesignToolButton}">
54+
<materialDesign:PackIcon Kind="Magnify" Opacity=".56" />
55+
</Button>
56+
<TextBox Grid.Column="1" Margin="8 0 0 0" materialDesign:TextFieldAssist.Hint="Build a search bar"
5457
materialDesign:TextFieldAssist.DecorationVisibility="Hidden" BorderThickness="0"
5558
MinWidth="200" VerticalAlignment="Center" />
56-
<Button Style="{DynamicResource MaterialDesignToolButton}" Grid.Column="2">
57-
<materialDesign:PackIcon Kind="Microphone" Opacity=".56" Margin="8 0 0 0" />
58-
</Button>
59-
</Grid>
60-
</materialDesign:ColorZone>
61-
<Button Style="{DynamicResource MaterialDesignToolForegroundButton}" Margin="8 0 0 0" Panel.ZIndex="0">
62-
<materialDesign:PackIcon Kind="Send" />
63-
</Button>
64-
</StackPanel>
59+
<Button Style="{DynamicResource MaterialDesignToolButton}" Grid.Column="2">
60+
<materialDesign:PackIcon Kind="Microphone" Opacity=".56" Margin="8 0 0 0" />
61+
</Button>
62+
</Grid>
63+
</materialDesign:ColorZone>
64+
<Button Style="{DynamicResource MaterialDesignToolForegroundButton}" Margin="8 0 0 0" Panel.ZIndex="0">
65+
<materialDesign:PackIcon Kind="Send" />
66+
</Button>
67+
</StackPanel>
68+
</DockPanel>
6569
</materialDesign:ColorZone>
6670
<TextBlock Margin="0 16 0 0" FontSize="10">Add in a corner radius and shadow.</TextBlock>
6771
<materialDesign:ColorZone Mode="PrimaryDark" Padding="16" CornerRadius="3" materialDesign:ShadowAssist.ShadowDepth="Depth3" Margin="2">

‎MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ToggleButton.xaml‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,7 @@
270270

271271
<Style x:Key="MaterialDesignSwitchToggleButton" TargetType="{x:Type ToggleButton}">
272272
<Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
273+
<Setter Property="Foreground" Value="{DynamicResource PrimaryHueMidBrush}" />
273274
<Setter Property="BorderThickness" Value="1"/>
274275
<Setter Property="Padding" Value="1"/>
275276
<Setter Property="Template">
@@ -375,7 +376,7 @@
375376
</Viewbox>
376377
<ControlTemplate.Triggers>
377378
<Trigger Property="IsChecked" Value="True">
378-
<Setter TargetName="Thumb" Property="Fill" Value="{DynamicResource PrimaryHueMidBrush}" />
379+
<Setter TargetName="Thumb" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Foreground}" />
379380
<Setter TargetName="Track" Property="Fill" Value="{DynamicResource PrimaryHueLightBrush}" />
380381
</Trigger>
381382
<Trigger Property="Button.IsDefaulted" Value="true"/>
@@ -402,7 +403,19 @@
402403
</Setter>
403404
</Style>
404405

405-
<Style x:Key="MaterialDesignHamburgerToggleButton" TargetType="{x:Type ToggleButton}">
406+
<Style x:Key="MaterialDesignSwitchLightToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource MaterialDesignSwitchToggleButton}">
407+
<Setter Property="Foreground" Value="{DynamicResource PrimaryHueLightBrush}" />
408+
</Style>
409+
410+
<Style x:Key="MaterialDesignSwitchDarkToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource MaterialDesignSwitchToggleButton}">
411+
<Setter Property="Foreground" Value="{DynamicResource PrimaryHueDarkBrush}" />
412+
</Style>
413+
414+
<Style x:Key="MaterialDesignSwitchAccentToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource MaterialDesignSwitchToggleButton}">
415+
<Setter Property="Foreground" Value="{DynamicResource SecondaryAccentBrush}" />
416+
</Style>
417+
418+
<Style x:Key="MaterialDesignHamburgerToggleButton" TargetType="{x:Type ToggleButton}">
406419
<Setter Property="Foreground" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground)}"/>
407420
<Setter Property="Background" Value="Transparent" />
408421
<Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>

0 commit comments

Comments
 (0)