Merge branch 'extended-smarthint' of https://github.com/mgnslndh/MaterialDesignInXamlToolkit

ButchersBoy · ButchersBoy · commit 8fdc9de7012a · 2016-09-05T16:10:48.000+01:00
diff --git a/MainDemo.Wpf/TextFields.xaml b/MainDemo.Wpf/TextFields.xaml
@@ -205,12 +205,11 @@
         <TextBox Grid.Row="6" Grid.Column="3"
                  materialDesign:HintAssist.Hint="Large Font"
                  materialDesign:TextFieldAssist.TextBoxViewMargin="1 0 1 0"
-                 materialDesign:HintAssist.FloatingScale="0.54"
-                 materialDesign:HintAssist.FloatingOffset="1,-54"
+                 materialDesign:HintAssist.FloatingScale="0.50"                 
                  Text="Some Text"
                  Style="{StaticResource MaterialDesignFloatingHintTextBox}"
                  FontSize="24"/>
-
+                          
         <TextBlock Grid.Row="7" Grid.Column="1" Style="{StaticResource MaterialDesignSubheadingTextBlock}"
                    Margin="0 48 0 0">DataTemplate Test</TextBlock>
         <ContentControl Grid.Row="8" Grid.Column="1" Grid.ColumnSpan="4"
diff --git a/MaterialDesignThemes.Wpf/HintAssist.cs b/MaterialDesignThemes.Wpf/HintAssist.cs
@@ -46,7 +46,7 @@ public static void SetFloatingScale(DependencyObject element, double value)
             "FloatingOffset",
             typeof(Point),
             typeof(HintAssist),
-            new FrameworkPropertyMetadata(new Point(1, -27), FrameworkPropertyMetadataOptions.Inherits));
+            new FrameworkPropertyMetadata(new Point(1, -16), FrameworkPropertyMetadataOptions.Inherits));
 
         public static Point GetFloatingOffset(DependencyObject element)
         {
diff --git a/MaterialDesignThemes.Wpf/SmartHint.cs b/MaterialDesignThemes.Wpf/SmartHint.cs
@@ -88,7 +88,7 @@ public double FloatingScale
         }
 
         public static readonly DependencyProperty FloatingOffsetProperty = DependencyProperty.Register(
-            nameof(FloatingOffset), typeof(Point), typeof(SmartHint), new PropertyMetadata(new Point(1, -27)));
+            nameof(FloatingOffset), typeof(Point), typeof(SmartHint), new PropertyMetadata(new Point(1, -16)));
 
         public Point FloatingOffset
         {
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.SmartHint.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.SmartHint.xaml
@@ -90,22 +90,8 @@
                             <ContentControl.Tag>
                                 <system:Double>0.0</system:Double>
                             </ContentControl.Tag>
-                            <ContentControl.RenderTransform>
+                            <ContentControl.LayoutTransform>
                                 <TransformGroup>
-                                    <TranslateTransform>
-                                        <TranslateTransform.X>
-                                            <MultiBinding Converter="{StaticResource TranslateConverter}">
-                                                <Binding Path="Tag" ElementName="FloatingHintTextBlock"/>
-                                                <Binding Path="FloatingOffset.X" RelativeSource="{RelativeSource TemplatedParent}"/>
-                                            </MultiBinding>
-                                        </TranslateTransform.X>
-                                        <TranslateTransform.Y>
-                                            <MultiBinding Converter="{StaticResource TranslateConverter}">
-                                                <Binding Path="Tag" ElementName="FloatingHintTextBlock"/>
-                                                <Binding Path="FloatingOffset.Y" RelativeSource="{RelativeSource TemplatedParent}"/>
-                                            </MultiBinding>
-                                        </TranslateTransform.Y>
-                                    </TranslateTransform>
                                     <ScaleTransform>
                                         <ScaleTransform.ScaleX>
                                             <MultiBinding Converter="{StaticResource RangePositionConverter}">
@@ -123,6 +109,24 @@
                                         </ScaleTransform.ScaleY>
                                     </ScaleTransform>
                                 </TransformGroup>
+                            </ContentControl.LayoutTransform>
+                            <ContentControl.RenderTransform>
+                                <TransformGroup>
+                                    <TranslateTransform>
+                                        <TranslateTransform.X>
+                                            <MultiBinding Converter="{StaticResource TranslateConverter}">
+                                                <Binding Path="Tag" ElementName="FloatingHintTextBlock"/>
+                                                <Binding Path="FloatingOffset.X" RelativeSource="{RelativeSource TemplatedParent}"/>
+                                            </MultiBinding>
+                                        </TranslateTransform.X>
+                                        <TranslateTransform.Y>
+                                            <MultiBinding Converter="{StaticResource TranslateConverter}">
+                                                <Binding Path="Tag" ElementName="FloatingHintTextBlock"/>
+                                                <Binding Path="FloatingOffset.Y" RelativeSource="{RelativeSource TemplatedParent}"/>
+                                            </MultiBinding>
+                                        </TranslateTransform.Y>
+                                    </TranslateTransform>
+                                </TransformGroup>
                             </ContentControl.RenderTransform>
                         </ContentControl>
                         <ContentControl x:Name="SimpleHintTextBlock"

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public static void SetFloatingScale(DependencyObject element, double value)`
`46`	`46`	`"FloatingOffset",`
`47`	`47`	`typeof(Point),`
`48`	`48`	`typeof(HintAssist),`
`49`		`- new FrameworkPropertyMetadata(new Point(1, -27), FrameworkPropertyMetadataOptions.Inherits));`
	`49`	`+ new FrameworkPropertyMetadata(new Point(1, -16), FrameworkPropertyMetadataOptions.Inherits));`
`50`	`50`
`51`	`51`	`public static Point GetFloatingOffset(DependencyObject element)`
`52`	`52`	`{`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ public double FloatingScale`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`public static readonly DependencyProperty FloatingOffsetProperty = DependencyProperty.Register(`
`91`		`- nameof(FloatingOffset), typeof(Point), typeof(SmartHint), new PropertyMetadata(new Point(1, -27)));`
	`91`	`+ nameof(FloatingOffset), typeof(Point), typeof(SmartHint), new PropertyMetadata(new Point(1, -16)));`
`92`	`92`
`93`	`93`	`public Point FloatingOffset`
`94`	`94`	`{`