Skip to content

Commit 2e14938

Browse files
ButchersBoyButchersBoy
committed
Merge branch 'AddDisableState' of https://github.com/l1pton17/MaterialDesignInXamlToolkit into l1pton17-AddDisableState
2 parents 671008d + 618ce01 commit 2e14938

11 files changed

+36
-10
lines changed

‎MainDemo.Wpf/Buttons.xaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,8 @@
147147
</ToggleButton>
148148
</StackPanel>
149149
<StackPanel Grid.Row="6" Margin="0 16 0 0" Orientation="Horizontal">
150-
<RadioButton Style="{StaticResource MaterialDesignRadioButton}" Margin="0 0 8 8" VerticalAlignment="Center" IsChecked="True">
150+
<RadioButton Style="{StaticResource MaterialDesignRadioButton}" Margin="0 0 8 8" VerticalAlignment="Center" IsChecked="True"
151+
IsEnabled="False">
151152
Radio
152153
</RadioButton>
153154
<RadioButton Style="{StaticResource MaterialDesignRadioButton}" Margin="0 0 8 8" VerticalAlignment="Center">

‎MainDemo.Wpf/MainWindow.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@
176176
Mode="PrimaryMid" DockPanel.Dock="Top">
177177
<DockPanel>
178178
<ToggleButton Style="{StaticResource MaterialDesignHamburgerToggleButton}" IsChecked="False"
179+
IsEnabled="False"
179180
x:Name="MenuToggleButton"/>
180181
<materialDesign:PopupBox DockPanel.Dock="Right" PlacementMode="BottomAndAlignRightEdges">
181182
<StackPanel>

‎MainDemo.Wpf/Pickers.xaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@
2020
</Grid.ColumnDefinitions>
2121
<TextBlock Grid.ColumnSpan="3">Classic WPF DatePicker control with Material Design theme, and new TimePicker control:</TextBlock>
2222
<StackPanel Grid.Row="1" Grid.Column="0">
23-
<DatePicker Width="100" HorizontalAlignment="Left" Margin="0 16 0 0" materialDesign:TextFieldAssist.Hint="Pick Date" />
23+
<DatePicker Width="100" HorizontalAlignment="Left" Margin="0 16 0 0" materialDesign:TextFieldAssist.Hint="Pick Date" IsEnabled="False" />
2424
<DatePicker x:Name="FutureDatePicker" Width="100" HorizontalAlignment="Left" Margin="0 16 0 0" materialDesign:TextFieldAssist.Hint="Future Date" />
2525
</StackPanel>
2626
<materialDesign:TimePicker Grid.Row="1" Grid.Column="1" VerticalAlignment="Top" Width="100" HorizontalAlignment="Left" Margin="0 16 0 0"
27+
IsEnabled="False"
2728
materialDesign:TextFieldAssist.Hint="Custom hint" />
2829
<materialDesign:TimePicker Grid.Row="1" Grid.Column="2" Is24Hours="True" x:Name="PresetTimePicker" VerticalAlignment="Top" Width="100" HorizontalAlignment="Left" Margin="0 16 0 0" />
2930

