From 2de986f5b805d175dbca8dc7ee0742d355035aef Mon Sep 17 00:00:00 2001
From: Natlinux81 <97396587+Natlinux81@users.noreply.github.com>
Date: Sat, 13 Aug 2022 13:51:03 +0200
Subject: [PATCH] clean up code ready for display modal

---
 Apollon.WPF/MainWindow.xaml         | 99 +++++++++++++----------------
 Apollon.WPF/Views/OverviewView.xaml | 77 ++++++++++++----------
 2 files changed, 86 insertions(+), 90 deletions(-)

diff --git a/Apollon.WPF/MainWindow.xaml b/Apollon.WPF/MainWindow.xaml
index 7491888..954819e 100644
--- a/Apollon.WPF/MainWindow.xaml
+++ b/Apollon.WPF/MainWindow.xaml
@@ -6,70 +6,57 @@
         xmlns:local="clr-namespace:Apollon.WPF" xmlns:views="clr-namespace:Apollon.WPF.Views"
         mc:Ignorable="d"
         Title="Apollon Auswertung Bogen"
-        Height="800"
-        Width="1120"
+        Height="680"
+        Width="1080"
         WindowStartupLocation="CenterScreen"
         Background="Transparent"
         AllowsTransparency="True"
         WindowStyle="None"
-        MouseDown="Window_MouseDown">
-    <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
+        ResizeMode="CanResizeWithGrip">
+    <ScrollViewer HorizontalScrollBarVisibility="Auto"
+                  VerticalScrollBarVisibility="Auto">
         <Grid>
             <Grid.RowDefinitions>
-                <RowDefinition Height="auto">
-
-                </RowDefinition>
-                <RowDefinition>
-
-                </RowDefinition>
+                <RowDefinition Height="auto"/>
+                <RowDefinition/>
             </Grid.RowDefinitions>
-            <views:OverviewView Grid.RowSpan="2" DataContext="{Binding OverviewViewModel}"/>
-        <Button Width="25"
-                Height="25"
-                Padding="-4"
-                Background="Transparent"
-                BorderBrush="Transparent"
-                Content="🗙"
-                FontSize="18"   
-                Foreground="#0000a0"                
-                VerticalContentAlignment="Center"
-                HorizontalContentAlignment="Center"
-                HorizontalAlignment="Right" Margin="0,2,24,8"                
-                Click="Button_Exit">
-          
-        </Button>
-        <Button Width="25"
-                Height="25"
-                Padding="-4"
-                BorderBrush="Transparent"
-                Content="☐"
-                FontSize="18" 
-                FontWeight="UltraBold"
-                Foreground="#0000a0"                
-                VerticalContentAlignment="Center"
-                HorizontalContentAlignment="Center"
-                HorizontalAlignment="Right" Margin="0,2,64,8"
-                Click="Button_Max" Background="#00000000"
+            
+            <views:OverviewView Grid.RowSpan="2"
+                                DataContext="{Binding OverviewViewModel}"
+                                MouseDown="Window_MouseDown"/>
+
+            <WrapPanel HorizontalAlignment="Right"
+                       Margin="0 0 5 0">
+
+                <Button Width="35"
+                        Height="35"                    
+                        Background="Transparent"
+                        BorderBrush="Transparent"
+                        Content="🗕"
+                        FontSize="18"   
+                        FontWeight="Bold"
+                        Foreground="#0000a0"
+                        Click="Button_Min"/>
+
+                <Button Width="35"
+                        Height="35"                    
+                        Background="Transparent"
+                        BorderBrush="Transparent"
+                        Content="☐"
+                        FontSize="18"   
+                        FontWeight="Bold"
+                        Foreground="#0000a0"
+                        Click="Button_Max"/>
                 
-                />
-
-        <Button Width="25"
-                Height="25"
-                Padding="-4"
-                Background="Transparent"
-                BorderBrush="Transparent"
-                Content="🗕"
-                FontSize="18"   
-                FontWeight="Bold"
-                Foreground="#0000a0"                
-                VerticalContentAlignment="Center"
-                HorizontalContentAlignment="Center"
-                HorizontalAlignment="Right" Margin="0,2,104,8"
-                Click="Button_Min"
-                ></Button>
+                <Button Width="35"
+                        Height="35"                    
+                        Background="Transparent"
+                        BorderBrush="Transparent"
+                        Content="🗙"
+                        FontSize="18"   
+                        Foreground="#0000a0"
+                        Click="Button_Exit"/>
+            </WrapPanel>
         </Grid>
