Skip to content

Commit abc0be2

Browse files
l1pton17l1pton17
committed
Merge remote-tracking branch 'refs/remotes/ButchersBoy/master' into ComboBoxBackground
2 parents c36fd88 + 1af11d0 commit abc0be2

34 files changed

+100
-42
lines changed

‎MainDemo.Wpf/Buttons.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@
280280
</ToggleButton>
281281
</StackPanel>
282282

283-
<ListBox Grid.Column="1" Grid.Row="0" Style="{StaticResource MaterialDesignToolToggleListBox}">
283+
<ListBox Grid.Column="1" Grid.Row="0" Style="{StaticResource MaterialDesignToolToggleListBox}" SelectedIndex="0">
284284
<ListBox.ToolTip>
285285
<StackPanel>
286286
<TextBlock Text="MaterialDesignToolToggleListBox" />

‎MainDemo.Wpf/TextFields.xaml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
66
xmlns:domain="clr-namespace:MaterialDesignColors.WpfExample.Domain"
77
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
8-
xmlns:materialDesignDemo="clr-namespace:MaterialDesignDemo"
98
xmlns:domain1="clr-namespace:MaterialDesignDemo.Domain"
109
mc:Ignorable="d"
1110
d:DesignHeight="300" d:DesignWidth="600" Loaded="UserControl_Loaded"
@@ -225,5 +224,19 @@
225224
</domain1:SimpleDataTemplateSelector>
226225
</ContentControl.ContentTemplateSelector>
227226
</ContentControl>
227+
<TextBlock Grid.Row="7" Grid.Column="4" Style="{StaticResource MaterialDesignSubheadingTextBlock}"
228+
Margin="0 48 0 0">Tight Space Validation</TextBlock>
229+
<TextBox Grid.Row="8" Grid.Column="4" Width="20"
230+
materialDesign:ValidationAssist.UsePopup="True"
231+
HorizontalAlignment="Left"
232+
ToolTip="Use a popup which can escape the bounds of the control where space is limited">
233+
<TextBox.Text>
234+
<Binding Path="Name" UpdateSourceTrigger="PropertyChanged">
235+
<Binding.ValidationRules>
236+
<domain1:NotEmptyValidationRule ValidatesOnTargetUpdated="True" />
237+
</Binding.ValidationRules>
238+
</Binding>
239+
</TextBox.Text>
240+
</TextBox>
228241
</Grid>
229242
</UserControl>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<Setter Property="wpf:RippleAssist.Feedback" Value="White" />
2929
<Setter Property="Cursor" Value="Hand"/>
3030
<Setter Property="wpf:ShadowAssist.ShadowDepth" Value="Depth1" />
31-
<Setter Property="TextBlock.FontWeight" Value="DemiBold"/>
31+
<Setter Property="TextBlock.FontWeight" Value="Medium"/>
3232
<Setter Property="TextBlock.FontSize" Value="14"/>
3333
<Setter Property="BorderThickness" Value="1"/>
3434
<Setter Property="HorizontalContentAlignment" Value="Center"/>
@@ -94,7 +94,7 @@
9494
<Setter Property="Cursor" Value="Hand"/>
9595
<Setter Property="Foreground" Value="{DynamicResource PrimaryHueMidBrush}"/>
9696
<Setter Property="wpf:RippleAssist.Feedback" Value="{DynamicResource MaterialDesignFlatButtonRipple}" />
97-
<Setter Property="TextBlock.FontWeight" Value="DemiBold"/>
97+
<Setter Property="TextBlock.FontWeight" Value="Medium"/>
9898
<Setter Property="TextBlock.FontSize" Value="14"/>
9999
<Setter Property="BorderThickness" Value="1"/>
100100
<Setter Property="HorizontalContentAlignment" Value="Center"/>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -490,20 +490,23 @@
490490
<Condition Property="IsKeyboardFocused" Value="True" />
491491
</MultiTrigger.Conditions>
492492
<Setter TargetName="Hint" Property="Foreground" Value="{DynamicResource PrimaryHueMidBrush}" />
493+
<Setter TargetName="Hint" Property="HintOpacity" Value="1" />
493494
</MultiTrigger>
494495
<MultiTrigger>
495496
<MultiTrigger.Conditions>
496497
<Condition SourceName="Hint" Property="IsContentNullOrEmpty" Value="False" />
497498
<Condition SourceName="PART_EditableTextBox" Property="IsKeyboardFocused" Value="True" />
498499
</MultiTrigger.Conditions>
499500
<Setter TargetName="Hint" Property="Foreground" Value="{DynamicResource PrimaryHueMidBrush}" />
501+
<Setter TargetName="Hint" Property="HintOpacity" Value="1" />
500502
</MultiTrigger>
501503
<MultiTrigger>
502504
<MultiTrigger.Conditions>
503505
<Condition SourceName="Hint" Property="IsContentNullOrEmpty" Value="False" />
504506
<Condition Property="IsDropDownOpen" Value="True" />
505507
</MultiTrigger.Conditions>
506508
<Setter TargetName="Hint" Property="Foreground" Value="{DynamicResource PrimaryHueMidBrush}" />
509+
<Setter TargetName="Hint" Property="HintOpacity" Value="1" />
507510
</MultiTrigger>
508511
<MultiTrigger>
509512
<MultiTrigger.Conditions>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
<Condition Property="IsKeyboardFocused" Value="True" />
7171
</MultiTrigger.Conditions>
7272
<Setter TargetName="Hint" Property="Foreground" Value="{DynamicResource PrimaryHueMidBrush}" />
73+
<Setter TargetName="Hint" Property="HintOpacity" Value="1" />
7374
</MultiTrigger>
7475
</ControlTemplate.Triggers>
7576
</ControlTemplate>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
<Storyboard>
7777
<DoubleAnimation Storyboard.TargetName="SelectedBackgroundBorder"
7878
Storyboard.TargetProperty="Opacity"
79-
To="0" Duration="1"/>
79+
To="0" Duration="0"/>
8080
</Storyboard>
8181
</VisualTransition>
8282
</VisualStateGroup.Transitions>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
<Condition Property="IsKeyboardFocused" Value="True" />
6161
</MultiTrigger.Conditions>
6262
<Setter TargetName="Hint" Property="Foreground" Value="{DynamicResource PrimaryHueMidBrush}" />
63+
<Setter TargetName="Hint" Property="HintOpacity" Value="1" />
6364
</MultiTrigger>
6465
<Trigger Property="wpf:HintAssist.IsFloating" Value="True">
6566
<Setter TargetName="border" Property="Padding" Value="0 15.5 0 4" />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<DoubleAnimation Storyboard.TargetName="SimpleHintTextBlock" Storyboard.TargetProperty="Opacity"
3030
Duration="0:0:0" To="0" />
3131
<DoubleAnimation Storyboard.TargetName="FloatingHintTextBlock" Storyboard.TargetProperty="Opacity"
32-
Duration="0:0:0.3" To="1"
32+
Duration="0:0:0.3" To="{TemplateBinding HintOpacity}"
3333
EasingFunction="{StaticResource AnimationEasingFunction}"/>
3434
<DoubleAnimation Storyboard.TargetName="FloatingHintTextBlock" Storyboard.TargetProperty="(Control.RenderTransform).(TransformGroup.Children)[1].(ScaleTransform.ScaleX)"
3535
Duration="0:0:0.3" To=".74"
@@ -73,7 +73,7 @@
7373
<DoubleAnimation Storyboard.TargetProperty="Opacity" Storyboard.TargetName="SimpleHintTextBlock"
7474
Duration="0" To="0" />
7575
<DoubleAnimation Storyboard.TargetProperty="Opacity" Storyboard.TargetName="FloatingHintTextBlock"
76-
Duration="0" To="1" />
76+
Duration="0" To="{TemplateBinding HintOpacity}" />
7777
<DoubleAnimation Storyboard.TargetName="FloatingHintTextBlock" Storyboard.TargetProperty="(Control.RenderTransform).(TransformGroup.Children)[1].(ScaleTransform.ScaleX)"
7878
Duration="0" To=".74" />
7979
<DoubleAnimation Storyboard.TargetName="FloatingHintTextBlock" Storyboard.TargetProperty="(Control.RenderTransform).(TransformGroup.Children)[1].(ScaleTransform.ScaleY)"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@
9494
<Condition Property="IsKeyboardFocused" Value="True" />
9595
</MultiTrigger.Conditions>
9696
<Setter TargetName="Hint" Property="Foreground" Value="{DynamicResource PrimaryHueMidBrush}" />
97+
<Setter TargetName="Hint" Property="HintOpacity" Value="1" />
9798
</MultiTrigger>
9899
<Trigger Property="wpf:HintAssist.IsFloating" Value="True">
99100
<Setter TargetName="border" Property="Margin" Value="0 12 0 0" />

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,17 @@
6060
HintProxy="{Binding RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static converters:HintProxyFabricConverter.Instance}}"
6161
HintOpacity="{Binding Path=(wpf:HintAssist.HintOpacity), RelativeSource={RelativeSource TemplatedParent}}"/>
6262
</Grid>
63-
</ControlTemplate>
63+
<ControlTemplate.Triggers>
64+
<MultiTrigger>
65+
<MultiTrigger.Conditions>
66+
<Condition SourceName="Hint" Property="IsContentNullOrEmpty" Value="False" />
67+
<Condition Property="IsKeyboardFocused" Value="True" />
68+
</MultiTrigger.Conditions>
69+
<Setter TargetName="Hint" Property="Foreground" Value="{DynamicResource PrimaryHueMidBrush}" />
70+
<Setter TargetName="Hint" Property="HintOpacity" Value="1" />
71+
</MultiTrigger>
72+
</ControlTemplate.Triggers>
73+
</ControlTemplate>
6474
<ControlTemplate x:Key="DropDownButtonTemplate" TargetType="{x:Type Button}">
6575
<Grid Background="Transparent">
6676
<VisualStateManager.VisualStateGroups>

0 commit comments

Comments
 (0)