Skip to content

Commit 934ab0a

Browse files
committed
Fix TextBox horizontal scrollbar position when VerticalContentAlignment is set to Top
1 parent 486d73a commit 934ab0a

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-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: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,7 @@
132132
SnapsToDevicePixels="True">
133133

134134
<Grid x:Name="ContentGrid"
135-
MinHeight="16"
136-
VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
135+
MinHeight="16">
137136
<Grid.ColumnDefinitions>
138137
<ColumnDefinition Width="Auto" />
139138
<ColumnDefinition Width="Auto" />
@@ -156,7 +155,7 @@
156155
<ScrollViewer x:Name="PART_ContentHost"
157156
Grid.Column="2"
158157
HorizontalAlignment="Stretch"
159-
VerticalAlignment="Center"
158+
VerticalAlignment="Stretch"
160159
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
161160
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
162161
Panel.ZIndex="1"

0 commit comments

Comments
 (0)