Skip to content

Commit b5c98e1

Browse files
committed
Public converter classes: Handled PR comments
1 parent 5716921 commit b5c98e1

File tree

4 files changed

+3
-74
lines changed

4 files changed

+3
-74
lines changed

src/MaterialDesignThemes.Wpf/Converters/FloatingHintOffsetCalculationConverter.cs

Lines changed: 0 additions & 65 deletions
This file was deleted.

src/MaterialDesignThemes.Wpf/Converters/FloatingHintTextBlockMarginConverter.cs renamed to src/MaterialDesignThemes.Wpf/Converters/Internal/FloatingHintTextBlockMarginConverter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.Windows.Data;
33
using System.Windows.Media;
44

5-
namespace MaterialDesignThemes.Wpf.Converters;
5+
namespace MaterialDesignThemes.Wpf.Converters.Internal;
66

77
public class FloatingHintTextBlockMarginConverter : IMultiValueConverter
88
{

src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.SmartHint.xaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
33
xmlns:converters="clr-namespace:MaterialDesignThemes.Wpf.Converters"
4+
xmlns:convertersInternal="clr-namespace:MaterialDesignThemes.Wpf.Converters.Internal"
45
xmlns:system="clr-namespace:System;assembly=mscorlib"
56
xmlns:wpf="clr-namespace:MaterialDesignThemes.Wpf"
67
xmlns:behaviors="clr-namespace:MaterialDesignThemes.Wpf.Behaviors">
@@ -182,7 +183,7 @@
182183
Visibility="{TemplateBinding UseFloating, Converter={x:Static converters:BooleanToVisibilityConverter.CollapsedInstance}}">
183184

184185
<ContentControl.Margin>
185-
<MultiBinding Converter="{x:Static converters:FloatingHintTextBlockMarginConverter.Instance}">
186+
<MultiBinding Converter="{x:Static convertersInternal:FloatingHintTextBlockMarginConverter.Instance}">
186187
<Binding Path="(wpf:HintAssist.HintHorizontalAlignment)" RelativeSource="{RelativeSource TemplatedParent}" />
187188
<Binding Path="(wpf:HintAssist.FloatingHintHorizontalAlignment)" RelativeSource="{RelativeSource TemplatedParent}" />
188189
<Binding Path="HorizontalContentAlignment" RelativeSource="{RelativeSource TemplatedParent}" />

tests/MaterialDesignThemes.Wpf.Tests/Converters/SliderToolTipConverterTests.cs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,6 @@ public sealed class SliderToolTipConverterTests
1111
[InlineData(42)]
1212
public void SliderConverterTest(object value)
1313
{
14-
15-
/* Unmerged change from project 'MaterialDesignThemes.Wpf.Tests (net8.0-windows)'
16-
Before:
17-
Wpf.Converters.SliderToolTipConverter converter = new ();
18-
After:
19-
SliderToolTipConverter converter = new ();
20-
*/
2114
Wpf.Converters.Internal.SliderToolTipConverter converter = new ();
2215

2316
//test a valid case

0 commit comments

Comments
 (0)