Add a ContentArea control to provide consistent margins and spacing of content area and dialogs.
MODIFY
WalletWasabi.Fluent/Controls/ContentArea.axaml
WalletWasabi.Fluent/Controls/ContentArea.axaml
Width="400" Height="200"
Title="Add a Wallet"
Caption="Type in your Wallets name and select an option below:">
+ This is the content.
</c:ContentArea>
</Panel>
</Design.PreviewWith>
<Style Selector="c|ContentArea">
<Setter Property="Template">
<ControlTemplate>
- <DockPanel>
- <StackPanel DockPanel.Dock="Top">
+ <DockPanel Margin="20 36 20 0">
+ <StackPanel DockPanel.Dock="Top" Spacing="10" Margin="0 0 0 40">
<ContentPresenter Name="PART_TitlePresenter" Content="{TemplateBinding Title}" />
<ContentPresenter Name="PART_CaptionPresenter" Content="{TemplateBinding Caption}" />
</StackPanel>

MODIFY
WalletWasabi.Fluent/Views/Dialogs/TestDialogView.axaml
WalletWasabi.Fluent/Views/Dialogs/TestDialogView.axaml
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:c="clr-namespace:WalletWasabi.Fluent.Controls"
mc:Ignorable="d" Width="450" Height="200"
x:Class="WalletWasabi.Fluent.Views.Dialogs.TestDialogView">
- <Panel Margin="10">
- <Button Classes="invisible" Command="{Binding Close}" HorizontalAlignment="Left" VerticalAlignment="Top">
- <PathIcon Data="{StaticResource arrow_left_regular}" />
- </Button>
- <StackPanel HorizontalAlignment="Center"
- VerticalAlignment="Center">
- <TextBlock Text="Hi, I'm a dialog!" />
- </StackPanel>
- </Panel>
+ <c:ContentArea Title="Test Dialog" Caption="A quick example of a dialog:">
+ Hi! I'm a dialog.
+ </c:ContentArea>
</UserControl>

MODIFY
WalletWasabi.Fluent/Views/HomePageView.axaml
WalletWasabi.Fluent/Views/HomePageView.axaml
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:c="clr-namespace:WalletWasabi.Fluent.Controls"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="WalletWasabi.Fluent.Views.HomePageView">
+ <c:ContentArea Title="Home" Caption="Select a Wallet below to continue or create a new one:">
<StackPanel HorizontalAlignment="Center"
VerticalAlignment="Center">
<TextBlock Text="Hi, I'm the first view!" />
<TextBlock Text="{Binding UrlPathSegment}" />
</StackPanel>
+ </c:ContentArea>
</UserControl>

MODIFY
WalletWasabi.Fluent/Views/MainView.axaml
WalletWasabi.Fluent/Views/MainView.axaml
<local:StatusBar DockPanel.Dock="Bottom" DataContext="{Binding StatusBar}" VerticalAlignment="Bottom" Height="32" TextBlock.FontSize="12" />
<Panel>
<Border Background="{DynamicResource RegionColor}" BoxShadow="{DynamicResource BoxShadow}" IsHitTestVisible="False" />
- <DockPanel Margin="20 10 20 0">
- <TextBlock Text="{Binding NavBar.SelectedItem.Title}" DockPanel.Dock="Top" FontSize="28" IsHitTestVisible="False" Margin="0 22 0 0" />
<rxui:RoutedViewHost Router="{Binding Router}">
<rxui:RoutedViewHost.ViewLocator>
<vl:ScreenViewLocator />
VerticalAlignment="Center" />
</rxui:RoutedViewHost.DefaultContent>
</rxui:RoutedViewHost>
- </DockPanel>
</Panel>
</DockPanel>
</Panel>

MODIFY
WalletWasabi.Fluent/Views/SettingsPageView.axaml
WalletWasabi.Fluent/Views/SettingsPageView.axaml
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:c="clr-namespace:WalletWasabi.Fluent.Controls"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="WalletWasabi.Fluent.Views.SettingsPageView">
+ <c:ContentArea Title="Settings" Caption="Some development settings:">
<StackPanel Spacing="10">
- <TextBlock Text="Settings" FontSize="22" VerticalAlignment="Center" HorizontalAlignment="Center" />
<Button Command="{Binding NextCommand}" Content="Next" />
<Button Command="{Binding OpenDialogCommand}" Content="Open Dialog" />
<Button Command="{Binding ChangeThemeCommand}" Content="Change Theme" />
<TextBox Watermark="Type here... #2"/>
<TextBox Watermark="Type here... #3" Text="{Binding RandomString}"/>
</StackPanel>
+ </c:ContentArea>
</UserControl>

Add a ContentArea control to provide consistent margins and spacing of content area and dialogs.