From 9305c667d475710aa444010583c6ed5cb0974b4c Mon Sep 17 00:00:00 2001
From: Hamido-san <hamid.sadeghian@gmail.com>
Date: Tue, 1 Jan 2019 00:29:28 +0330
Subject: [PATCH 1/3] Added a ColorPicker to the toolbar to change the
 eye-searing white background. Default background color is #FF222222.

---
 TerraMap/MainWindow.xaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/TerraMap/MainWindow.xaml b/TerraMap/MainWindow.xaml
index c4cd36f..88fa415 100644
--- a/TerraMap/MainWindow.xaml
+++ b/TerraMap/MainWindow.xaml
@@ -443,6 +443,9 @@
         <Button Click="OnApplyBlockSelection" IsEnabled="{Binding IsLoading, Converter={StaticResource InvertedBooleanConverter}}" Content="Apply" />
         <Slider Minimum="0" Maximum="1" Value="{Binding MaskOpacity, UpdateSourceTrigger=PropertyChanged}" Width="100" SmallChange=".1" LargeChange=".2"
 						  ToolTip="Highlight Opacity" />
+        <Separator />
+        <TextBlock VerticalAlignment="Center" Padding="0,0,4,0">Background Color:</TextBlock>
+        <xctk:ColorPicker x:Name="colorPicker" ColorMode="ColorCanvas" Width="48" SelectedColor="#FF222222" />
       </ToolBar>
     </ToolBarTray>
     <StatusBar DockPanel.Dock="Bottom">
@@ -487,6 +490,9 @@
 
     <Grid>
       <ext:ZoomControl x:Name="zoomControl" ZoomControlsVisibility="Collapsed" MouseMove="OnZoomControlMouseMove" MouseRightButtonUp="OnZoomControlMouseRightButtonUp">
+        <ext:ZoomControl.Background>
+            <SolidColorBrush Color="{Binding SelectedColor, ElementName=colorPicker}"/>
+        </ext:ZoomControl.Background>
         <Grid x:Name="Grid">
           <Image x:Name="Map" Source="{Binding WriteableBitmap}"
 						 Stretch="Uniform" RenderOptions.BitmapScalingMode="NearestNeighbor" RenderOptions.EdgeMode="Aliased" />

From 932b009547a6924abb23346cf067b4fd2a7998a3 Mon Sep 17 00:00:00 2001
From: Hamido-san <hamid.sadeghian@gmail.com>
Date: Tue, 1 Jan 2019 02:40:12 +0330
Subject: [PATCH 2/3] Minor UI tweaks: MainWindow     When app starts, worlds
 list drop-down opens up.     In blocks popup fixed tab orders.     In blocks
 popup can now use tab key to enter AND leave the list. TileSelectionWindow   
  Fixed tab orders.     Can now use tab key to enter AND leave the list.

---
 TerraMap/MainWindow.xaml          | 15 ++++++++-------
 TerraMap/TileSelectionWindow.xaml | 15 ++++++++-------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/TerraMap/MainWindow.xaml b/TerraMap/MainWindow.xaml
index 88fa415..aaae832 100644
--- a/TerraMap/MainWindow.xaml
+++ b/TerraMap/MainWindow.xaml
@@ -268,7 +268,7 @@
       <ToolBar Band="0" BandIndex="0" Name="File"
 						IsEnabled="{Binding IsLoading, Converter={StaticResource InvertedBooleanConverter}}">
         <TextBlock VerticalAlignment="Center">Worlds:</TextBlock>
-        <ComboBox ItemsSource="{Binding WorldFiles}" SelectedItem="{Binding SelectedWorldFile}" 
+        <ComboBox x:Name="worldsList" ItemsSource="{Binding WorldFiles}" SelectedItem="{Binding SelectedWorldFile}" 
 					SelectionChanged="OnSelectedWorldFileChanged" DropDownOpened="OnWorldsDropDownOpened">
           <ComboBox.ItemTemplate>
             <DataTemplate>
@@ -354,25 +354,26 @@
                   <ColumnDefinition Width="Auto" />
                 </Grid.ColumnDefinitions>
                 <TextBlock Grid.Column="0" Margin="2" VerticalAlignment="Center">Name:</TextBlock>
