- History Tab - Column headers aligned

- Status bar height should be increased - Increase distance of Wasabi Icon on the left upper and File menuitem
zkSNACKs · Nov 18, 2018 · 0b374a9 · 0b374a9
1 parent c162070
commit 0b374a9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/WalletWasabi.Gui/Controls/StatusBar.xaml b/WalletWasabi.Gui/Controls/StatusBar.xaml
@@ -2,7 +2,8 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:behaviors="clr-namespace:WalletWasabi.Gui.Behaviors;assembly=WalletWasabi.Gui"
              xmlns:i="clr-namespace:Avalonia.Xaml.Interactivity;assembly=Avalonia.Xaml.Interactivity"
-             xmlns:converters="clr-namespace:WalletWasabi.Gui.Converters;assembly=WalletWasabi.Gui">
+             xmlns:converters="clr-namespace:WalletWasabi.Gui.Converters;assembly=WalletWasabi.Gui" 
+             Height="25">
   <UserControl.Resources>
     <converters:FilterLeftValueConverter x:Key="FilterLeftValueConverter" />
     <converters:StatusColorConverter x:Key="StatusColorConverter" />
@@ -15,7 +16,7 @@
     <i:Interaction.Behaviors>
       <behaviors:CommandOnClickBehavior Command="{Binding UpdateCommand}" />
     </i:Interaction.Behaviors>
-    <DockPanel LastChildFill="True" Margin="10 0">
+    <DockPanel LastChildFill="True" Margin="10 0" VerticalAlignment="Center"  >
       <StackPanel Orientation="Horizontal" Spacing="20" DockPanel.Dock="Right">
 
         <StackPanel Orientation="Horizontal" Spacing="4" IsVisible="{Binding !CriticalUpdateAvailable}">

diff --git a/WalletWasabi.Gui/Controls/WalletExplorer/HistoryTabView.xaml b/WalletWasabi.Gui/Controls/WalletExplorer/HistoryTabView.xaml
@@ -25,7 +25,7 @@
           </Grid>
         </Grid>
         <DockPanel LastChildFill="True" DockPanel.Dock="Bottom">
-          <Grid ColumnDefinitions="40, 160, 100, *" Margin="5 0" DockPanel.Dock="Top">
+          <Grid ColumnDefinitions="40, 160, 100, *" Margin="10 0" DockPanel.Dock="Top">
             <TextBlock Text="" />
             <TextBlock Text="Date" Grid.Column="1" />
             <TextBlock Text="Amount (BTC)" Grid.Column="2" />

diff --git a/WalletWasabi.Gui/MainWindow.xaml b/WalletWasabi.Gui/MainWindow.xaml
@@ -24,7 +24,7 @@
   </i:Interaction.Behaviors>
   <cont:MetroWindow.TitleBarContent>
   </cont:MetroWindow.TitleBarContent>
-  <Grid>
+  <Grid Margin="0,10,0,0">
     <DockPanel LastChildFill="True">
       <wasabi:StatusBar DockPanel.Dock="Bottom" DataContext="{Binding StatusBar}" />
       <shell:ShellView DataContext="{Binding Shell}" />