Merge remote-tracking branch 'refs/remotes/ButchersBoy/master'

Author: edongashi

MainDemo.Wpf/Buttons.xaml

@@ -280,7 +280,7 @@
                 </ToggleButton>
             </StackPanel>
 
-            <ListBox Grid.Column="1" Grid.Row="0" Style="{StaticResource MaterialDesignToolToggleListBox}">
+            <ListBox Grid.Column="1" Grid.Row="0" Style="{StaticResource MaterialDesignToolToggleListBox}" SelectedIndex="0">
                 <ListBox.ToolTip>
                     <StackPanel>
                         <TextBlock Text="MaterialDesignToolToggleListBox" />

MainDemo.Wpf/TextFields.xaml

@@ -5,7 +5,6 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:domain="clr-namespace:MaterialDesignColors.WpfExample.Domain"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-             xmlns:materialDesignDemo="clr-namespace:MaterialDesignDemo"
              xmlns:domain1="clr-namespace:MaterialDesignDemo.Domain"
              mc:Ignorable="d"               
              d:DesignHeight="300" d:DesignWidth="600" Loaded="UserControl_Loaded"
@@ -225,5 +224,19 @@
                 </domain1:SimpleDataTemplateSelector>
             </ContentControl.ContentTemplateSelector>
         </ContentControl>
+        <TextBlock Grid.Row="7" Grid.Column="4" Style="{StaticResource MaterialDesignSubheadingTextBlock}"
+                   Margin="0 48 0 0">Tight Space Validation</TextBlock>
+        <TextBox Grid.Row="8" Grid.Column="4" Width="20"
+                 materialDesign:ValidationAssist.UsePopup="True"
+                 HorizontalAlignment="Left"
+                 ToolTip="Use a popup which can escape the bounds of the control where space is limited">
+            <TextBox.Text>
+                <Binding Path="Name" UpdateSourceTrigger="PropertyChanged">
+                    <Binding.ValidationRules>
+                        <domain1:NotEmptyValidationRule ValidatesOnTargetUpdated="True" />
+                    </Binding.ValidationRules>
+                </Binding>
+            </TextBox.Text>
+        </TextBox>
     </Grid>
 </UserControl>

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ListBox.xaml

@@ -76,7 +76,7 @@
                                         <Storyboard>
                                             <DoubleAnimation Storyboard.TargetName="SelectedBackgroundBorder"
                                                              Storyboard.TargetProperty="Opacity"
-                                                             To="0" Duration="1"/>
+                                                             To="0" Duration="0"/>
                                         </Storyboard>
                                     </VisualTransition>
                                 </VisualStateGroup.Transitions>

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ValidationErrorTemplate.xaml

@@ -8,30 +8,42 @@
         <ControlTemplate.Resources>
             <DataTemplate DataType="{x:Type ValidationError}">
                 <TextBlock Foreground="{DynamicResource ValidationErrorBrush}"
-                                       FontSize="10"
-                                       MaxWidth="{Binding ElementName=Placeholder, Path=ActualWidth}"
-                                       HorizontalAlignment="Left"
-                                       Margin="2"
-                                       TextWrapping="Wrap"
-                                       Text="{Binding ErrorContent}"
-                                       UseLayoutRounding="false" />
+                           FontSize="10"
+                           MaxWidth="{Binding ElementName=Placeholder, Path=ActualWidth}"
+                           HorizontalAlignment="Left"
+                           Margin="2"
+                           TextWrapping="Wrap"
+                           Text="{Binding ErrorContent}"
+                           UseLayoutRounding="false" />
             </DataTemplate>
         </ControlTemplate.Resources>
         <StackPanel>
             <AdornedElementPlaceholder Name="Placeholder" />
             <Border Name="DefaultErrorViewer"
                     Visibility="Collapsed"
                     Background="{DynamicResource MaterialDesignPaper}">
-                <ContentPresenter Content="{Binding CurrentItem}" />
+                <TextBlock Foreground="{DynamicResource ValidationErrorBrush}"
+                           FontSize="10"
+                           MaxWidth="{Binding ElementName=Placeholder, Path=ActualWidth}"
+                           HorizontalAlignment="Left"
+                           Margin="0 2"
+                           TextWrapping="Wrap"
+                           Text="{Binding CurrentItem.ErrorContent}"
+                           UseLayoutRounding="false" />
             </Border>
-
             <controlzEx:PopupEx x:Name="ValidationPopup"
-                              IsOpen="False"
-                              Placement="Bottom"
-                              PlacementTarget="{Binding ElementName=Placeholder, Mode=OneWay}"
-                              AllowsTransparency="True">
+                                IsOpen="False"
+                                Placement="Bottom"
+                                PlacementTarget="{Binding ElementName=Placeholder, Mode=OneWay}"
+                                AllowsTransparency="True">
                 <Border Background="{DynamicResource MaterialDesignPaper}">
-                    <ContentPresenter Content="{Binding CurrentItem}" />
+                    <TextBlock Foreground="{DynamicResource ValidationErrorBrush}"
+                               FontSize="10"
+                               HorizontalAlignment="Left"
+                               Margin="0 2"
+                               TextWrapping="Wrap"
+                               Text="{Binding CurrentItem.ErrorContent}"
+                               UseLayoutRounding="false" />
                 </Border>
             </controlzEx:PopupEx>
         </StackPanel>

README.md

@@ -22,7 +22,7 @@ Comphrehensive and easy to use Material Design theme and control library for the
 [![NuGet-Themes](https://img.shields.io/nuget/dt/MaterialDesignColors.svg?label=NuGet-Colors&style=flat-square)](https://www.nuget.org/packages/MaterialDesignColors/)
 [![Issues](https://img.shields.io/github/issues/ButchersBoy/MaterialDesignInXamlToolkit.svg?style=flat-square)](https://github.com/ButchersBoy/MaterialDesignInXamlToolkit/issues)
 [![Twitter](https://img.shields.io/badge/twitter-%40james__willock-55acee.svg?style=flat-square)](https://twitter.com/James_Willock)
-
+ 
 # ![Alt text](web/images/MD4XAML28.png "How Can I Use The Themes?") How Can I Use The Themes?
 
 * Checkout the [Super Quick Start](https://github.com/ButchersBoy/MaterialDesignInXamlToolkit/wiki/Super-Quick-Start)
@@ -35,6 +35,7 @@ To load the source project you will need Visual Studio 2015.  Don't worry if you
 
 * Download the source and run the demo.
 * Checkout [F1ix](http://materialdesigninxaml.net/f1ix).
+* Checkout [Motion List](https://github.com/MaterialDesignInXAML/MotionList).
 
 # ![Alt text](web/images/MD4XAML28.png "Contributions") Contribution Guidelines
 
@@ -78,6 +79,8 @@ To load the source project you will need Visual Studio 2015.  Don't worry if you
 
 ![Alt text](web/images/screen-treeview.png "Tree View")
 
+![Alt text](web/images/screen-progress.png "Progress Bars")
+
 ![Alt text](web/images/screen-sliders.png "Sliders")
 
 ![Alt text](web/images/screen-typography.png "Typography")