‎MainDemo.Wpf/TextFields.xaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
Style="{StaticResource MaterialDesignFloatingHintTextBox}"
118118
Margin="0 8 0 8"/>
119119
<ComboBox Grid.Row="4" Grid.Column="3" materialDesign:TextFieldAssist.Hint="OS" Style="{StaticResource MaterialDesignFloatingHintComboBox}"
120-
Margin="0 8 0 8">
120+
Margin="0 8 0 8">
121121
<ComboBoxItem>Andoid</ComboBoxItem>
122122
<ComboBoxItem>iOS</ComboBoxItem>
123123
<ComboBoxItem>Linux</ComboBoxItem>
@@ -168,8 +168,8 @@
168168
<TextBox Grid.Row="5" Grid.Column="1" materialDesign:TextFieldAssist.Hint="Floating Hint" Style="{StaticResource MaterialDesignFloatingHintTextBox}" Text="Good stuff"
169169
Margin="0 8 0 8"/>
170170
<ComboBox Grid.Row="5" Grid.Column="3" materialDesign:TextFieldAssist.Hint="Search" IsEditable="True" Style="{StaticResource MaterialDesignFloatingHintComboBox}"
171-
Margin="0 8 0 8">
172-
<ComboBoxItem>Apple</ComboBoxItem>
171+
Margin="0 8 0 8">
172+
<ComboBoxItem IsSelected="True">Apple</ComboBoxItem>
173173
<ComboBoxItem>Banana</ComboBoxItem>
174174
<ComboBoxItem>Pear</ComboBoxItem>
175175
<ComboBoxItem>Orange</ComboBoxItem>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,11 @@
142142
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
143143
Padding="{TemplateBinding Padding}"
144144
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
145+
<ControlTemplate.Triggers>
146+
<Trigger Property="IsEnabled" Value="false">
147+
<Setter Property="Opacity" Value="0.23"/>
148+
</Trigger>
149+
</ControlTemplate.Triggers>
145150
</ControlTemplate>
146151
</Setter.Value>
147152
</Setter>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,9 @@
111111
<Setter Property="FocusVisualStyle" Value="{StaticResource OptionMarkFocusVisual}"/>
112112
<Setter Property="Padding" Value="4,2,0,0"/>
113113
</Trigger>
114-
<Trigger Property="IsEnabled" Value="false">
114+
<Trigger Property="IsEnabled" Value="False">
115115
<Setter Property="Fill" TargetName="Graphic" Value="{DynamicResource MaterialDesignCheckBoxDisabled}" />
116+
<Setter TargetName="contentPresenter" Property="Opacity" Value="0.79"/>
116117
</Trigger>
117118
<Trigger Property="IsPressed" Value="true"/>
118119
<Trigger Property="IsChecked" Value="true">

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,6 +453,9 @@
453453
</wpf:ComboBoxPopup>
454454
</Grid>
455455
<ControlTemplate.Triggers>
456+
<Trigger Property="IsEnabled" Value="False">
457+
<Setter TargetName="templateRoot" Property="Opacity" Value="0.56"/>
458+
</Trigger>
456459
<Trigger Property="IsEditable" Value="True">
457460
<Setter TargetName="PART_EditableTextBox" Property="Visibility" Value="Visible" />
458461
<Setter TargetName="Underline" Property="Visibility" Value="{Binding Path=(wpf:TextFieldAssist.DecorationVisibility), RelativeSource={RelativeSource TemplatedParent}}" />
@@ -627,7 +630,9 @@
627630
</Grid>
628631
</Grid>
629632
<ControlTemplate.Triggers>
630-
633+
<Trigger Property="IsEnabled" Value="False">
634+
<Setter TargetName="templateRoot" Property="Opacity" Value="0.56"/>
635+
</Trigger>
631636
<Trigger Property="IsEditable" Value="True">
632637
<Setter TargetName="PART_EditableTextBox" Property="Visibility" Value="Visible" />
633638
<Setter TargetName="Underline" Property="Visibility" Value="{Binding Path=(wpf:TextFieldAssist.DecorationVisibility), RelativeSource={RelativeSource TemplatedParent}}" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</Trigger>
1212
<Trigger Property="IsEnabled" Value="false">
1313
<Setter Property="Foreground"
14-
Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground)}" />
14+
Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground)}" />
1515
</Trigger>
1616
<Trigger Property="IsEnabled" Value="true">
1717
<Setter Property="Cursor" Value="Hand" />

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@
8585
</Trigger>
8686
<Trigger Property="IsEnabled" Value="false">
8787
<Setter Property="Fill" TargetName="Graphic" Value="{DynamicResource MaterialDesignCheckBoxDisabled}" />
88+
<Setter TargetName="contentPresenter" Property="Opacity" Value="0.79"/>
8889
</Trigger>
8990
<Trigger Property="IsPressed" Value="true"/>
9091
<Trigger Property="IsChecked" Value="true">

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
</Grid>
7878
</ControlTemplate>
7979
</ControlTemplate.Resources>
80-
<Grid>
80+
<Grid x:Name="TemplateRoot">
8181
<Border BorderBrush="{TemplateBinding BorderBrush}"
8282
BorderThickness="{TemplateBinding BorderThickness}"
8383
Background="{TemplateBinding Background}"
@@ -108,7 +108,10 @@
108108
<wpf:Underline x:Name="Underline" Visibility="{Binding Path=(wpf:TextFieldAssist.DecorationVisibility), RelativeSource={RelativeSource TemplatedParent}}"/>
109109
</Grid>
110110
<ControlTemplate.Triggers>
111-
<Trigger Property="IsMouseOver" Value="true">
111+
<Trigger Property="IsEnabled" Value="False">
112+
<Setter Property="Opacity" TargetName="TemplateRoot" Value="0.56"/>
113+
</Trigger>
114+
<Trigger Property="IsMouseOver" Value="true">
112115
<Setter Property="BorderBrush" Value="{DynamicResource PrimaryHueMidBrush}"/>
113116
</Trigger>
114117
<Trigger Property="IsKeyboardFocusWithin" Value="true">

0 commit comments

Comments
 (0)