Browse Source
Merge branch 'master' into fixes/tapped-gestures
pull/9360/head
Max Katz
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
8 additions and
4 deletions
-
src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
-
src/Avalonia.Themes.Simple/Controls/TextBox.xaml
|
|
|
@ -235,7 +235,8 @@ |
|
|
|
<Setter Property="InnerRightContent"> |
|
|
|
<Template> |
|
|
|
<ToggleButton Theme="{StaticResource FluentTextBoxToggleButton}" |
|
|
|
IsChecked="{Binding $parent[TextBox].RevealPassword, Mode=TwoWay}"> |
|
|
|
IsChecked="{Binding $parent[TextBox].RevealPassword, Mode=TwoWay}" |
|
|
|
ClipToBounds="True"> |
|
|
|
<Panel> |
|
|
|
<PathIcon Data="{StaticResource PasswordBoxRevealButtonData}" |
|
|
|
Height="8" Width="12" |
|
|
|
@ -253,7 +254,8 @@ |
|
|
|
<Setter Property="InnerRightContent"> |
|
|
|
<Template> |
|
|
|
<Button Theme="{StaticResource FluentTextBoxButton}" |
|
|
|
Command="{Binding $parent[TextBox].Clear}"> |
|
|
|
Command="{Binding $parent[TextBox].Clear}" |
|
|
|
ClipToBounds="True"> |
|
|
|
<PathIcon Data="{StaticResource TextBoxClearButtonData}" Height="10" Width="10"/> |
|
|
|
</Button> |
|
|
|
</Template> |
|
|
|
|
|
|
|
@ -192,7 +192,8 @@ |
|
|
|
<Template> |
|
|
|
<Button Command="{Binding $parent[TextBox].Clear}" |
|
|
|
Focusable="False" |
|
|
|
Theme="{StaticResource SimpleTextBoxClearButtonTheme}" /> |
|
|
|
Theme="{StaticResource SimpleTextBoxClearButtonTheme}" |
|
|
|
ClipToBounds="True" /> |
|
|
|
</Template> |
|
|
|
</Setter> |
|
|
|
</Style> |
|
|
|
@ -212,7 +213,8 @@ |
|
|
|
<ToggleButton Background="Transparent" |
|
|
|
Focusable="False" |
|
|
|
IsChecked="{Binding $parent[TextBox].RevealPassword, Mode=TwoWay}" |
|
|
|
Theme="{StaticResource SimplePasswordBoxRevealButtonTheme}" /> |
|
|
|
Theme="{StaticResource SimplePasswordBoxRevealButtonTheme}" |
|
|
|
ClipToBounds="True" /> |
|
|
|
</Panel> |
|
|
|
</Template> |
|
|
|
</Setter> |
|
|
|
|