Skip to content

Commit 2ce475b

Browse files
Fix initial state of custom ScrollBar
1 parent 97463d2 commit 2ce475b

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

src/MaterialDesignThemes.Wpf/Behaviors/TextBoxHorizontalScrollBarBehavior.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Microsoft.Xaml.Behaviors;
1+
using Microsoft.Xaml.Behaviors;
22

33
namespace MaterialDesignThemes.Wpf.Behaviors;
44

@@ -29,7 +29,7 @@ private static void TargetScrollBarChanged(DependencyObject d, DependencyPropert
2929
}
3030

3131
public static readonly DependencyProperty TargetScrollBarVisibilityProperty =
32-
DependencyProperty.Register(nameof(TargetScrollBarVisibility), typeof(ScrollBarVisibility), typeof(TextBoxHorizontalScrollBarBehavior), new PropertyMetadata(ScrollBarVisibility.Auto));
32+
DependencyProperty.Register(nameof(TargetScrollBarVisibility), typeof(ScrollBarVisibility), typeof(TextBoxHorizontalScrollBarBehavior), new PropertyMetadata(ScrollBarVisibility.Hidden));
3333
public ScrollBarVisibility TargetScrollBarVisibility
3434
{
3535
get => (ScrollBarVisibility)GetValue(TargetScrollBarVisibilityProperty);

src/MaterialDesignThemes.Wpf/Converters/TextBoxHorizontalScrollBarWidthConverter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class TextBoxHorizontalScrollBarWidthConverter : IMultiValueConverter
99
{
1010
if (values is [double contentHostWidth, Visibility verticalScrollBarVisibility])
1111
{
12-
return contentHostWidth - (verticalScrollBarVisibility == Visibility.Visible ? SystemParameters.VerticalScrollBarWidth : 0);
12+
return Math.Max(0, contentHostWidth - (verticalScrollBarVisibility == Visibility.Visible ? SystemParameters.VerticalScrollBarWidth : 0));
1313
}
1414
return double.NaN;
1515
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@
177177
UseLayoutRounding="{TemplateBinding UseLayoutRounding}"
178178
VerticalScrollBarVisibility="Hidden">
179179
<b:Interaction.Behaviors>
180-
<behaviors:TextBoxHorizontalScrollBarBehavior TargetScrollBar="{Binding ElementName=CustomScrollBar}" TargetScrollBarVisibility="{Binding RelativeSource={RelativeSource AncestorType=TextBox}, Path=HorizontalScrollBarVisibility}" />
180+
<behaviors:TextBoxHorizontalScrollBarBehavior TargetScrollBar="{Binding ElementName=CustomScrollBar}" TargetScrollBarVisibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=HorizontalScrollBarVisibility}" />
181181
</b:Interaction.Behaviors>
182182
</ScrollViewer>
183183

@@ -307,7 +307,8 @@
307307
<ScrollBar x:Name="CustomScrollBar"
308308
Grid.Row="1"
309309
HorizontalAlignment="Left"
310-
Orientation="Horizontal">
310+
Orientation="Horizontal"
311+
Visibility="Collapsed">
311312
<ScrollBar.Margin>
312313
<MultiBinding Converter="{StaticResource TextBoxHorizontalScrollBarMarginConverter}">
313314
<Binding ElementName="LeadingPackIcon" Path="ActualWidth" />

0 commit comments

Comments
 (0)