Reset focus upon deactivation, update ManagedShell

dremin · Nov 11, 2023 · c85ae4f · c85ae4f
1 parent 68aa7ed
commit c85ae4f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/RetroBar/RetroBar.csproj b/RetroBar/RetroBar.csproj
@@ -45,7 +45,7 @@
 
   <ItemGroup>
     <PackageReference Include="gong-wpf-dragdrop" Version="3.1.1" />
-    <PackageReference Include="ManagedShell" Version="0.0.225" />
+    <PackageReference Include="ManagedShell" Version="0.0.231" />
     <PackageReference Include="System.Net.Http.Json" Version="6.0.0" />
   </ItemGroup>
 

diff --git a/RetroBar/Taskbar.xaml b/RetroBar/Taskbar.xaml
@@ -10,6 +10,7 @@
         LocationChanged="Taskbar_OnLocationChanged"
         SizeChanged="Taskbar_OnSizeChanged"
         MouseLeftButtonDown="Taskbar_OnMouseLeftButtonDown"
+        Deactivated="Taskbar_Deactivated"
         AllowDrop="True"
         Style="{DynamicResource TaskbarWindow}">
     <Window.Resources>

diff --git a/RetroBar/Taskbar.xaml.cs b/RetroBar/Taskbar.xaml.cs
@@ -290,6 +290,12 @@ private void Taskbar_OnSizeChanged(object sender, SizeChangedEventArgs e)
             StartButton?.UpdateFloatingStartCoordinates();
         }
 
+        private void Taskbar_Deactivated(object sender, EventArgs e)
+        {
+            // Prevent focus indicators and tooltips while not the active window
+            ResetControlFocus();
+        }
+
         private void DateTimeMenuItem_OnClick(object sender, RoutedEventArgs e)
         {
             ShellHelper.StartProcess("timedate.cpl");
@@ -334,6 +340,11 @@ private void ExitMenuItem_OnClick(object sender, RoutedEventArgs e)
             }
         }
 
+        private void ResetControlFocus()
+        {
+            FocusDummyButton.MoveFocus(new TraversalRequest(FocusNavigationDirection.Left));
+        }
+
         protected override bool ShouldAllowAutoHide()
         {
             return (!_startMenuOpen || !Screen.Primary) && base.ShouldAllowAutoHide();
@@ -376,7 +387,7 @@ protected override void OnAutoHideAnimationBegin(bool isHiding)
             base.OnAutoHideAnimationBegin(isHiding);
 
             // Prevent focus indicators and tooltips while hidden
-            FocusDummyButton.MoveFocus(new TraversalRequest(FocusNavigationDirection.Left));
+            ResetControlFocus();
         }
 
         private void ContextMenu_Opened(object sender, RoutedEventArgs e)