force ScrollViewer to focus on loaded (#63)

DynamoDS · Sep 30, 2024 · f80631d · f80631d
1 parent 87240cd
commit f80631d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/TuneUp/TuneUpWindow.xaml b/TuneUp/TuneUpWindow.xaml
@@ -453,7 +453,8 @@
             Grid.Row="2"
             Grid.Column="0"
             Grid.ColumnSpan="2">
-            <ScrollViewer VerticalScrollBarVisibility="Auto">
+            <ScrollViewer VerticalScrollBarVisibility="Auto"
+                          Focusable="True">
                 <StackPanel >
                     <!-- Latest Run -->
                     <TextBlock Text="Latest run"
@@ -467,7 +468,8 @@
                               SelectionChanged="NodeAnalysisTable_SelectionChanged"
                               PreviewMouseDown="NodeAnalysisTable_PreviewMouseDown"
                               MouseLeave="NodeAnalysisTable_MouseLeave"
-                              PreviewMouseWheel="DataGrid_PreviewMouseWheel">
+                              PreviewMouseWheel="DataGrid_PreviewMouseWheel"
+                              Loaded="ScrollViewer_Loaded">
                         <DataGrid.Columns>
                             <!--  Execution Order  -->
                             <DataGridTextColumn Width="40" Header="#">
@@ -526,7 +528,8 @@
                               SelectionChanged="NodeAnalysisTable_SelectionChanged"
                               PreviewMouseDown="NodeAnalysisTable_PreviewMouseDown"
                               MouseLeave="NodeAnalysisTable_MouseLeave"
-                              PreviewMouseWheel="DataGrid_PreviewMouseWheel">
+                              PreviewMouseWheel="DataGrid_PreviewMouseWheel"
+                              Loaded="ScrollViewer_Loaded">
                         <DataGrid.Columns>
                             <!--  Execution Order  -->
                             <DataGridTextColumn Width="40" Binding="{Binding Converter={StaticResource ExecutionOrderNumberConverter}}">
@@ -583,7 +586,8 @@
                               SelectionChanged="NodeAnalysisTable_SelectionChanged"
                               PreviewMouseDown="NodeAnalysisTable_PreviewMouseDown"
                               MouseLeave="NodeAnalysisTable_MouseLeave"
-                              PreviewMouseWheel="DataGrid_PreviewMouseWheel">   
+                              PreviewMouseWheel="DataGrid_PreviewMouseWheel"
+                              Loaded="ScrollViewer_Loaded">   
                         <DataGrid.Columns>
                             <!--  Execution Order  -->
                             <DataGridTextColumn Width="40" />

diff --git a/TuneUp/TuneUpWindow.xaml.cs b/TuneUp/TuneUpWindow.xaml.cs
@@ -148,6 +148,18 @@ private T FindParent<T>(DependencyObject child) where T : DependencyObject
             }
         }
 
+        /// <summary>
+        /// Sets focus on the ScrollViewer when it is loaded to ensure immediate scroll functionality.
+        /// </summary>
+        private void ScrollViewer_Loaded(object sender, RoutedEventArgs e)
+        {
+            var scrollViewer = sender as ScrollViewer;
+            if (scrollViewer != null)
+            {
+                scrollViewer.Focus();
+            }
+        }
+
         private void RecomputeGraph_Click(object sender, RoutedEventArgs e)
         {
             (LatestRunTable.DataContext as TuneUpWindowViewModel).ResetProfiling();