Just some thoughts feel free to revert

MaterialDesignInXAML · Mar 19, 2023 · 4424bb3 · 4424bb3
1 parent a1a013b
commit 4424bb3
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 15 deletions.
diff --git a/MainDemo.Wpf/HintIssues.xaml b/MainDemo.Wpf/HintIssues.xaml
@@ -73,13 +73,16 @@
     <StackPanel Grid.Column="0" Grid.Row="3" Margin="0,30,0,0" HorizontalAlignment="Center" VerticalAlignment="Center" Width="{Binding ElementName=ApplyFixedWidth, Path=IsChecked, Converter={StaticResource FixedWidthConverter}}">
       <TextBox md:HintAssist.Hint="{Binding ElementName=ApplyHintText, Path=IsChecked, Converter={StaticResource BoolToParameterConverter}, ConverterParameter={StaticResource ShortHint}}"
                md:HintAssist.HelperText="{Binding ElementName=ApplyHelperText, Path=IsChecked, Converter={StaticResource BoolToParameterConverter}, ConverterParameter={StaticResource ShortHelper}}"
-               Margin="0,0,0,0" Style="{StaticResource MaterialDesignFloatingHintTextBox}" />
+               Margin="0,0,0,0" Style="{StaticResource MaterialDesignFloatingHintTextBox}"
+               HorizontalAlignment="Left"/>
       <TextBox md:HintAssist.Hint="{Binding ElementName=ApplyHintText, Path=IsChecked, Converter={StaticResource BoolToParameterConverter}, ConverterParameter={StaticResource MediumHint}}"
                md:HintAssist.HelperText="{Binding ElementName=ApplyHelperText, Path=IsChecked, Converter={StaticResource BoolToParameterConverter}, ConverterParameter={StaticResource MediumHelper}}"
-               Margin="0,15,0,0" Style="{StaticResource MaterialDesignFloatingHintTextBox}" />
+               Margin="0,15,0,0" Style="{StaticResource MaterialDesignFloatingHintTextBox}"
+               HorizontalAlignment="Left"/>
       <TextBox md:HintAssist.Hint="{Binding ElementName=ApplyHintText, Path=IsChecked, Converter={StaticResource BoolToParameterConverter}, ConverterParameter={StaticResource LongHint}}"
                md:HintAssist.HelperText="{Binding ElementName=ApplyHelperText, Path=IsChecked, Converter={StaticResource BoolToParameterConverter}, ConverterParameter={StaticResource LongHelper}}"
-               Margin="0,15,0,0" Style="{StaticResource MaterialDesignFloatingHintTextBox}" />
+               Margin="0,15,0,0" Style="{StaticResource MaterialDesignFloatingHintTextBox}"
+               HorizontalAlignment="Left"/>
     </StackPanel>
     <!-- MaterialDesignFilledTextBox style -->
     <StackPanel Grid.Column="0" Grid.Row="4" Margin="0,30,0,0" HorizontalAlignment="Center" VerticalAlignment="Center" Width="{Binding ElementName=ApplyFixedWidth, Path=IsChecked, Converter={StaticResource FixedWidthConverter}}">
@@ -97,13 +100,16 @@
     <StackPanel Grid.Column="0" Grid.Row="5" Margin="0,30,0,0" HorizontalAlignment="Center" VerticalAlignment="Center" Width="{Binding ElementName=ApplyFixedWidth, Path=IsChecked, Converter={StaticResource FixedWidthConverter}}">
       <TextBox md:HintAssist.Hint="{Binding ElementName=ApplyHintText, Path=IsChecked, Converter={StaticResource BoolToParameterConverter}, ConverterParameter={StaticResource ShortHint}}"
                md:HintAssist.HelperText="{Binding ElementName=ApplyHelperText, Path=IsChecked, Converter={StaticResource BoolToParameterConverter}, ConverterParameter={StaticResource ShortHelper}}"
-               Margin="0,0,0,0" Style="{StaticResource MaterialDesignOutlinedTextBox}" />
+               Margin="0,0,0,0" Style="{StaticResource MaterialDesignOutlinedTextBox}"
+               HorizontalContentAlignment="Left"/>
       <TextBox md:HintAssist.Hint="{Binding ElementName=ApplyHintText, Path=IsChecked, Converter={StaticResource BoolToParameterConverter}, ConverterParameter={StaticResource MediumHint}}"
                md:HintAssist.HelperText="{Binding ElementName=ApplyHelperText, Path=IsChecked, Converter={StaticResource BoolToParameterConverter}, ConverterParameter={StaticResource MediumHelper}}"