-                <TextBox Grid.Column="1" x:Name="searchBox" Margin="2" TextChanged="OnSearchTextChanged" />
-                <Button Grid.Column="2" Margin="2" Padding="2" Click="OnSearchBoxClear" ToolTip="Clear">
+                <TextBox Grid.Column="1" x:Name="searchBox" Margin="2" TextChanged="OnSearchTextChanged" TabIndex="0" />
+                <Button Grid.Column="2" Margin="2" Padding="2" Click="OnSearchBoxClear" ToolTip="Clear" TabIndex="1">
                   <local:AutoGreyableImage Source="Resources/Cancel.png" Width="16" />
                 </Button>
                 <Button Grid.Column="3" Margin="2" Padding="2" Click="OnCheckAll"
 										  IsEnabled="{Binding ElementName=checkBoxBlocksDropDown, Path=DataContext.IsLoading, Converter={StaticResource InvertedBooleanConverter}}"
-										  Content="Check All" />
+										  Content="Check All" TabIndex="2" />
                 <Button Grid.Column="4" Margin="2" Padding="2" Click="OnUncheckAll"
 										  IsEnabled="{Binding ElementName=checkBoxBlocksDropDown, Path=DataContext.IsLoading, Converter={StaticResource InvertedBooleanConverter}}"
-										  Content="Uncheck All" />
+										  Content="Uncheck All" TabIndex="3" />
               </Grid>
               <StackPanel DockPanel.Dock="Bottom" Orientation="Horizontal" HorizontalAlignment="Right">
                 <Button Margin="2" Padding="10,2" Click="OnApplyBlockSelection"
 										  IsEnabled="{Binding ElementName=checkBoxBlocksDropDown, Path=DataContext.IsLoading, Converter={StaticResource InvertedBooleanConverter}}"
-										  Content="Apply" />
+										  Content="Apply" TabIndex="5" />
               </StackPanel>
               <ItemsControl ItemsSource="{Binding Source={StaticResource tileInfoViewSource}}" TextSearch.TextPath="Name"
 											  VirtualizingStackPanel.IsVirtualizing="True" ScrollViewer.CanContentScroll="True" ScrollViewer.VerticalScrollBarVisibility="Auto"
-											  BorderThickness="1" BorderBrush="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}" Margin="2">
+											  BorderThickness="1" BorderBrush="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}" Margin="2"
+                        KeyboardNavigation.TabNavigation="Once" TabIndex="4">
                 <ItemsControl.ItemTemplate>
                   <DataTemplate>
                     <CheckBox IsChecked="{Binding IsSelected}" Margin="2" Checked="OnItemChecked" Unchecked="OnItemChecked"
diff --git a/TerraMap/TileSelectionWindow.xaml b/TerraMap/TileSelectionWindow.xaml
index ef02d00..f4d4dc4 100644
--- a/TerraMap/TileSelectionWindow.xaml
+++ b/TerraMap/TileSelectionWindow.xaml
@@ -33,12 +33,12 @@
         <ColumnDefinition Width="Auto" />
       </Grid.ColumnDefinitions>
       <TextBlock Grid.Column="0" Margin="2">Name:</TextBlock>
-      <TextBox Grid.Column="1" x:Name="searchBox" Margin="2" TextChanged="OnSearchTextChanged" />
-      <Button Grid.Column="2" Click="OnSearchBoxClear" ToolTip="Clear">
+      <TextBox Grid.Column="1" x:Name="searchBox" Margin="2" TextChanged="OnSearchTextChanged" TabIndex="0" />
+      <Button Grid.Column="2" Click="OnSearchBoxClear" ToolTip="Clear" TabIndex="1">
         <local:AutoGreyableImage Source="Resources/Cancel.png" Width="16" />
       </Button>
-      <Button Grid.Column="3" Click="OnCheckAll">Check All</Button>
-      <Button Grid.Column="4" Click="OnUncheckAll">Uncheck All</Button>
+      <Button Grid.Column="3" Click="OnCheckAll" TabIndex="2">Check All</Button>
+      <Button Grid.Column="4" Click="OnUncheckAll" TabIndex="3">Uncheck All</Button>
     </Grid>
     <Grid DockPanel.Dock="Bottom">
       <!--<StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
