When an explicit FloatingOffset is set don't override it (#2370)

Keboo · web-flow · commit 66e1b779f749 · 2021-07-15T23:11:50.000-07:00
Fixing tests


Fixing comboxbox setter
diff --git a/MaterialDesignThemes.UITests/WPF/TextBoxes/TextBoxTests.cs b/MaterialDesignThemes.UITests/WPF/TextBoxes/TextBoxTests.cs
@@ -13,7 +13,7 @@ namespace MaterialDesignThemes.UITests.WPF.TextBoxes
 {
     public class TextBoxTests : TestBase
     {
-        public TextBoxTests(ITestOutputHelper output) 
+        public TextBoxTests(ITestOutputHelper output)
             : base(output)
         {
         }
@@ -283,5 +283,27 @@ public async Task HelperText_CanSetFontColorWithAttachedStyle()
 
             recorder.Success();
         }
+
+        [Fact]
+        [Description("Issue 2362")]
+        public async Task FloatingOffset_ValuesGetApproprietlyApplied()
+        {
+            await using var recorder = new TestRecorder(App);
+
+            var textBox = await LoadXaml<TextBox>(@"
+<TextBox Style=""{StaticResource MaterialDesignFloatingHintTextBox}""
+         materialDesign:HintAssist.Hint=""Hint with offset""
+         materialDesign:HintAssist.FloatingOffset=""1,-42""
+         Margin=""100"" VerticalAlignment=""Center""
+         Text=""Something"" />
+");
+            var hint = await textBox.GetElement<SmartHint>("Hint");
+            Point offset = await hint.GetFloatingOffset();
+            
+            Assert.Equal(1, offset.X);
+            Assert.Equal(-42, offset.Y);
+
+            recorder.Success();
+        }
     }
 }
diff --git a/MaterialDesignThemes.Wpf/Converters/FloatingHintOffsetCalculationConverter.cs b/MaterialDesignThemes.Wpf/Converters/FloatingHintOffsetCalculationConverter.cs
@@ -8,18 +8,25 @@ namespace MaterialDesignThemes.Wpf.Converters
 {
     internal class FloatingHintOffsetCalculationConverter : IMultiValueConverter
     {
-        public object Convert(object[] values, Type targetType, object? parameter, CultureInfo culture)
+        public object Convert(object?[] values, Type targetType, object? parameter, CultureInfo culture)
         {
-            var fontFamily = (FontFamily)values[0];
-            double fontSize = (double)values[1];
-            double floatingScale = (double)values[2];
+            if (values.Length > 3 &&
+                values[3] is Point floatingOffset &&
+                floatingOffset != HintAssist.DefaultFloatingOffset)
+            {
+                return floatingOffset;
+            }
+
+            var fontFamily = (FontFamily)values[0]!;
+            double fontSize = (double)values[1]!;
+            double floatingScale = (double)values[2]!;
 
             double hintHeight = fontFamily.LineSpacing * fontSize;
             double floatingHintHeight = hintHeight * floatingScale;
 
-            double offset = (values.Length > 3 ? values[3] : null) switch
+            double offset = (values.Length > 4 ? values[4] : null) switch
             {
-                Thickness padding => floatingHintHeight / 2 + padding.Top,
+                Thickness padding => (floatingHintHeight / 2) + padding.Top,
                 double parentHeight => (parentHeight - hintHeight + floatingHintHeight) / 2,
                 _ => floatingHintHeight
             };
diff --git a/MaterialDesignThemes.Wpf/Converters/PickerInnerPaddingConverter.cs b/MaterialDesignThemes.Wpf/Converters/PickerInnerPaddingConverter.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Diagnostics;
 using System.Globalization;
 using System.Windows;
 using System.Windows.Data;
@@ -18,15 +17,18 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
                 ? new Thickness(Constants.TextBoxInnerButtonSpacing, padding.Top, padding.Right, padding.Bottom)
                 : Binding.DoNothing;
 
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) => throw new NotSupportedException();
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+            => throw new NotSupportedException();
         
         /// <summary>
         /// Adds the width of the inner picker button to the right of inner padding 
         /// </summary>
         public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
         {
-            if (!(values[0] is Thickness padding))
+            if (values[0] is not Thickness padding)
+            {
                 return Binding.DoNothing;
+            }
 
             switch (values.Length)
             {
@@ -40,13 +42,16 @@ public object Convert(object[] values, Type targetType, object parameter, Cultur
 
                 // calculate padding for picker-button (considering floating hint offset)
                 case 4:
-                    var offsetResult = _offsetCalculation.Convert(new[] { values[1], values[2], values[3] }, typeof(Thickness), null, culture);
+                    var offsetResult = _offsetCalculation.Convert(new[] { values[1], values[2], values[3], null }, typeof(Thickness), null, culture);
                     if (offsetResult is Thickness offset)
+                    {
                         return new Thickness(
                             padding.Left + offset.Left,
                             padding.Top + offset.Top,
                             padding.Right + offset.Right,
                             padding.Bottom + offset.Bottom);
+                    }
+
                     break;
             }
             return Binding.DoNothing;
diff --git a/MaterialDesignThemes.Wpf/HintAssist.cs b/MaterialDesignThemes.Wpf/HintAssist.cs
@@ -7,7 +7,7 @@ public static class HintAssist
     {
         private const double DefaultFloatingScale = 0.74;
         private const double DefaultHintOpacity = 0.56;
-        private static readonly Point DefaultFloatingOffset = new Point(0, -16);
+        internal static readonly Point DefaultFloatingOffset = new(0, -16);
         private static readonly Brush DefaultBackground = new SolidColorBrush(Colors.Transparent);
         private static readonly double DefaultHelperTextFontSize = 10;
 
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ComboBox.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ComboBox.xaml
@@ -620,6 +620,7 @@
                             <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="FontFamily" />
                             <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="FontSize" />
                             <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:HintAssist.FloatingScale)" />
+                            <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:HintAssist.FloatingOffset)" />
                             <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ActualHeight" />
                         </MultiBinding>
                     </Setter.Value>
@@ -659,6 +660,7 @@
                             <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="FontFamily" />
                             <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="FontSize" />
                             <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:HintAssist.FloatingScale)" />
+                            <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:HintAssist.FloatingOffset)" />
                         </MultiBinding>
                     </Setter.Value>
                 </Setter>
@@ -668,6 +670,7 @@
                             <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="FontFamily" />
                             <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="FontSize" />
                             <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:HintAssist.FloatingScale)" />
