Skip to content

Commit a7af2b9

Browse files
Fix minor IBeam cursor issue on TextBox, PasswordBox, and ComboBox (#3145)
1 parent b9f0db7 commit a7af2b9

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ComboBox.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -355,8 +355,8 @@
355355
<TextBox x:Name="PART_EditableTextBox"
356356
Grid.Column="1"
357357
MinWidth="10"
358-
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
359-
HorizontalContentAlignment="Stretch"
358+
HorizontalAlignment="Stretch"
359+
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
360360
CaretBrush="{TemplateBinding Foreground}"
361361
IsReadOnly="{TemplateBinding IsReadOnly}"
362362
MaxLength="{Binding Path=(wpf:ComboBoxAssist.MaxLength), RelativeSource={RelativeSource Mode=TemplatedParent}}"

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,8 @@
158158
wpf:ScrollViewerAssist.IgnorePadding="True"
159159
Cursor="{TemplateBinding Cursor, Converter={StaticResource IBeamCursorConverter}}"
160160
Focusable="false"
161-
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
161+
HorizontalAlignment="Stretch"
162+
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
162163
HorizontalScrollBarVisibility="Hidden"
163164
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
164165
UseLayoutRounding="{TemplateBinding UseLayoutRounding}"
@@ -630,7 +631,8 @@
630631
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
631632
UseLayoutRounding="{TemplateBinding UseLayoutRounding}"
632633
VerticalScrollBarVisibility="Hidden"
633-
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
634+
HorizontalAlignment="Stretch"
635+
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
634636
Visibility="{Binding ElementName=ContentGrid, Path=(wpf:PasswordBoxAssist.IsPasswordRevealed), Converter={StaticResource InverseBooleanToVisibilityConverter}}" />
635637
<TextBox x:Name="RevealPasswordTextBox"
636638
Grid.Column="0"
@@ -642,7 +644,8 @@
642644
SelectionBrush="{TemplateBinding SelectionBrush}"
643645
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
644646
Style="{StaticResource MaterialDesignRawTextBox}"
645-
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
647+
HorizontalAlignment="Stretch"
648+
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
646649
Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:PasswordBoxAssist.Password), UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
647650
UseLayoutRounding="{TemplateBinding UseLayoutRounding}"
648651
Visibility="{Binding ElementName=ContentGrid, Path=(wpf:PasswordBoxAssist.IsPasswordRevealed), Converter={StaticResource BooleanToVisibilityConverter}}">

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TextBox.xaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,8 @@
173173
<ScrollViewer x:Name="PART_ContentHost"
174174
Grid.Column="1"
175175
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
176-
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
176+
HorizontalAlignment="Stretch"
177+
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
177178
Panel.ZIndex="1"
178179
wpf:ScrollViewerAssist.IgnorePadding="True"
179180
Cursor="{TemplateBinding Cursor, Converter={StaticResource IBeamCursorConverter}}"

0 commit comments

Comments
 (0)