From 890c9c00b836f7d4ff4cfdee060e058a46fb87e5 Mon Sep 17 00:00:00 2001
From: haven1433 <haven1433@gmail.com>
Date: Fri, 4 Nov 2022 08:51:42 -0500
Subject: [PATCH] add focus box when switching tabs

to help the user see which part of the screen they should focus on
---
 src/HexManiac.Core/ViewModels/ViewPort.cs    |  6 +++++-
 src/HexManiac.WPF/Controls/MapTab.xaml.cs    |  3 +++
 src/HexManiac.WPF/Controls/TabView.xaml      |  4 ++--
 src/HexManiac.WPF/Controls/TabView.xaml.cs   | 15 +++++++++++++++
 src/HexManiac.WPF/Windows/MainWindow.xaml    |  3 ++-
 src/HexManiac.WPF/Windows/MainWindow.xaml.cs |  5 +++++
 6 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/src/HexManiac.Core/ViewModels/ViewPort.cs b/src/HexManiac.Core/ViewModels/ViewPort.cs
index 92f7261e..1c6b18a4 100644
--- a/src/HexManiac.Core/ViewModels/ViewPort.cs
+++ b/src/HexManiac.Core/ViewModels/ViewPort.cs
@@ -240,7 +240,10 @@ namespace HavenSoft.HexManiac.Core.ViewModels {
 
                args = new TabChangeRequestedEventArgs(this);
                RequestTabChange?.Invoke(mapper, args);
-               if (args.RequestAccepted) selection.SetJumpBackTab(mapper);
+               if (args.RequestAccepted) {
+                  selection.SetJumpBackTab(mapper);
+                  FocusToolPanel.Raise(this);
+               }
             });
          }, TaskContinuationOptions.ExecuteSynchronously);
       }