+                            <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:HintAssist.FloatingOffset)" />
                         </MultiBinding>
                     </Setter.Value>
                 </Setter>
@@ -1012,7 +1015,6 @@
     <Style x:Key="MaterialDesignFilledComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource MaterialDesignFloatingHintComboBox}">
         <Setter Property="wpf:TextFieldAssist.HasFilledTextField" Value="True" />
         <Setter Property="wpf:TextFieldAssist.TextFieldCornerRadius" Value="4,4,0,0" />
-        <Setter Property="wpf:HintAssist.FloatingOffset" Value="0,-8" />
         <Setter Property="wpf:ComboBoxAssist.ShowSelectedItem" Value="False" />
         <Setter Property="VerticalContentAlignment" Value="Stretch" />
         <Setter Property="VerticalAlignment" Value="Stretch" />
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.DatePicker.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.DatePicker.xaml
@@ -240,6 +240,7 @@
                                         <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="FontFamily" />
                                         <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="FontSize" />
                                         <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:HintAssist.FloatingScale)" />
+                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:HintAssist.FloatingOffset)" />
                                     </MultiBinding>
                                 </Setter.Value>
                             </Setter>
@@ -249,6 +250,7 @@
                                         <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="FontFamily" />
                                         <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="FontSize" />
                                         <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:HintAssist.FloatingScale)" />
+                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:HintAssist.FloatingOffset)" />
                                     </MultiBinding>
                                 </Setter.Value>
                             </Setter>
@@ -272,6 +274,7 @@
                                         <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="FontFamily" />
                                         <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="FontSize" />
                                         <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:HintAssist.FloatingScale)" />
+                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:HintAssist.FloatingOffset)" />
                                         <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ActualHeight" />
                                     </MultiBinding>
                                 </Setter.Value>
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml
@@ -209,6 +209,7 @@
                                         <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="FontFamily" />
                                         <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="FontSize" />
                                         <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:HintAssist.FloatingScale)" />
+                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:HintAssist.FloatingOffset)" />
                                     </MultiBinding>
                                 </Setter.Value>
                             </Setter>
@@ -218,6 +219,7 @@
                                         <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="FontFamily" />
                                         <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="FontSize" />
                                         <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:HintAssist.FloatingScale)" />
+                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:HintAssist.FloatingOffset)" />
                                     </MultiBinding>
                                 </Setter.Value>
                             </Setter>
@@ -243,6 +245,7 @@
                                         <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="FontFamily" />
                                         <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="FontSize" />
                                         <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:HintAssist.FloatingScale)" />