@@ -46,14 +46,15 @@
 				<Button IsDefault="True" Click="OnCustomize" HorizontalAlignment="Left">_Customize...</Button>
 			</StackPanel>-->
       <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
-        <Button IsDefault="True" Click="OnAccept" MinWidth="75">_OK</Button>
-        <Button IsCancel="True" Click="OnCancel" Visibility="Collapsed">_Cancel</Button>
+        <Button IsDefault="True" Click="OnAccept" MinWidth="75" TabIndex="5">_OK</Button>
+        <Button IsCancel="True" Click="OnCancel" Visibility="Collapsed" IsTabStop="False" TabIndex="6">_Cancel</Button>
       </StackPanel>
     </Grid>
     <ItemsControl ItemsSource="{Binding Source={StaticResource tileInfoViewSource}}" TextSearch.TextPath="Name" 
 						  local:ItemActivation.ActivationMode="Mouse,Keyboard" local:ItemActivation.ItemActivate="OnItemActivate"
 						  VirtualizingStackPanel.IsVirtualizing="True" ScrollViewer.CanContentScroll="True" ScrollViewer.VerticalScrollBarVisibility="Auto"
-						  BorderThickness="1" Margin="2" BorderBrush="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}">
+						  BorderThickness="1" Margin="2" BorderBrush="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}"
+              KeyboardNavigation.TabNavigation="Once" TabIndex="4">
       <ItemsControl.ItemTemplate>
         <DataTemplate>
           <CheckBox IsChecked="{Binding IsSelected}" Margin="2">

From a3eddb4bc262587e8ff72acf391dc67f66c4616f Mon Sep 17 00:00:00 2001
From: Hamido-san <hamid.sadeghian@gmail.com>
Date: Tue, 1 Jan 2019 15:39:53 +0330
Subject: [PATCH 3/3] I seem to have messed up my second commit: NOW in
 MainWindow     When app starts, worlds list drop-down opens up.     Also the
 same happens to players list whenever "select a player" message is shown.

---
 TerraMap/MainWindow.xaml    | 2 +-
 TerraMap/MainWindow.xaml.cs | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/TerraMap/MainWindow.xaml b/TerraMap/MainWindow.xaml
index aaae832..42612a2 100644
--- a/TerraMap/MainWindow.xaml
+++ b/TerraMap/MainWindow.xaml
@@ -280,7 +280,7 @@
           </ComboBox.ItemTemplate>
         </ComboBox>
         <TextBlock VerticalAlignment="Center">Players:</TextBlock>
-        <ComboBox ItemsSource="{Binding MapFiles}" SelectedItem="{Binding SelectedMapFile}" 
+        <ComboBox x:Name="playersList" ItemsSource="{Binding MapFiles}" SelectedItem="{Binding SelectedMapFile}" 
 					SelectionChanged="OnSelectedMapFileChanged" DropDownOpened="OnMapsDropDownOpened">
           <ComboBox.ItemTemplate>
             <DataTemplate>
diff --git a/TerraMap/MainWindow.xaml.cs b/TerraMap/MainWindow.xaml.cs
index a6b51cc..9d98e18 100644
--- a/TerraMap/MainWindow.xaml.cs
+++ b/TerraMap/MainWindow.xaml.cs
@@ -322,6 +322,8 @@ private async Task Open(string filename)
         {
           this.viewModel.Instructions = "Please select a player or (All Spoilers) from the Players list.";
           this.viewModel.InstructionsVisibility = Visibility.Visible;
+          this.playersList.Focus();
+          this.playersList.IsDropDownOpen = true;
         }
 
         var elapsed = DateTime.Now - start;
@@ -1052,6 +1054,9 @@ private async void OnLoaded(object sender, RoutedEventArgs e)
 
         await this.Open(filename);
       }
+
+      this.worldsList.Focus();
+      this.worldsList.IsDropDownOpen = true;
     }
 
     private void OnDispatcherTimerTick(object sender, EventArgs e)