From a46d133006948559a7a4922fd7b6de3ab697eb2f Mon Sep 17 00:00:00 2001
From: Steve Sharp <steve@bitbaboon.net>
Date: Wed, 1 Feb 2023 21:34:17 +0000
Subject: [PATCH] updated overlay size updated defaults for deltas moved
 overlay config

---
 SMT/MapConfig.cs     |  2 +-
 SMT/Overlay.xaml     | 10 +++----
 SMT/Preferences.xaml | 67 ++++++++++++++++++++++----------------------
 3 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/SMT/MapConfig.cs b/SMT/MapConfig.cs
index e16fdc17..5cdbe1f5 100644
--- a/SMT/MapConfig.cs
+++ b/SMT/MapConfig.cs
@@ -41,7 +41,7 @@ public class MapConfig : INotifyPropertyChanged
         private bool m_ShowJoveObservatories;
         private bool m_ShowNegativeRattingDelta;
 
-        private bool m_ShowRattingDataAsDelta;
+        private bool m_ShowRattingDataAsDelta = true;
 
         private bool m_ShowRegionStandings;
         private bool m_ShowSimpleSecurityView;
diff --git a/SMT/Overlay.xaml b/SMT/Overlay.xaml
index c7965d1a..00fb597c 100644
--- a/SMT/Overlay.xaml
+++ b/SMT/Overlay.xaml
@@ -15,19 +15,19 @@
     </Window.Background>
     <Grid>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="30px"/>
+            <ColumnDefinition Width="20px"/>
             <ColumnDefinition Width="*"/>
-            <ColumnDefinition Width="30px"/>
+            <ColumnDefinition Width="20px"/>
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
-            <RowDefinition Height="30"/>
+            <RowDefinition Height="20"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
-        <TextBlock Grid.Column="1" Grid.Row="0"  Background="Transparent" Name="overlay_CharNameTextblock" HorizontalAlignment="Center" TextAlignment="Center" FontSize="12" Opacity="0.5" Margin="1" Foreground="White"/>
+        <TextBlock Grid.Column="1" Grid.Row="0" Grid.RowSpan="2"  Background="Transparent" Name="overlay_CharNameTextblock" HorizontalAlignment="Center" TextAlignment="Center" FontSize="16" Opacity="0.5" Margin="1" Foreground="White"/>
         <Button Grid.Column="0" Grid.Row="0" PreviewMouseDown="Overlay_Window_Move" Opacity="0.5" ToolTip="Drag to move the overlay window." BorderThickness="0">
             <Image Source="/Images/overlay_move.png" Stretch="Fill"/>
         </Button>
-        <Button Grid.Column="2" Grid.Row="0" PreviewMouseDown="Overlay_Window_Close" Width="30" HorizontalAlignment="Right" Background="Transparent" Opacity="0.5" ToolTip="Click to close the overlay window." BorderThickness="0">
+        <Button Grid.Column="2" Grid.Row="0" PreviewMouseDown="Overlay_Window_Close" Width="20" HorizontalAlignment="Right" Background="Transparent" Opacity="0.5" ToolTip="Click to close the overlay window." BorderThickness="0">
             <Image Source="/Images/overlay_close.png" Stretch="Fill"/>
         </Button>
         <StackPanel Grid.Row="1" Grid.ColumnSpan="3" x:Name="overlay_CanvasContainer" >
diff --git a/SMT/Preferences.xaml b/SMT/Preferences.xaml
index f2a63219..a8cd452b 100644
--- a/SMT/Preferences.xaml
+++ b/SMT/Preferences.xaml
@@ -224,38 +224,6 @@
                         </StackPanel>
                     </Grid>
                 </TabItem>
-                <TabItem Header="Colours">
-                    <Grid Height="362">
-                        <ScrollViewer>
-                            <StackPanel>
-                                <xctk:PropertyGrid x:Name="ColoursPropertyGrid" AutoGenerateProperties="True" ShowSearchBox="False" ShowSortOptions="False">
-                                    <xctk:PropertyGrid.CategoryGroupHeaderTemplate>
-                                        <DataTemplate>
-                                            <TextBlock Text="{Binding}" Foreground="Black" />
-                                        </DataTemplate>
-                                    </xctk:PropertyGrid.CategoryGroupHeaderTemplate>
-                                </xctk:PropertyGrid>
-                                <Button x:Name="ResetColourData" Click="ResetColourData_Click" Content="Reset Colours" Margin="0,2" />
-                            </StackPanel>
-                        </ScrollViewer>
-                    </Grid>
-                </TabItem>
-                <TabItem Header="Debug">
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="50*" />
-                            <ColumnDefinition Width="50*" />
-                        </Grid.ColumnDefinitions>
-
-                        <StackPanel Grid.Column="0">
-                            <GroupBox Header="General" Margin="4" Height="355">
-                                <StackPanel>
-                                    <CheckBox IsChecked="{Binding Path=Debug_EnableMapEdit}" Margin="0,2">Enable Universe Map Edits</CheckBox>
-                                </StackPanel>
-                            </GroupBox>
-                        </StackPanel>
-                    </Grid>
-                </TabItem>
                 <TabItem Header="Overlay">
                     <Grid>
                         <Grid.ColumnDefinitions>
@@ -267,7 +235,7 @@
                             <GroupBox Header="General" Margin="4" Height="355">
                                 <StackPanel>
 
-                                
+
                                     <StackPanel Orientation="Vertical" Margin="0,2">
                                         <Label Content="Overlay Jump Range" />
                                         <Slider x:Name="overlay_RangeSlider" Value="{Binding Path=OverlayRange}" Minimum="1" Maximum="10" TickFrequency="1" TickPlacement="BottomRight" IsMoveToPointEnabled="True" />
@@ -292,6 +260,39 @@
                         </StackPanel>
                     </Grid>
                 </TabItem>
+
+                <TabItem Header="Colours">
+                    <Grid Height="362">
+                        <ScrollViewer>
+                            <StackPanel>
+                                <xctk:PropertyGrid x:Name="ColoursPropertyGrid" AutoGenerateProperties="True" ShowSearchBox="False" ShowSortOptions="False">
+                                    <xctk:PropertyGrid.CategoryGroupHeaderTemplate>
+                                        <DataTemplate>
+                                            <TextBlock Text="{Binding}" Foreground="Black" />
+                                        </DataTemplate>
+                                    </xctk:PropertyGrid.CategoryGroupHeaderTemplate>
+                                </xctk:PropertyGrid>
+                                <Button x:Name="ResetColourData" Click="ResetColourData_Click" Content="Reset Colours" Margin="0,2" />
+                            </StackPanel>
+                        </ScrollViewer>
+                    </Grid>
+                </TabItem>
+                <TabItem Header="Debug">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="50*" />
+                            <ColumnDefinition Width="50*" />
+                        </Grid.ColumnDefinitions>
+
+                        <StackPanel Grid.Column="0">
+                            <GroupBox Header="General" Margin="4" Height="355">
+                                <StackPanel>
+                                    <CheckBox IsChecked="{Binding Path=Debug_EnableMapEdit}" Margin="0,2">Enable Universe Map Edits</CheckBox>
+                                </StackPanel>
+                            </GroupBox>
+                        </StackPanel>
+                    </Grid>
+                </TabItem>
             </TabControl>
             <StackPanel Orientation="Horizontal" DockPanel.Dock="Bottom" Height="20" VerticalAlignment="Bottom" HorizontalAlignment="Right" Margin="0,2">
                 <Button Content="Default" Margin="3,0" Width="55" Click="Prefs_Default_Click" />