+                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:HintAssist.FloatingOffset)" />
                                         <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ActualHeight" />
                                     </MultiBinding>
                                 </Setter.Value>
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TextBox.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TextBox.xaml
@@ -286,6 +286,7 @@
                                         <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="FontFamily" />
                                         <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="FontSize" />
                                         <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:HintAssist.FloatingScale)" />
+                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:HintAssist.FloatingOffset)" />
                                     </MultiBinding>
                                 </Setter.Value>
                             </Setter>
@@ -295,6 +296,7 @@
                                         <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="FontFamily" />
                                         <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="FontSize" />
                                         <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:HintAssist.FloatingScale)" />
+                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:HintAssist.FloatingOffset)" />
                                     </MultiBinding>
                                 </Setter.Value>
                             </Setter>
@@ -321,6 +323,7 @@
                                         <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="FontFamily" />
                                         <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="FontSize" />
                                         <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:HintAssist.FloatingScale)" />
+                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:HintAssist.FloatingOffset)" />
                                         <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Padding" />
                                     </MultiBinding>
                                 </Setter.Value>
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TimePicker.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TimePicker.xaml
@@ -238,6 +238,7 @@
                                         <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="FontFamily" />
                                         <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="FontSize" />
                                         <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:HintAssist.FloatingScale)" />
+                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:HintAssist.FloatingOffset)" />
                                     </MultiBinding>
                                 </Setter.Value>
                             </Setter>
@@ -247,6 +248,7 @@
                                         <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="FontFamily" />
                                         <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="FontSize" />
                                         <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:HintAssist.FloatingScale)" />
+                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:HintAssist.FloatingOffset)" />
                                     </MultiBinding>
                                 </Setter.Value>
                             </Setter>
@@ -270,6 +272,7 @@
                                         <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="FontFamily" />
                                         <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="FontSize" />
                                         <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:HintAssist.FloatingScale)" />
+                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:HintAssist.FloatingOffset)" />
                                         <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ActualHeight" />
                                     </MultiBinding>
                                 </Setter.Value>

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ namespace MaterialDesignThemes.UITests.WPF.TextBoxes`
`13`	`13`	`{`
`14`	`14`	`public class TextBoxTests : TestBase`
`15`	`15`	`{`
`16`		`- public TextBoxTests(ITestOutputHelper output)`
	`16`	`+ public TextBoxTests(ITestOutputHelper output)`
`17`	`17`	`: base(output)`
`18`	`18`	`{`
`19`	`19`	`}`
`@@ -283,5 +283,27 @@ public async Task HelperText_CanSetFontColorWithAttachedStyle()`
`283`	`283`
`284`	`284`	`recorder.Success();`
`285`	`285`	`}`
	`286`	`+`
	`287`	`+ [Fact]`
	`288`	`+ [Description("Issue 2362")]`
	`289`	`+ public async Task FloatingOffset_ValuesGetApproprietlyApplied()`
	`290`	`+ {`
	`291`	`+ await using var recorder = new TestRecorder(App);`
	`292`	`+`
	`293`	`+ var textBox = await LoadXaml<TextBox>(@"`
	`294`	`+<TextBox Style=""{StaticResource MaterialDesignFloatingHintTextBox}""`
	`295`	`+ materialDesign:HintAssist.Hint=""Hint with offset""`
	`296`	`+ materialDesign:HintAssist.FloatingOffset=""1,-42""`
	`297`	`+ Margin=""100"" VerticalAlignment=""Center""`
	`298`	`+ Text=""Something"" />`
	`299`	`+");`
	`300`	`+ var hint = await textBox.GetElement<SmartHint>("Hint");`
	`301`	`+ Point offset = await hint.GetFloatingOffset();`
	`302`	`+`
	`303`	`+ Assert.Equal(1, offset.X);`
	`304`	`+ Assert.Equal(-42, offset.Y);`
	`305`	`+`
	`306`	`+ recorder.Success();`
	`307`	`+ }`
`286`	`308`	`}`
`287`	`309`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ public static class HintAssist`
`7`	`7`	`{`
`8`	`8`	`private const double DefaultFloatingScale = 0.74;`
`9`	`9`	`private const double DefaultHintOpacity = 0.56;`
`10`		`- private static readonly Point DefaultFloatingOffset = new Point(0, -16);`
	`10`	`+ internal static readonly Point DefaultFloatingOffset = new(0, -16);`
`11`	`11`	`private static readonly Brush DefaultBackground = new SolidColorBrush(Colors.Transparent);`
`12`	`12`	`private static readonly double DefaultHelperTextFontSize = 10;`
`13`	`13`