Tweak dialog margins and spacings.
MODIFY
WalletWasabi.Fluent/Controls/ContentArea.axaml
WalletWasabi.Fluent/Controls/ContentArea.axaml
<Setter Property="Template">
<ControlTemplate>
<DockPanel Margin="40,0,40,0">
- <StackPanel DockPanel.Dock="Top" Spacing="10" Margin="0 0 0 40">
+ <StackPanel DockPanel.Dock="Top" Spacing="10" Margin="0 0 0 32">
<DockPanel>
<Button Margin="-40,0,0,0" Classes="plain" Command="{Binding BackCommand}" IsVisible="{TemplateBinding EnableBack}">
<PathIcon Data="{StaticResource arrow_left_regular}" Width="16" />
</i:Interaction.Behaviors>
</Button>
</Panel>
+ <ScrollViewer HorizontalScrollBarVisibility="Disabled" Margin="0 0 0 32">
<ContentPresenter Name="PART_ContentPresenter"
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
Padding="{TemplateBinding Padding}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" />
+ </ScrollViewer>
</DockPanel>
</ControlTemplate>
</Setter>

MODIFY
WalletWasabi.Fluent/Controls/ContentArea.axaml.cs
WalletWasabi.Fluent/Controls/ContentArea.axaml.cs
@@ -115,6 +115,7 @@ namespace WalletWasabi.Fluent.Controls
_captionPresenter = presenter;
_captionPresenter.PropertyChanged += PresenterOnPropertyChanged;
+ _captionPresenter.IsVisible = Caption is { };
result = true;
break;
}
@@ -138,6 +139,10 @@ namespace WalletWasabi.Fluent.Controls
newValue.Classes.Add(className);
}
}
+ else if (e.Property == CaptionProperty && _captionPresenter is { })
+ {
+ _captionPresenter.IsVisible = e.NewValue is { };
+ }
}
}
}
\ No newline at end of file

MODIFY
WalletWasabi.Fluent/Controls/Dialog.xaml
WalletWasabi.Fluent/Controls/Dialog.xaml
<ControlTemplate>
<Panel>
<Panel Background="{DynamicResource DialogOverlayColor}" Name="PART_Overlay" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" />
- <Panel Name="PART_DialogHost" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="40">
+ <Panel Name="PART_DialogHost"
+ VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+ HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+ Margin="20">
<Border CornerRadius="4" BoxShadow="{DynamicResource DialogBoxShadow}"
Background="{DynamicResource DialogBackground}"
MaxWidth="{TemplateBinding MaxContentWidth}" MaxHeight="{TemplateBinding MaxContentHeight}" Margin="40">
- <ContentPresenter Name="PART_ContentPresenter" Margin="20 36 20 0"
+ <ContentPresenter Name="PART_ContentPresenter" Margin="16 28 16 16"
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"

MODIFY
WalletWasabi.Fluent/Views/AddWallet/LegalDocumentsView.axaml
WalletWasabi.Fluent/Views/AddWallet/LegalDocumentsView.axaml
<c:ContentArea Title="Terms and Conditions"
Caption="Please read the small print."
EnableNext="True" NextContent="Continue" FocusNext="True">
- <ScrollViewer HorizontalScrollBarVisibility="Disabled">
<TextBlock TextWrapping="Wrap" Text="{Binding Content}" />
- </ScrollViewer>
</c:ContentArea>
</UserControl>
\ No newline at end of file

MODIFY
WalletWasabi.Fluent/Views/AddWallet/TermsAndConditionsView.axaml
WalletWasabi.Fluent/Views/AddWallet/TermsAndConditionsView.axaml
<KeyBinding Gesture="Enter" Command="{Binding NextCommand}" />
</UserControl.KeyBindings>
<c:ContentArea Title="Welcome to Wasabi Wallet"
- EnableCancel="True"
+ EnableCancel="False"
EnableNext="True" NextContent="Continue" FocusNext="True">
<DockPanel>
- <CheckBox IsChecked="{Binding IsAgreed}" DockPanel.Dock="Bottom" Name="CheckBox_Agree">
+ <CheckBox Margin="0 10 0 0" IsChecked="{Binding IsAgreed}"
+ DockPanel.Dock="Bottom" Name="CheckBox_Agree"
+ HorizontalAlignment="Center">
<i:Interaction.Behaviors>
<behaviors:FocusOnAttachedBehavior />
</i:Interaction.Behaviors>
</Button>
</StackPanel>
</CheckBox>
- <Viewbox>
+ <Viewbox Height="300">
<Image>
<Image.Source>
<DrawingImage Drawing="{StaticResource placeholder_graphics_legal}"/>

MODIFY
WalletWasabi.Fluent/Views/Dialogs/EnterPasswordView.axaml
WalletWasabi.Fluent/Views/Dialogs/EnterPasswordView.axaml
Caption="{Binding Subtitle}"
EnableBack="True"
EnableCancel="True" CancelContent="Cancel"
- EnableNext="True" NextContent="Continue"
- Margin="0 0 0 20">
+ EnableNext="True" NextContent="Continue">
<StackPanel HorizontalAlignment="Stretch" Spacing="20">
<DockPanel>
<PathIcon Classes="checkMark" Margin="15 42 0 0" VerticalAlignment="Top" DockPanel.Dock="Right">

Tweak dialog margins and spacings.