Refactor SmartHint to allow taking up allowed space

Places the FloatingHintTextBox inside of a Canvas and splits the RenderTransform in 2 by applying the TranslateTransform to the Canvas (to move it) and the ScaleTransform to the FloatingHintTextBlock (to scale it down)

MainDemo.Wpf/ComboBoxes.xaml

@@ -237,7 +237,7 @@
 
           <ComboBox x:Name="FilledComboBox"
                     Width="256"
-                    materialDesign:HintAssist.Hint="Some item"
+                    materialDesign:HintAssist.Hint="Some item with a very long hint text that will cut off when floating"
                     IsEnabled="{Binding Path=IsChecked, ElementName=FilledComboBoxEnabledCheckBox}"
                     Style="{StaticResource MaterialDesignFilledComboBox}">
             <ComboBoxItem Content="Item 1" />

MainDemo.Wpf/Fields.xaml

@@ -299,7 +299,7 @@
 
           <TextBox MaxWidth="400"
                    VerticalAlignment="Top"
-                   materialDesign:HintAssist.Hint="Floating hint in a box"
+                   materialDesign:HintAssist.Hint="Floating hint in a box that will cut off"
                    AcceptsReturn="True"
                    IsEnabled="{Binding Path=IsChecked, ElementName=MaterialDesignFilledTextBoxEnabledComboBox}"
                    Style="{StaticResource MaterialDesignFilledTextBox}"

MaterialDesignThemes.Wpf.Tests/Converters/FloatingHintTransformConverterTests.cs

@@ -52,6 +52,34 @@ public void WhenParametersAreSpecifiedItReturnsTransforms(double scale, double l
             Assert.Equal(scale * x, translateTransform.X);
             Assert.Equal(scale * y, translateTransform.Y);
         }
+
+        [StaTheory]
+        [InlineData(2.0, 1.5, 3.0, 3.0, 4.0)]
+        [InlineData(1.5, 2.0, 3.0, 2.0, 3.0)]
+        public void WhenParametersAreSpecifiedAndScaleTransformDisabledItReturnsTransforms(double scale, double lower, double upper, double x, double y)
+        {
+            var converter = new FloatingHintTransformConverter { ApplyScaleTransform = false };
+
+            var result = (TransformGroup?)converter.Convert(new object?[] { scale, lower, upper, new Point(x, y) }, typeof(Transform), null, CultureInfo.CurrentUICulture);
+
+            Assert.NotNull(result);
+            Assert.Equal(1, result.Children.Count);
+            Assert.IsType<TranslateTransform>(result.Children[0]);
+        }
+
+        [StaTheory]
+        [InlineData(2.0, 1.5, 3.0, 3.0, 4.0)]
+        [InlineData(1.5, 2.0, 3.0, 2.0, 3.0)]
+        public void WhenParametersAreSpecifiedAndTranslateTransformDisabledItReturnsTransforms(double scale, double lower, double upper, double x, double y)
+        {
+            var converter = new FloatingHintTransformConverter { ApplyTranslateTransform = false };
+
+            var result = (TransformGroup?)converter.Convert(new object?[] { scale, lower, upper, new Point(x, y) }, typeof(Transform), null, CultureInfo.CurrentUICulture);
+
+            Assert.NotNull(result);
+            Assert.Equal(1, result.Children.Count);
+            Assert.IsType<ScaleTransform>(result.Children[0]);
+        }
     }
 
 

MaterialDesignThemes.Wpf/Converters/FloatingHintTransformConverter.cs