-
     </ScrollViewer>
-
-
 </Window>
diff --git a/Apollon.WPF/Views/OverviewView.xaml b/Apollon.WPF/Views/OverviewView.xaml
index f9d992e..c1ae326 100644
--- a/Apollon.WPF/Views/OverviewView.xaml
+++ b/Apollon.WPF/Views/OverviewView.xaml
@@ -3,21 +3,28 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:Apollon.WPF.Views" xmlns:components="clr-namespace:Apollon.WPF.Views.Components"
+             xmlns:local="clr-namespace:Apollon.WPF.Views"
+             xmlns:components="clr-namespace:Apollon.WPF.Views.Components"
              mc:Ignorable="d" 
-             d:DesignHeight="800" d:DesignWidth="1120"
+             d:DesignHeight="680" d:DesignWidth="1080"
              Background="Transparent">
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="150"></RowDefinition>
-            <RowDefinition></RowDefinition>
+            <RowDefinition Height="150"/>
+            <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
+        
         <Grid.ColumnDefinitions>
-            <ColumnDefinition></ColumnDefinition>
-            <ColumnDefinition></ColumnDefinition>
-            <ColumnDefinition></ColumnDefinition>
+            <ColumnDefinition/>
+            <ColumnDefinition/>
+            <ColumnDefinition/>
         </Grid.ColumnDefinitions>
-        <Border CornerRadius="10" Grid.RowSpan="2" Grid.ColumnSpan="3">
+        
+        <Border BorderThickness="4"
+                BorderBrush="#0000a0"
+                CornerRadius="5"
+                Grid.RowSpan="2" 
+                Grid.ColumnSpan="3">
             <Border.Background>
                 <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
                     <GradientStop Color="#d7e8fd" Offset="0.2"/>
@@ -25,6 +32,7 @@
                 </LinearGradientBrush>
             </Border.Background>           
         </Border>
+        
         <StackPanel Grid.ColumnSpan="3">
             <TextBlock 
                    Text="Apollon"
@@ -70,40 +78,41 @@
 
         <StackPanel Grid.Column="1"
                     Grid.Row="1"
-                    VerticalAlignment="Center">
-            <TextBlock
-                   Margin="20"
-                   Text="Liste der erstellten Turniere"
-                   TextAlignment="Center"
-                   FontFamily="Arial"
-                   FontWeight="Bold"
-                   FontSize="16"
-                   Foreground="#0000a0">
-            </TextBlock>
+                    Margin="20">
+            
+            <TextBlock Margin="20"
+                       Text="Liste der erstellten Turniere"
+                       TextAlignment="Center"
+                       FontFamily="Arial"
+                       FontWeight="Bold"
+                       FontSize="16"
+                       Foreground="#0000a0"/>
+            
             <components:OverViewListing Height="400"
-                                               DataContext="{Binding OverviewListingViewModel}"/>
+                                        DataContext="{Binding OverviewListingViewModel}"/>
         </StackPanel>
         
         <StackPanel Grid.Column="2"
                     Grid.Row="1"
                     VerticalAlignment="Center">
-            <TextBlock
-                   Margin="20"
-                   Text="Turnieredetails"
-                   TextAlignment="Center"
-                   FontFamily="Arial"
-                   FontWeight="Bold"
-                   FontSize="16"
-                   Foreground="#0000a0"/>
+            
+            <TextBlock Margin="20"
+                       Text="Turnieredetails"
+                       TextAlignment="Center"
+                       FontFamily="Arial"
+                       FontWeight="Bold"
+                       FontSize="16"
+                       Foreground="#0000a0"/>
             <components:OverviewDetails Width="320"
-                                               DataContext="{Binding OverviewDetailsViewModel}"/>
+                                        DataContext="{Binding OverviewDetailsViewModel}"/>
+            
             <Button Style="{StaticResource ModernButton}"
-                Content="Turnier bearbeiten"
-                FontSize="16"
-                Height="40"
-                Width="210"
-                Margin="40"
-                Cursor="Hand"/>
+                    Content="Turnier bearbeiten"
+                    FontSize="16"
+                    Height="40"
+                    Width="210"
+                    Margin="40"
+                    Cursor="Hand"/>
         </StackPanel>       
               
     </Grid>