Skip to content

Fix TextBox horizontal scrollbar position when VerticalContentAlignment is set to Top #3931

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
database64128 wants to merge 1 commit into from
+9 −35
Closed

Fix TextBox horizontal scrollbar position when VerticalContentAlignment is set to Top #3931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/MainDemo.Wpf/Fields.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,12 +340,14 @@

<TextBox Height="100"
VerticalAlignment="Top"
VerticalContentAlignment="Top"
materialDesign:HintAssist.Hint="This is a text area"
AcceptsReturn="True"
IsEnabled="{Binding Path=IsChecked, ElementName=MaterialDesignOutlinedTextBoxEnabledComboBox}"
Style="{StaticResource MaterialDesignOutlinedTextBox}"
TextWrapping="Wrap"
VerticalScrollBarVisibility="Auto" />
TextWrapping="NoWrap"
VerticalScrollBarVisibility="Auto"
HorizontalScrollBarVisibility="Auto" />
</StackPanel>
</smtx:XamlDisplay>

Expand Down
1 change: 0 additions & 1 deletion src/MaterialDesignThemes.Wpf/Converters/VerticalAlignmentConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

namespace MaterialDesignThemes.Wpf.Converters;

[Obsolete("This class is obsolete and will be removed in a future version.")]
public class VerticalAlignmentConverter : IValueConverter
{
public VerticalAlignment StretchReplacement { get; set; } = VerticalAlignment.Top;
Expand Down
9 changes: 5 additions & 4 deletions src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TextBox.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
<Style.Resources>
<convertersInternal:TextFieldClearButtonVisibilityConverter x:Key="ClearButtonVisibilityConverter" ContentEmptyVisibility="Collapsed" />
<converters:TextFieldPrefixTextVisibilityConverter x:Key="PrefixSuffixTextVisibilityConverter" HiddenState="Collapsed" />
<converters:VerticalAlignmentConverter x:Key="PrefixSuffixTextVerticalAlignmentConverter" StretchReplacement="Center" />
<converters:BooleanToDashStyleConverter x:Key="BooleanToDashStyleConverter" TrueValue="{x:Static DashStyles.Solid}" />
<converters:ThicknessCloneConverter x:Key="HelperTextMarginConverter" CloneEdges="Left,Right" />
<converters:MathConverter x:Key="DivisionConverter" Operation="Divide" Offset="1.5" />
Expand Down Expand Up @@ -133,7 +134,7 @@

<Grid x:Name="ContentGrid"
MinHeight="16"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
VerticalAlignment="Stretch">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
Expand All @@ -156,7 +157,7 @@
<ScrollViewer x:Name="PART_ContentHost"
Grid.Column="2"
HorizontalAlignment="Stretch"
VerticalAlignment="Center"
VerticalAlignment="Stretch"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
Panel.ZIndex="1"
Expand Down Expand Up @@ -224,7 +225,7 @@
<TextBlock x:Name="PrefixTextBlock"
Grid.Column="1"
Margin="0,0,2,0"
VerticalAlignment="Center"
VerticalAlignment="{TemplateBinding VerticalContentAlignment, Converter={StaticResource PrefixSuffixTextVerticalAlignmentConverter}}"
FontSize="{TemplateBinding FontSize}"
Opacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
Text="{TemplateBinding wpf:TextFieldAssist.PrefixText}">
Expand All @@ -242,7 +243,7 @@
<TextBlock x:Name="SuffixTextBlock"
Grid.Column="3"
Margin="2,0,0,0"
VerticalAlignment="Center"
VerticalAlignment="{TemplateBinding VerticalContentAlignment, Converter={StaticResource PrefixSuffixTextVerticalAlignmentConverter}}"
FontSize="{TemplateBinding FontSize}"
Opacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
Text="{TemplateBinding wpf:TextFieldAssist.SuffixText}">
Expand Down
28 changes: 0 additions & 28 deletions tests/MaterialDesignThemes.UITests/WPF/TextBoxes/TextBoxTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,34 +536,6 @@ public async Task TextBox_WithHintAndValidationError_RespectsPadding(string styl
recorder.Success();
}

[Test]
[Arguments(VerticalAlignment.Stretch, VerticalAlignment.Stretch)]
[Arguments(VerticalAlignment.Top, VerticalAlignment.Top)]
[Arguments(VerticalAlignment.Bottom, VerticalAlignment.Bottom)]
[Arguments(VerticalAlignment.Center, VerticalAlignment.Center)]
[Description("Issue 3161")]
public async Task TextBox_MultiLineAndFixedHeight_RespectsVerticalContentAlignment(VerticalAlignment alignment, VerticalAlignment expectedFloatingHintAlignment)
{
await using var recorder = new TestRecorder(App);

var stackPanel = await LoadXaml<StackPanel>($$"""
<StackPanel>
<TextBox Style="{StaticResource MaterialDesignFilledTextBox}"
materialDesign:HintAssist.Hint="Hint text"
VerticalContentAlignment="{{alignment}}"
AcceptsReturn="True"
Height="200" />
</StackPanel>
""");

IVisualElement<TextBox> textBox = await stackPanel.GetElement<TextBox>("/TextBox");
IVisualElement<Grid> contentGrid = await textBox.GetElement<Grid>("ContentGrid");

await Assert.That(await contentGrid.GetVerticalAlignment()).IsEqualTo(expectedFloatingHintAlignment);

recorder.Success();
}

[Test]
[Description("Issue 3176")]
public async Task ValidationErrorTemplate_WithChangingErrors_UpdatesValidation()
Expand Down