-               Margin="0,20,0,0" Style="{StaticResource MaterialDesignOutlinedTextBox}" />
+               Margin="0,20,0,0" Style="{StaticResource MaterialDesignOutlinedTextBox}"
+               HorizontalContentAlignment="Left"/>
       <TextBox md:HintAssist.Hint="{Binding ElementName=ApplyHintText, Path=IsChecked, Converter={StaticResource BoolToParameterConverter}, ConverterParameter={StaticResource LongHint}}"
                md:HintAssist.HelperText="{Binding ElementName=ApplyHelperText, Path=IsChecked, Converter={StaticResource BoolToParameterConverter}, ConverterParameter={StaticResource LongHelper}}"
-               Margin="0,20,0,0" Style="{StaticResource MaterialDesignOutlinedTextBox}" />
+               Margin="0,20,0,0" Style="{StaticResource MaterialDesignOutlinedTextBox}"
+               HorizontalContentAlignment="Left"/>
     </StackPanel>
 
 

diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.SmartHint.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.SmartHint.xaml
@@ -91,7 +91,7 @@
                       <VisualTransition From="*" To="HintFloatingPosition">
                         <Storyboard>
                           <DoubleAnimation EasingFunction="{StaticResource AnimationEasingFunction}"
-                                           Storyboard.TargetName="FloatingHintTextBlock"
+                                           Storyboard.TargetName="FloatingHintContent"
                                            Storyboard.TargetProperty="Opacity"
                                            To="{TemplateBinding HintOpacity}"
                                            Duration="0:0:0.15" />
@@ -105,7 +105,7 @@
                       <VisualTransition From="*" To="HintRestingPosition">
                         <Storyboard>
                           <DoubleAnimation EasingFunction="{StaticResource AnimationEasingFunction}"
-                                           Storyboard.TargetName="FloatingHintTextBlock"
+                                           Storyboard.TargetName="FloatingHintContent"
                                            Storyboard.TargetProperty="Opacity"
                                            Duration="0:0:0.15" />
                           <DoubleAnimation EasingFunction="{StaticResource AnimationEasingFunction}"
@@ -117,7 +117,7 @@
                     </VisualStateGroup.Transitions>
                     <VisualState x:Name="HintFloatingPosition">
                       <Storyboard>
-                        <DoubleAnimation Storyboard.TargetName="FloatingHintTextBlock"
+                        <DoubleAnimation Storyboard.TargetName="FloatingHintContent"
                                          Storyboard.TargetProperty="Opacity"
                                          To="{TemplateBinding HintOpacity}"
                                          Duration="0" />
@@ -129,7 +129,7 @@
                     </VisualState>
                     <VisualState x:Name="HintRestingPosition">
                       <Storyboard>
-                        <DoubleAnimation Storyboard.TargetName="FloatingHintTextBlock"
+                        <DoubleAnimation Storyboard.TargetName="FloatingHintContent"
                                          Storyboard.TargetProperty="Opacity"
                                          Duration="0" />
                         <DoubleAnimation Storyboard.TargetName="ScaleHost"
@@ -140,16 +140,16 @@
                   </VisualStateGroup>
                 </VisualStateManager.VisualStateGroups>
                 <wpf:ScaleHost x:Name="ScaleHost" />
-                <Canvas ClipToBounds="True" HorizontalAlignment="Stretch" Height="{Binding ElementName=FloatingHintTextBlock, Path=ActualHeight}">
-                  <Canvas.RenderTransform>
+                <Grid ClipToBounds="True" HorizontalAlignment="Stretch" Height="{Binding ElementName=FloatingHintContent, Path=ActualHeight}">
+                  <Grid.RenderTransform>
                     <MultiBinding Converter="{StaticResource FloatingHintCanvasTransformConverter}">
                       <Binding ElementName="ScaleHost" Path="Scale" />
                       <Binding Path="FloatingScale" RelativeSource="{RelativeSource TemplatedParent}" />
                       <Binding Source="{StaticResource NoContentFloatingScale}" />
                       <Binding Path="FloatingOffset" RelativeSource="{RelativeSource TemplatedParent}" />
                     </MultiBinding>
-                  </Canvas.RenderTransform>
-                  <ContentControl x:Name="FloatingHintTextBlock"
+                  </Grid.RenderTransform>
+                  <ContentControl x:Name="FloatingHintContent"
                                   HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                   VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                   Content="{TemplateBinding Hint}"
@@ -183,7 +183,7 @@
                       </MultiBinding>
                     </ContentControl.RenderTransform>
                   </ContentControl>
-                </Canvas>
+                </Grid>
               </Grid>
             </ControlTemplate>
           </Setter.Value>