Browse Source

Merge branch 'master' into fixes/tapped-gestures

pull/9360/head
Max Katz 3 years ago
committed by GitHub
parent
commit
682ea628bf
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
  2. 6
      src/Avalonia.Themes.Simple/Controls/TextBox.xaml

6
src/Avalonia.Themes.Fluent/Controls/TextBox.xaml

@ -235,7 +235,8 @@
<Setter Property="InnerRightContent"> <Setter Property="InnerRightContent">
<Template> <Template>
<ToggleButton Theme="{StaticResource FluentTextBoxToggleButton}" <ToggleButton Theme="{StaticResource FluentTextBoxToggleButton}"
IsChecked="{Binding $parent[TextBox].RevealPassword, Mode=TwoWay}"> IsChecked="{Binding $parent[TextBox].RevealPassword, Mode=TwoWay}"
ClipToBounds="True">
<Panel> <Panel>
<PathIcon Data="{StaticResource PasswordBoxRevealButtonData}" <PathIcon Data="{StaticResource PasswordBoxRevealButtonData}"
Height="8" Width="12" Height="8" Width="12"
@ -253,7 +254,8 @@
<Setter Property="InnerRightContent"> <Setter Property="InnerRightContent">
<Template> <Template>
<Button Theme="{StaticResource FluentTextBoxButton}" <Button Theme="{StaticResource FluentTextBoxButton}"
Command="{Binding $parent[TextBox].Clear}"> Command="{Binding $parent[TextBox].Clear}"
ClipToBounds="True">
<PathIcon Data="{StaticResource TextBoxClearButtonData}" Height="10" Width="10"/> <PathIcon Data="{StaticResource TextBoxClearButtonData}" Height="10" Width="10"/>
</Button> </Button>
</Template> </Template>

6
src/Avalonia.Themes.Simple/Controls/TextBox.xaml

@ -192,7 +192,8 @@
<Template> <Template>
<Button Command="{Binding $parent[TextBox].Clear}" <Button Command="{Binding $parent[TextBox].Clear}"
Focusable="False" Focusable="False"
Theme="{StaticResource SimpleTextBoxClearButtonTheme}" /> Theme="{StaticResource SimpleTextBoxClearButtonTheme}"
ClipToBounds="True" />
</Template> </Template>
</Setter> </Setter>
</Style> </Style>
@ -212,7 +213,8 @@
<ToggleButton Background="Transparent" <ToggleButton Background="Transparent"
Focusable="False" Focusable="False"
IsChecked="{Binding $parent[TextBox].RevealPassword, Mode=TwoWay}" IsChecked="{Binding $parent[TextBox].RevealPassword, Mode=TwoWay}"
Theme="{StaticResource SimplePasswordBoxRevealButtonTheme}" /> Theme="{StaticResource SimplePasswordBoxRevealButtonTheme}"
ClipToBounds="True" />
</Panel> </Panel>
</Template> </Template>
</Setter> </Setter>

Loading…
Cancel
Save