@@ -6,6 +6,9 @@ namespace MaterialDesignThemes.Wpf.Converters
 {
     internal class FloatingHintTransformConverter : IMultiValueConverter
     {
+        public bool ApplyScaleTransform { get; set; } = true;
+        public bool ApplyTranslateTransform { get; set; } = true;
+
         public object? Convert(object?[]? values, Type targetType, object? parameter, CultureInfo culture)
         {
             if (values == null
@@ -22,16 +25,22 @@ internal class FloatingHintTransformConverter : IMultiValueConverter
             double result = upper + (lower - upper) * scale;
 
             var transformGroup = new TransformGroup();
-            transformGroup.Children.Add(new ScaleTransform
+            if (ApplyScaleTransform)
             {
-                ScaleX = result,
-                ScaleY = result
-            });
-            transformGroup.Children.Add(new TranslateTransform
+                transformGroup.Children.Add(new ScaleTransform
+                {
+                    ScaleX = result,
+                    ScaleY = result
+                });
+            }
+            if (ApplyTranslateTransform)
             {
-                X = scale * floatingOffset.X,
-                Y = scale * floatingOffset.Y
-            });
+                transformGroup.Children.Add(new TranslateTransform
+                {
+                    X = scale * floatingOffset.X,
+                    Y = scale * floatingOffset.Y
+                });
+            }
             return transformGroup;
         }
 

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.SmartHint.xaml

@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:converters="clr-namespace:MaterialDesignThemes.Wpf.Converters"
                     xmlns:system="clr-namespace:System;assembly=mscorlib"
@@ -8,12 +8,13 @@
   <converters:BooleanToVisibilityConverter x:Key="InverseBoolToVisConverter"
                                            FalseValue="Visible"
                                            TrueValue="Collapsed" />
-  <converters:FloatingHintTransformConverter x:Key="FloatingHintTransformConverter" />
+  <converters:FloatingHintTransformConverter x:Key="FloatingHintCanvasTransformConverter" ApplyScaleTransform="False" />
+  <converters:FloatingHintTransformConverter x:Key="FloatingHintTransformConverter" ApplyTranslateTransform="False" />
   <system:Double x:Key="NoContentFloatingScale">1.0</system:Double>
   <CubicEase x:Key="AnimationEasingFunction" EasingMode="EaseInOut" />
 
   <Style TargetType="{x:Type wpf:SmartHint}">
-    <Setter Property="HorizontalAlignment" Value="Left" />
+    <Setter Property="HorizontalAlignment" Value="Stretch" />
     <Setter Property="HorizontalContentAlignment" Value="Left" />
     <Setter Property="IsHitTestVisible" Value="False" />
     <Setter Property="IsTabStop" Value="False" />
@@ -138,29 +139,39 @@
                   </VisualStateGroup>
                 </VisualStateManager.VisualStateGroups>
                 <wpf:ScaleHost x:Name="ScaleHost" />
-                <ContentControl x:Name="FloatingHintTextBlock"
-                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                Content="{TemplateBinding Hint}"
-                                FontFamily="{TemplateBinding FontFamily}"
-                                FontSize="{TemplateBinding FontSize}"
-                                IsHitTestVisible="False"
-                                IsTabStop="False"
-                                Opacity="{TemplateBinding HintOpacity}"
-                                RenderTransformOrigin="0,0"
-                                Visibility="{TemplateBinding UseFloating, Converter={StaticResource BoolToVisConverter}}">
-                  <ContentControl.Tag>
-                    <system:Double>0.0</system:Double>
-                  </ContentControl.Tag>
-                  <ContentControl.RenderTransform>
-                    <MultiBinding Converter="{StaticResource FloatingHintTransformConverter}">
+                <Canvas ClipToBounds="True" HorizontalAlignment="Stretch" Height="{Binding ElementName=FloatingHintTextBlock, Path=ActualHeight}">
+                  <Canvas.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>
-                  </ContentControl.RenderTransform>
-                </ContentControl>
+                  </Canvas.RenderTransform>
+                  <ContentControl x:Name="FloatingHintTextBlock"
+                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                  Content="{TemplateBinding Hint}"
+                                  FontFamily="{TemplateBinding FontFamily}"
+                                  FontSize="{TemplateBinding FontSize}"
+                                  IsHitTestVisible="False"
+                                  IsTabStop="False"
+                                  Opacity="{TemplateBinding HintOpacity}"
+                                  RenderTransformOrigin="0,0"
+                                  Visibility="{TemplateBinding UseFloating, Converter={StaticResource BoolToVisConverter}}">
+                    <ContentControl.Tag>
+                      <system:Double>0.0</system:Double>
+                    </ContentControl.Tag>
+                    <ContentControl.RenderTransform>
+                      <MultiBinding Converter="{StaticResource FloatingHintTransformConverter}">
+                        <Binding ElementName="ScaleHost" Path="Scale" />
+                        <Binding Path="FloatingScale" RelativeSource="{RelativeSource TemplatedParent}" />
+                        <Binding Source="{StaticResource NoContentFloatingScale}" />
+                        <Binding Path="FloatingOffset" RelativeSource="{RelativeSource TemplatedParent}" />
+                      </MultiBinding>
+                    </ContentControl.RenderTransform>
+                  </ContentControl>
+                </Canvas>
               </Grid>
             </ControlTemplate>
           </Setter.Value>
@@ -169,4 +180,4 @@
     </Style.Triggers>
   </Style>
 
-</ResourceDictionary>
+</ResourceDictionary>