Skip to content

Commit 00aaaa3

Browse files
spiegelpspiegelp
authored
Merge pull request #15 from ButchersBoy/master
update from original repo
2 parents 646b11f + 1af11d0 commit 00aaaa3

36 files changed

+112
-54
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/Generic.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -850,8 +850,8 @@
850850
</Setter>
851851
</Style>
852852

853-
<Style TargetType="{x:Type transitions:TransitioningContentBase}">
854-
<Setter Property="KeyboardNavigation.IsTabStop" Value="False"/>
853+
<Style TargetType="{x:Type transitions:TransitioningContentBase}">
854+
<Setter Property="KeyboardNavigation.IsTabStop" Value="False"/>
855855
<Setter Property="Template">
856856
<Setter.Value>
857857
<ControlTemplate TargetType="{x:Type transitions:TransitioningContentBase}">

‎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.Calendar.xaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@
526526
<DoubleAnimation Storyboard.TargetName="CurrentDateTextBlock"
527527
Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.X)"
528528
EasingFunction="{StaticResource EasingFunction}"
529-
AccelerationRatio="0.1" DecelerationRatio="0.9"
529+
AccelerationRatio="0.1" DecelerationRatio="0.89"
530530
From="240" To="0" Duration="0:0:0.450"/>
531531

532532
<DoubleAnimation Storyboard.TargetName="PART_MonthViewCopy"
@@ -536,12 +536,12 @@
536536
<DoubleAnimation Storyboard.TargetName="PART_MonthViewCopy"
537537
Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.X)"
538538
From="0" To="-270" Duration="0:0:0.450"
539-
AccelerationRatio="0.3" DecelerationRatio="0.7"/>
539+
AccelerationRatio="0.3" DecelerationRatio="0.69"/>
540540

541541
<DoubleAnimation Storyboard.TargetName="PART_MonthView"
542542
Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.X)"
543543
From="270" To="0" Duration="0:0:0.450"
544-
AccelerationRatio="0.3" DecelerationRatio="0.7"/>
544+
AccelerationRatio="0.3" DecelerationRatio="0.69"/>
545545

546546
<DoubleAnimation Storyboard.TargetName="PART_YearViewCopy"
547547
Storyboard.TargetProperty="(UIElement.Opacity)"
@@ -550,12 +550,12 @@
550550
<DoubleAnimation Storyboard.TargetName="PART_YearViewCopy"
551551
Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.X)"
552552
From="0" To="-240" Duration="0:0:0.450"
553-
AccelerationRatio="0.3" DecelerationRatio="0.7"/>
553+
AccelerationRatio="0.3" DecelerationRatio="0.69"/>
554554

555555
<DoubleAnimation Storyboard.TargetName="PART_YearView"
556556
Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.X)"
557557
From="240" To="0" Duration="0:0:0.450"
558-
AccelerationRatio="0.3" DecelerationRatio="0.7"/>
558+
AccelerationRatio="0.3" DecelerationRatio="0.69"/>
559559
</Storyboard>
560560
</BeginStoryboard>
561561
</EventTrigger>
@@ -565,7 +565,7 @@
565565
<DoubleAnimation Storyboard.TargetName="CurrentDateTextBlock"
566566
Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.X)"
567567
EasingFunction="{StaticResource EasingFunction}"
568-
AccelerationRatio="0.1" DecelerationRatio="0.9"
568+
AccelerationRatio="0.1" DecelerationRatio="0.89"
569569
From="-240" To="0" Duration="0:0:0.450"/>
570570

571571
<DoubleAnimation Storyboard.TargetName="PART_MonthViewCopy"
@@ -575,12 +575,12 @@
575575
<DoubleAnimation Storyboard.TargetName="PART_MonthViewCopy"
576576
Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.X)"
577577
From="0" To="270" Duration="0:0:0.450"
578-
AccelerationRatio="0.3" DecelerationRatio="0.7"/>
578+
AccelerationRatio="0.3" DecelerationRatio="0.69"/>
579579

580580
<DoubleAnimation Storyboard.TargetName="PART_MonthView"
581581
Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.X)"
582582
From="-270" To="0" Duration="0:0:0.450"
583-
AccelerationRatio="0.3" DecelerationRatio="0.7"/>
583+
AccelerationRatio="0.3" DecelerationRatio="0.69"/>
584584

585585
<DoubleAnimation Storyboard.TargetName="PART_YearViewCopy"
586586
Storyboard.TargetProperty="(UIElement.Opacity)"
@@ -589,12 +589,12 @@
589589
<DoubleAnimation Storyboard.TargetName="PART_YearViewCopy"
590590
Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.X)"
591591
From="0" To="240" Duration="0:0:0.450"
592-
AccelerationRatio="0.3" DecelerationRatio="0.7"/>
592+
AccelerationRatio="0.3" DecelerationRatio="0.69"/>
593593

594594
<DoubleAnimation Storyboard.TargetName="PART_YearView"
595595
Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.X)"
596596
From="-240" To="0" Duration="0:0:0.450"
597-
AccelerationRatio="0.3" DecelerationRatio="0.7"/>
597+
AccelerationRatio="0.3" DecelerationRatio="0.69"/>
598598
</Storyboard>
599599
</BeginStoryboard>
600600
</EventTrigger>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -492,20 +492,23 @@
492492
<Condition Property="IsKeyboardFocused" Value="True" />
493493
</MultiTrigger.Conditions>
494494
<Setter TargetName="Hint" Property="Foreground" Value="{DynamicResource PrimaryHueMidBrush}" />
495+
<Setter TargetName="Hint" Property="HintOpacity" Value="1" />
495496
</MultiTrigger>
496497
<MultiTrigger>
497498
<MultiTrigger.Conditions>
498499
<Condition SourceName="Hint" Property="IsContentNullOrEmpty" Value="False" />
499500
<Condition SourceName="PART_EditableTextBox" Property="IsKeyboardFocused" Value="True" />
500501
</MultiTrigger.Conditions>
501502
<Setter TargetName="Hint" Property="Foreground" Value="{DynamicResource PrimaryHueMidBrush}" />
503+
<Setter TargetName="Hint" Property="HintOpacity" Value="1" />
502504
</MultiTrigger>
503505
<MultiTrigger>
504506
<MultiTrigger.Conditions>
505507
<Condition SourceName="Hint" Property="IsContentNullOrEmpty" Value="False" />
506508
<Condition Property="IsDropDownOpen" Value="True" />
507509
</MultiTrigger.Conditions>
508510
<Setter TargetName="Hint" Property="Foreground" Value="{DynamicResource PrimaryHueMidBrush}" />
511+
<Setter TargetName="Hint" Property="HintOpacity" Value="1" />
509512
</MultiTrigger>
510513
<MultiTrigger>
511514
<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)"

0 commit comments

Comments
 (0)