From 23cb6c012463769ae17117a248bfcdf8e4bd9159 Mon Sep 17 00:00:00 2001
From: MRmlik12 <contact@dolczyk.rocks>
Date: Sat, 25 May 2024 14:12:45 +0200
Subject: [PATCH] Fix toolbar components alignment

---
 src/NoteSHR/Views/BoardToolbar.axaml | 26 ++++++++++++++++----------
 src/NoteSHR/Views/BoardView.axaml    | 10 +++++-----
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/src/NoteSHR/Views/BoardToolbar.axaml b/src/NoteSHR/Views/BoardToolbar.axaml
index 3b1b230..c1c59e9 100644
--- a/src/NoteSHR/Views/BoardToolbar.axaml
+++ b/src/NoteSHR/Views/BoardToolbar.axaml
@@ -5,7 +5,7 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="NoteSHR.Views.BoardToolbar">
 
-    <DockPanel Background="Transparent">
+    <DockPanel Background="White">
         <DockPanel.Styles>
             <Style Selector="TextBox:pointerover">
                 <Setter Property="Background" Value="Transparent"/>
@@ -17,15 +17,21 @@
                 <Setter Property="BorderThickness" Value="0" />
             </Style> 
         </DockPanel.Styles>
-        <TextBox Foreground="Black" Background="Transparent" FontSize="24" Width="600" x:Name="BoardNameTextBox" />
-        <Button DockPanel.Dock="Right" x:Name="ExportBoardButton" Click="ExportBoardButton_OnClick"
-                Background="Transparent" Foreground="GhostWhite">
-            <Svg Path="/Assets/Icons/save-outline.svg" Width="32" Height="32" />
-        </Button>
-        <Button DockPanel.Dock="Right" x:Name="ImportBoardButton" Click="ImportBoardButton_OnClick"
-                Background="Transparent" Foreground="GhostWhite">
-            <Svg Path="/Assets/Icons/download-outline.svg" Width="32" Height="32" />
-        </Button>
+        <StackPanel>
+            <TextBox DockPanel.Dock="Left" Foreground="Black" Background="Transparent" FontSize="24" Width="600" x:Name="BoardNameTextBox" />
+        </StackPanel>
+        <StackPanel HorizontalAlignment="Right" VerticalAlignment="Center" Orientation="Horizontal">
+            <Button DockPanel.Dock="Right" x:Name="ImportBoardButton" Click="ImportBoardButton_OnClick"
+                            Background="Transparent" Foreground="GhostWhite" HorizontalAlignment="Right"
+                            Cursor="Hand">
+                <Svg Path="/Assets/Icons/download-outline.svg" Width="32" Height="32" />
+            </Button>
+            <Button x:Name="ExportBoardButton" Click="ExportBoardButton_OnClick"
+                    Background="Transparent" Foreground="GhostWhite" HorizontalAlignment="Right"
+                    Cursor="Hand">
+                <Svg Path="/Assets/Icons/save-outline.svg" Width="32" Height="32" />
+            </Button>
+        </StackPanel>
     </DockPanel>
     
 </UserControl>
\ No newline at end of file
diff --git a/src/NoteSHR/Views/BoardView.axaml b/src/NoteSHR/Views/BoardView.axaml
index af179a4..1df3dba 100644
--- a/src/NoteSHR/Views/BoardView.axaml
+++ b/src/NoteSHR/Views/BoardView.axaml
@@ -24,8 +24,8 @@
         <converters:ColorToHexConverter x:Key="ColorToHexConverter" />
     </UserControl.Resources>
 
-    <DockPanel>
-        <Canvas ZIndex="1000" HorizontalAlignment="Stretch">
+    <Grid RowDefinitions="Auto, 100*">
+        <Grid Grid.Row="0" ZIndex="1000" HorizontalAlignment="Stretch">
             <views:BoardToolbar Width="NaN" BoardName="{Binding Name}" HorizontalAlignment="Stretch">
                 <i:Interaction.Behaviors>
                     <ia:EventTriggerBehavior EventName="ExportBoard">
@@ -36,9 +36,9 @@
                     </ia:EventTriggerBehavior>
                 </i:Interaction.Behaviors>
             </views:BoardToolbar>
-        </Canvas>
+        </Grid>
 
-        <paz:ZoomBorder Name="ZoomBorder" Stretch="Fill" ZoomSpeed="1.2"
+        <paz:ZoomBorder Grid.Row="1" Name="ZoomBorder" Stretch="Fill" ZoomSpeed="1.2"
                         ClipToBounds="True" Focusable="True">
             <ItemsControl x:Name="NoteItemsControl" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
                 <ItemsControl.ItemsPanel>
@@ -155,5 +155,5 @@
                 </ItemsControl.ItemContainerTheme>
             </ItemsControl>
         </paz:ZoomBorder>
-    </DockPanel>
+    </Grid>
 </UserControl>
\ No newline at end of file