Improve layout of title bar
MODIFY
WalletWasabi.Fluent/Views/SearchBar/SearchBar.axaml
WalletWasabi.Fluent/Views/SearchBar/SearchBar.axaml
</UserControl.Styles>
<TextBox x:Name="SearchBox" Watermark="Search settings / advanced features" MaxLength="50" HorizontalAlignment="Left"
- Text="{Binding SearchText, Mode=TwoWay}" Width="400" VerticalAlignment="Center">
+ Text="{Binding SearchText, Mode=TwoWay}" VerticalAlignment="Center">
<i:Interaction.Behaviors>
<behaviors:TextBoxAutoSelectTextBehavior />

MODIFY
WalletWasabi.Fluent/Views/Shell/MainView.axaml
WalletWasabi.Fluent/Views/Shell/MainView.axaml
x:Class="WalletWasabi.Fluent.Views.Shell.MainView"
x:DataType="viewModels:MainViewModel"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- d:DesignWidth="1200" d:DesignHeight="1000"
+ d:DesignWidth="1400" d:DesignHeight="1000"
x:CompileBindings="True">
- <Grid ColumnDefinitions="68, *, 150" RowDefinitions="48, *">
+ <Grid ShowGridLines="True" RowDefinitions="48, *">
+
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="68" />
+ <ColumnDefinition Width="10*" />
+ <ColumnDefinition Width="35*" MinWidth="200" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="150" />
+ </Grid.ColumnDefinitions>
- <Panel Grid.Row="0" Grid.Column="{ext:Platform 0, Osx=1}" Grid.ColumnSpan="{ext:Platform 2, Osx=1}" TextBlock.Foreground="{DynamicResource NavBarItemForegroundBrush}">
- <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="20 0 0 0">
<Viewbox Height="18" Width="18" IsHitTestVisible="False">
<Image Source="{DynamicResource wasabi_logo_dynamic}" />
</Viewbox>
- <TextBlock Foreground="{DynamicResource AcrylicTrimForeground}" Classes="h8" VerticalAlignment="Center" Text="Wasabi Wallet" Margin="20 0 0 0" IsHitTestVisible="False" />
- <TextBlock Foreground="{DynamicResource AcrylicTrimForeground}" Classes="h8" VerticalAlignment="Center" Opacity="0.6" Text="TESTNET PREVIEW" IsHitTestVisible="False" Margin="5 0 0 0" />
- </StackPanel>
- </Panel>
- <statusBar:StatusBar Grid.Column="{ext:Platform 1, Osx=2}" Margin="0 0 5 0" Foreground="{DynamicResource AcrylicTrimForeground}" DataContext="{Binding StatusBar}" HorizontalAlignment="Right" VerticalAlignment="Center" />
+ <WrapPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
+ <WrapPanel.Styles>
+ <Style Selector="TextBlock">
+ <Setter Property="Margin" Value="3 0" />
+ <Setter Property="VerticalAlignment" Value="Center" />
+ </Style>
+ </WrapPanel.Styles>
+ <TextBlock Foreground="{DynamicResource AcrylicTrimForeground}" Classes="h8" Text="Wasabi Wallet" />
+ <TextBlock Foreground="{DynamicResource AcrylicTrimForeground}" Classes="h8" Opacity="0.6" Text="TESTNET PREVIEW" />
+ </WrapPanel>
<navbar:NavBar Grid.Row="1" Grid.Column="0" DataContext="{Binding NavBar}" />
- <Border Grid.Row="1" Grid.Column="1" BorderBrush="{DynamicResource TileBorderColor}" BorderThickness="1 1 0 0" Grid.ColumnSpan="2" CornerRadius="10 0 0 0" ClipToBounds="True">
+ <Border x:Name="ContentPart" Grid.Row="1" Grid.Column="1" BorderBrush="{DynamicResource TileBorderColor}" BorderThickness="1 1 0 0" Grid.ColumnSpan="3" CornerRadius="10 0 0 0" ClipToBounds="True">
<Panel>
<Border CornerRadius="10 0 0 0" Background="{DynamicResource RegionColor}" ClipToBounds="True" IsHitTestVisible="False" />
<Panel VerticalAlignment="Bottom"
</Panel>
</Border>
- <searchBar:SearchBar DataContext="{Binding SearchBar}" Width="400" VerticalAlignment="Stretch"
- Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="2" />
+ <searchBar:SearchBar DataContext="{Binding SearchBar}" VerticalAlignment="Stretch" HorizontalAlignment="Center"
+ Grid.Row="0" Grid.Column="2" />
+ <statusBar:StatusBar Grid.Column="{ext:Platform 2, Osx=3}" Margin="0 0 5 0" Foreground="{DynamicResource AcrylicTrimForeground}" DataContext="{Binding StatusBar}" HorizontalAlignment="Right" VerticalAlignment="Center" />
</Grid>
</UserControl>

MODIFY
WalletWasabi.Fluent/Views/StatusBar/StatusBar.axaml
WalletWasabi.Fluent/Views/StatusBar/StatusBar.axaml
</Flyout>
</FlyoutBase.AttachedFlyout>
- <!-- Update available -->
+ <!-- Update available --><!--
<StackPanel Spacing="10" Orientation="Horizontal" VerticalAlignment="Center" Margin="10 0"
IsVisible="{Binding CurrentState, Converter={x:Static converters:StatusBarStateVisibilityConverter.Instance}, ConverterParameter={x:Static models:StatusBarState.UpdateAvailable}}">
<TextBlock Text="Update available" VerticalAlignment="Center" FontSize="14" Foreground="Goldenrod" />
<PathIcon Data="{StaticResource arrow_clockwise_with_elipse}"
Foreground="Goldenrod"
Height="30" />
- </StackPanel>
+ </StackPanel>-->
- <!-- Critical update available -->
+ <!-- Critical update available --><!--
<StackPanel Spacing="10" Orientation="Horizontal" VerticalAlignment="Center" Margin="10 0"
IsVisible="{Binding CurrentState, Converter={x:Static converters:StatusBarStateVisibilityConverter.Instance}, ConverterParameter={x:Static models:StatusBarState.CriticalUpdateAvailable}}">
<TextBlock Text="Critical update available" VerticalAlignment="Center" FontSize="14" Foreground="IndianRed" />
<PathIcon Data="{StaticResource critical_update}"
Foreground="{DynamicResource SystemErrorTextColor}"
Height="30" />
- </StackPanel>
+ </StackPanel>-->
<!-- Ready -->
<PathIcon Data="{StaticResource checkmark_circle_filled}"

Improve layout of title bar