From a4e2fe18febd1d200cefa35728c0daecde2e1164 Mon Sep 17 00:00:00 2001
From: Yu Leng <yuleng@microsoft.com>
Date: Fri, 28 Nov 2025 00:15:00 +0800
Subject: [PATCH] Improve focus handling and window initialization

Added `IsTabStop="True"` to `RootGrid` in `MainWindow.xaml` to make it focusable. Updated `DispatcherQueue.TryEnqueue` in `MainWindow.xaml.cs` to clear focus from interactive elements (e.g., sliders) on window open, preventing unwanted tooltips and ensuring a cleaner initial state.
---
 .../PowerDisplay/PowerDisplayXAML/MainWindow.xaml        | 2 +-
 .../PowerDisplay/PowerDisplayXAML/MainWindow.xaml.cs     | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/modules/powerdisplay/PowerDisplay/PowerDisplayXAML/MainWindow.xaml b/src/modules/powerdisplay/PowerDisplay/PowerDisplayXAML/MainWindow.xaml
index 32bc19ec4a..4477d702c6 100644
--- a/src/modules/powerdisplay/PowerDisplay/PowerDisplayXAML/MainWindow.xaml
+++ b/src/modules/powerdisplay/PowerDisplay/PowerDisplayXAML/MainWindow.xaml
@@ -21,7 +21,7 @@
         <DesktopAcrylicBackdrop />
     </winuiex:WindowEx.SystemBackdrop>
 
-    <Grid x:Name="RootGrid">
+    <Grid x:Name="RootGrid" IsTabStop="True">
         <Grid.Resources>
             <Style
                 x:Key="FlyoutButtonStyle"
diff --git a/src/modules/powerdisplay/PowerDisplay/PowerDisplayXAML/MainWindow.xaml.cs b/src/modules/powerdisplay/PowerDisplay/PowerDisplayXAML/MainWindow.xaml.cs
index 7efb1c6c3f..80323d3ff2 100644
--- a/src/modules/powerdisplay/PowerDisplay/PowerDisplayXAML/MainWindow.xaml.cs
+++ b/src/modules/powerdisplay/PowerDisplay/PowerDisplayXAML/MainWindow.xaml.cs
@@ -219,7 +219,14 @@ namespace PowerDisplay
                 // This is critical because the OS might restore the window to a previous (incorrect) size
                 // when ShowWindow is called, ignoring our pre-show adjustment.
                 // By queuing this on the dispatcher, we ensure it runs after the window is visible and layout is active.
-                DispatcherQueue.TryEnqueue(() => AdjustWindowSizeToContent());
+                DispatcherQueue.TryEnqueue(() =>
+                {
+                    AdjustWindowSizeToContent();
+
+                    // Clear focus from any interactive element (e.g., Slider) to prevent
+                    // showing the value tooltip when the window opens
+                    RootGrid.Focus(FocusState.Programmatic);
+                });
 
                 bool isVisible = IsWindowVisible();
                 if (!isVisible)