Fix layout

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

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/WalletWasabi.Fluent/Behaviors/CheckMarkVisibilityBehavior.cs b/WalletWasabi.Fluent/Behaviors/CheckMarkVisibilityBehavior.cs
@@ -38,11 +38,9 @@ protected override void OnAttachedToVisualTree(CompositeDisposable disposable)
 				{
 					if (AssociatedObject is { })
 					{
-						AssociatedObject.Opacity =
+						AssociatedObject.IsVisible =
 							!DataValidationErrors.GetHasErrors(ownerTextBox) &&
-							!string.IsNullOrEmpty(ownerTextBox.Text)
-								? 1
-								: 0;
+							!string.IsNullOrEmpty(ownerTextBox.Text);
 					}
 				})
 			.DisposeWith(disposable);

diff --git a/WalletWasabi.Fluent/Controls/TextBox.axaml b/WalletWasabi.Fluent/Controls/TextBox.axaml
@@ -32,7 +32,7 @@
 
             <Border
               Margin="{TemplateBinding BorderThickness}">
-              <Grid ColumnDefinitions="Auto,*,Auto,Auto">
+              <Grid ColumnDefinitions="Auto,*,Auto">
                 <ContentPresenter Grid.Column="0" Grid.ColumnSpan="1" Content="{TemplateBinding InnerLeftContent}" />
                 <DockPanel x:Name="PART_InnerDockPanel" Grid.Column="1" Grid.ColumnSpan="1" Margin="{TemplateBinding Padding}">
                   <TextBlock Name="PART_FloatingWatermark"
@@ -76,12 +76,14 @@
                     </ScrollViewer.Styles>
                   </ScrollViewer>
                 </DockPanel>
-                <ContentPresenter Grid.Column="2" Grid.ColumnSpan="1" Content="{TemplateBinding InnerRightContent}" />
-                <PathIcon Grid.Column="3" Classes="checkMark checkMarkDataValidation" Margin="15  0" VerticalAlignment="Center" DockPanel.Dock="Right">
-                  <Interaction.Behaviors>
-                    <CheckMarkVisibilityBehavior />
-                  </Interaction.Behaviors>
-                </PathIcon>
+                <StackPanel Grid.Column="2" Orientation="Horizontal" Spacing="10">
+                    <PathIcon Classes="checkMark checkMarkDataValidation" VerticalAlignment="Center">
+                      <Interaction.Behaviors>
+                        <CheckMarkVisibilityBehavior />
+                      </Interaction.Behaviors>
+                    </PathIcon>
+                    <ContentPresenter Content="{TemplateBinding InnerRightContent}" />
+                  </StackPanel>
               </Grid>
             </Border>
           </Panel>