closes #62 and issues causing #58

R2NorthstarTools · Jan 20, 2024 · 9366a9f · 9366a9f
1 parent fc9d885
commit 9366a9f
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/...f6573e4-c734-4c30-a098-8c9474e1899d.vsidx → ...949b3b1-bcff-404b-a338-ee80a1104051.vsidx b/...f6573e4-c734-4c30-a098-8c9474e1899d.vsidx → ...949b3b1-bcff-404b-a338-ee80a1104051.vsidx
diff --git a/...3e7d992-618e-4968-af02-6c32d9b60813.vsidx → ...67927e4-459e-4dcb-95eb-e32063b0b384.vsidx b/...3e7d992-618e-4968-af02-6c32d9b60813.vsidx → ...67927e4-459e-4dcb-95eb-e32063b0b384.vsidx
diff --git a/...3075c83-2184-4426-8990-819fac5a54e8.vsidx → ...db20e81-24e0-4dfe-b0bd-1fbd57152227.vsidx b/...3075c83-2184-4426-8990-819fac5a54e8.vsidx → ...db20e81-24e0-4dfe-b0bd-1fbd57152227.vsidx
diff --git a/...fbf181a-ded0-44f8-89b1-1b68d5c7532f.vsidx → ...7986601-743d-46d2-822b-1db562d4695a.vsidx b/...fbf181a-ded0-44f8-89b1-1b68d5c7532f.vsidx → ...7986601-743d-46d2-822b-1db562d4695a.vsidx
diff --git a/VTOL_2.0.0/MainWindow.xaml b/VTOL_2.0.0/MainWindow.xaml
@@ -18,8 +18,9 @@
         SnapsToDevicePixels="True"
         RenderOptions.ClearTypeHint="Enabled"
         mc:Ignorable="d"
+        SizeToContent="WidthAndHeight"
 
-        Title="MainWindow" Height="700" Width="1201" ResizeMode="CanMinimize" WindowStartupLocation="CenterScreen" WindowStyle="None" AllowsTransparency="True" AllowDrop="True" GotFocus="Main_Win_Control_GotFocus" LostFocus="Main_Win_Control_LostFocus" Deactivated="Main_Win_Control_Deactivated" Activated="Main_Win_Control_Activated" Closed="Main_Win_Control_Closed" StateChanged="Main_Win_Control_StateChanged" Loaded="Main_Win_Control_Loaded" Closing="Main_Win_Control_Closing" BorderBrush="#B27F7F7F" BorderThickness="1,1,1,1"  
+        Title="MainWindow" ResizeMode="CanMinimize" WindowStartupLocation="CenterScreen" WindowStyle="None" AllowsTransparency="True" AllowDrop="True" GotFocus="Main_Win_Control_GotFocus" LostFocus="Main_Win_Control_LostFocus" Deactivated="Main_Win_Control_Deactivated" Activated="Main_Win_Control_Activated" Closed="Main_Win_Control_Closed" StateChanged="Main_Win_Control_StateChanged" Loaded="Main_Win_Control_Loaded" Closing="Main_Win_Control_Closing" BorderBrush="#B27F7F7F" BorderThickness="1,1,1,1"  
 
         >
 
@@ -28,14 +29,14 @@
             <DoubleAnimation Storyboard.TargetProperty="Opacity" From="0" To="1" Duration="0:0:1" AutoReverse="True" RepeatBehavior="Forever"/>
         </Storyboard>
         <SolidColorBrush x:Key="Button_HOVER" Color="#FF2C4C4C" />
+        <ScaleTransform x:Key="windowScaleTransform" ScaleX="0.5" ScaleY="0.5" />
 
         <Style TargetType="Image">
 
             <Setter Property="RenderOptions.BitmapScalingMode" Value="HighQuality" />
         </Style>
 
 
-
         <ControlTemplate x:Key="ButtonControlTemplate1" TargetType="{x:Type Button}">
             <Border x:Name="border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" CornerRadius="20">
                 <ContentPresenter x:Name="contentPresenter" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" ContentStringFormat="{TemplateBinding ContentStringFormat}" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
@@ -115,6 +116,7 @@
 
         x:Name="RootMainGrid"
         Grid.Row="1"
+        Height="700" Width="1201" 
         Margin="0" AllowDrop="False">
 
         <Grid.ColumnDefinitions>
@@ -356,9 +358,9 @@
 
 
         <Grid xf:Animations.Primary="{StaticResource FadeIn}"
-            Margin="0,7,2,663" ScrollViewer.VerticalScrollBarVisibility="Disabled" Grid.ColumnSpan="2" AllowDrop="False" >
+            Margin="0,7,2,663" ScrollViewer.VerticalScrollBarVisibility="Disabled" Grid.ColumnSpan="2" AllowDrop="False" HorizontalAlignment="Center" >
 
-            <StatusBar Margin="0,0,554,0" Background="Transparent" BorderThickness="0,0,0,0" HorizontalAlignment="Right" Width="644" Padding="0,0,0,0">
+            <StatusBar Margin="0,0,554,0" Background="Transparent" BorderThickness="0,0,0,0" HorizontalAlignment="Center" Width="644" Padding="0,0,0,0">
                 <StatusBarItem Margin="-24,-11,0,-11" Width="598">
                     <StackPanel Orientation="Horizontal" Width="514" Height="30" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,0,0,0">