Skip to content

Commit 71b4562

Browse files
committed
Fix TextBox horizontal scrollbar position when VerticalContentAlignment is set to Top
1 parent e5d0c3d commit 71b4562

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

src/MainDemo.Wpf/Fields.xaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -340,12 +340,14 @@
340340

341341
<TextBox Height="100"
342342
VerticalAlignment="Top"
343+
VerticalContentAlignment="Top"
343344
materialDesign:HintAssist.Hint="This is a text area"
344345
AcceptsReturn="True"
345346
IsEnabled="{Binding Path=IsChecked, ElementName=MaterialDesignOutlinedTextBoxEnabledComboBox}"
346347
Style="{StaticResource MaterialDesignOutlinedTextBox}"
347-
TextWrapping="Wrap"
348-
VerticalScrollBarVisibility="Auto" />
348+
TextWrapping="NoWrap"
349+
VerticalScrollBarVisibility="Auto"
350+
HorizontalScrollBarVisibility="Auto" />
349351
</StackPanel>
350352
</smtx:XamlDisplay>
351353

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133

134134
<Grid x:Name="ContentGrid"
135135
MinHeight="16"
136-
VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
136+
VerticalAlignment="Stretch">
137137
<Grid.ColumnDefinitions>
138138
<ColumnDefinition Width="Auto" />
139139
<ColumnDefinition Width="Auto" />
@@ -156,7 +156,7 @@
156156
<ScrollViewer x:Name="PART_ContentHost"
157157
Grid.Column="2"
158158
HorizontalAlignment="Stretch"
159-
VerticalAlignment="Center"
159+
VerticalAlignment="Stretch"
160160
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
161161
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
162162
Panel.ZIndex="1"
@@ -171,7 +171,7 @@
171171
<wpf:SmartHint x:Name="Hint"
172172
Grid.Column="1"
173173
Grid.ColumnSpan="3"
174-
VerticalAlignment="Center"
174+
VerticalAlignment="Stretch"
175175
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
176176
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
177177
FloatingOffset="{TemplateBinding wpf:HintAssist.FloatingOffset}"

0 commit comments

Comments
 (0)