Fix validation checkmark always visible

Kukks · Jun 19, 2024 · a06381b · a06381b
1 parent 5ec5af5
commit a06381b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/WalletWasabi.Fluent/Controls/TextBox.axaml b/WalletWasabi.Fluent/Controls/TextBox.axaml
@@ -77,11 +77,13 @@
                   </ScrollViewer>
                 </DockPanel>
                 <StackPanel Grid.Column="2" Orientation="Horizontal" Spacing="10">
-                    <PathIcon Classes="checkMark checkMarkDataValidation" VerticalAlignment="Center">
+                  <Panel x:Name="CheckmarkHost">
+                    <PathIcon  Classes="checkMark" VerticalAlignment="Center">
                       <Interaction.Behaviors>
                         <CheckMarkVisibilityBehavior />
                       </Interaction.Behaviors>
                     </PathIcon>
+                  </Panel>
                     <ContentPresenter Content="{TemplateBinding InnerRightContent}" />
                   </StackPanel>
               </Grid>

diff --git a/WalletWasabi.Fluent/Styles/TextBox.axaml b/WalletWasabi.Fluent/Styles/TextBox.axaml
@@ -5,19 +5,11 @@
     <Setter Property="Theme" Value="{DynamicResource TextBoxTheme}" />
   </Style>
 
-  <Style Selector="TextBox:not(.hasCheckMark) /template/ PathIcon.checkMark.checkMarkDataValidation">
+  <Style Selector="TextBox:not(.hasCheckMark) /template/ Panel#CheckmarkHost">
     <Setter Property="IsVisible" Value="False" />
   </Style>
 
-  <Style Selector="TextBox.hasCheckMark /template/ PathIcon.checkMark.checkMarkDataValidation">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
-
-  <Style Selector="TextBox:not(.hasCheckMarkBoolean) /template/ PathIcon.checkMark.checkMarkBoolean">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-
-  <Style Selector="TextBox.hasCheckMarkBoolean /template/ PathIcon.checkMark.checkMarkBoolean">
+  <Style Selector="TextBox.hasCheckMark /template/ Panel#CheckmarkHost">
     <Setter Property="IsVisible" Value="True" />
   </Style>