@@ -919,6 +922,7 @@ namespace HavenSoft.HexManiac.Core.ViewModels {
       public event EventHandler<TabChangeRequestedEventArgs> RequestTabChange;
       public event EventHandler<Action> RequestDelayedWork;
       public event EventHandler RequestMenuClose;
+      public event EventHandler FocusToolPanel;
 #pragma warning restore 0067
 
       public Shortcuts Shortcuts { get; }
diff --git a/src/HexManiac.WPF/Controls/MapTab.xaml.cs b/src/HexManiac.WPF/Controls/MapTab.xaml.cs
index 034381f9..ba4a1415 100644
--- a/src/HexManiac.WPF/Controls/MapTab.xaml.cs
+++ b/src/HexManiac.WPF/Controls/MapTab.xaml.cs
@@ -13,6 +13,8 @@ namespace HavenSoft.HexManiac.WPF.Controls {
       private MapEditorViewModel ViewModel => (MapEditorViewModel)DataContext;
       private new ToolTip ToolTip => (ToolTip)base.ToolTip;
 
+      public event EventHandler FocusElement;
+
       public MapTab() {
          InitializeComponent();
          DataContextChanged += UpdateDataContext;
@@ -158,6 +160,7 @@ namespace HavenSoft.HexManiac.WPF.Controls {
 
       private void ButtonLeave(object sender, MouseEventArgs e) {
          UpdateTooltipContent(NoTooltip);
+         if (ViewModel == null) return;
          ViewModel.ShowHighlightCursor = false;
       }
 
diff --git a/src/HexManiac.WPF/Controls/TabView.xaml b/src/HexManiac.WPF/Controls/TabView.xaml
index 7be92011..17074dc1 100644
--- a/src/HexManiac.WPF/Controls/TabView.xaml
+++ b/src/HexManiac.WPF/Controls/TabView.xaml
@@ -138,7 +138,7 @@
             <ColumnDefinition/>
          </Grid.ColumnDefinitions>
          <!-- Left Panel -->
-         <Grid DataContext="{Binding Tools}" HorizontalAlignment="Stretch">
+         <Grid Name="ToolPanel" DataContext="{Binding Tools}" HorizontalAlignment="Stretch">
             <Grid.Style>
                <Style TargetType="Grid">
                   <Style.Triggers>
@@ -900,7 +900,7 @@
                      <TextBlock Foreground="{DynamicResource Error}" DockPanel.Dock="Bottom" TextWrapping="Wrap"
                         Text="{Binding ErrorText}"  Visibility="{Binding ShowErrorText, Converter={StaticResource BoolToVisibility}}" />
                      <ScrollViewer Name="CodeToolMultiTextBox" PreviewMouseWheel="ScrollCodeContent">
-                        <ItemsControl ItemsSource="{Binding Contents}">
+                        <ItemsControl ItemsSource="{Binding Contents}" Name="CodeToolMultiTextBoxItems" VerticalAlignment="Top">
                            <ItemsControl.ItemTemplate>
                               <DataTemplate>
                                  <StackPanel>
diff --git a/src/HexManiac.WPF/Controls/TabView.xaml.cs b/src/HexManiac.WPF/Controls/TabView.xaml.cs
index ee0782ba..7b5c8eb0 100644
--- a/src/HexManiac.WPF/Controls/TabView.xaml.cs
+++ b/src/HexManiac.WPF/Controls/TabView.xaml.cs
@@ -21,6 +21,7 @@ using System.Windows.Threading;
 
 namespace HavenSoft.HexManiac.WPF.Controls {
    public partial class TabView {
+      public event EventHandler FocusElement;
 
       #region ZoomLevel
 
@@ -69,6 +70,7 @@ namespace HavenSoft.HexManiac.WPF.Controls {
          }
          if (e.OldValue is ViewPort viewPortOld) {
             viewPortOld.Tools.StringTool.PropertyChanged -= HandleStringToolPropertyChanged;
+            viewPortOld.FocusToolPanel -= FocusToolPanel;
          }
          if (e.NewValue is IViewPort viewPortNew1) {
             viewPortNew1.PropertyChanged += HandleViewPortScrollChanged;
@@ -77,6 +79,7 @@ namespace HavenSoft.HexManiac.WPF.Controls {
          }
          if (e.NewValue is ViewPort viewPortNew) {
             viewPortNew.Tools.StringTool.PropertyChanged += HandleStringToolPropertyChanged;
+            viewPortNew.FocusToolPanel += FocusToolPanel;
          }
       }
 
@@ -508,6 +511,18 @@ namespace HavenSoft.HexManiac.WPF.Controls {
 
       private void ScrollCodeContent(object sender, MouseWheelEventArgs e) => CodeContentsPopup.IsOpen = false;
 
+      private void FocusToolPanel(object sender, EventArgs e) {
+         if (DataContext is IViewPort viewPort) {
+            if (viewPort.Tools.SelectedTool is CodeTool code) {
+               if (code.Mode.IsAny(CodeMode.Script, CodeMode.BattleScript, CodeMode.TrainerAiScript, CodeMode.AnimationScript)) {
+                  FocusElement.Raise(CodeToolMultiTextBoxItems);
+                  return;
+               }
+            }
+         }
+         FocusElement.Raise(ToolPanel);
+      }
+
       private void ComboBoxArrayElementViewTextInput(object sender, TextCompositionEventArgs e) {
          var element = (FrameworkElement)sender;
          var viewModel = (ComboBoxArrayElementViewModel)element.DataContext;
diff --git a/src/HexManiac.WPF/Windows/MainWindow.xaml b/src/HexManiac.WPF/Windows/MainWindow.xaml
index 18c19c78..2585325f 100644
--- a/src/HexManiac.WPF/Windows/MainWindow.xaml
+++ b/src/HexManiac.WPF/Windows/MainWindow.xaml
@@ -574,6 +574,7 @@
                            <ContentControl.Resources>
                               <DataTemplate DataType="{x:Type hshmcvm:ViewPort}">
                                  <hsg3hv:TabView
+                                          FocusElement="FocusTabElement"
                                           AnimateScroll="{Binding RelativeSource={RelativeSource AncestorType=Window}, Path=DataContext.AnimateScroll}"
                                           ZoomLevel="{Binding RelativeSource={RelativeSource AncestorType=Window}, Path=DataContext.ZoomLevel}"/>
                               </DataTemplate>
@@ -594,7 +595,7 @@
                                  <hsg3hv:ImageEditorView />
                               </DataTemplate>
                               <DataTemplate DataType="{x:Type mapvm:MapEditorViewModel}">
-                                 <hsg3hv:MapTab />
+                                 <hsg3hv:MapTab FocusElement="FocusTabElement" />
                               </DataTemplate>
                            </ContentControl.Resources>
                         </ContentControl>
diff --git a/src/HexManiac.WPF/Windows/MainWindow.xaml.cs b/src/HexManiac.WPF/Windows/MainWindow.xaml.cs
index ae6c3557..b1dec0dd 100644
--- a/src/HexManiac.WPF/Windows/MainWindow.xaml.cs
+++ b/src/HexManiac.WPF/Windows/MainWindow.xaml.cs
@@ -274,6 +274,11 @@ namespace HavenSoft.HexManiac.WPF.Windows {
          e.Handled = true;
       }
 
+      private void FocusTabElement(object sender, EventArgs e) {
+         var panel = (FrameworkElement)sender;
+         NavigationCommands.NavigateJournal.Execute(panel, this);
+      }
+
       protected override void OnDragEnter(DragEventArgs e) {
          base.OnDragEnter(e);
          if (e.Data.GetDataPresent(DataFormats.FileDrop)) {