Using content instead of WindowContent

microsoft · Apr 10, 2024 · d50a364 · d50a364
1 parent 3336345
commit d50a364
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 23 deletions.
diff --git a/common/Windows/SecondaryWindow.cs b/common/Windows/SecondaryWindow.cs
@@ -184,7 +184,7 @@ public SecondaryWindow()
 
         // Initialize window content template
         _windowTemplate = new(this);
-        WindowContent = _windowTemplate;
+        Content = _windowTemplate;
 
         // Register secondary window events handlers
         Activated += OnSecondaryWindowActivated;

diff --git a/tools/SetupFlow/DevHome.SetupFlow/Views/DevDriveView.xaml b/tools/SetupFlow/DevHome.SetupFlow/Views/DevDriveView.xaml
@@ -51,15 +51,10 @@
                         The comment tags and the spaces Before the Run tags are necessary so the clickable area
                         of the hyperlink does not extend to edge of the grid column, and instead stay only over the text.
                     -->
-                    <Span
-                        xml:space="preserve">
-                        <Run x:Uid="ms-resource:///DevHome.SetupFlow/Resources/DevDriveWindowOnlyOneDevDriveAllowedHeader" /> <!--
-                        --><Hyperlink x:Name="GoToLearnMoreHyperlink"
-                                UnderlineStyle="None"
-                                NavigateUri="https://go.microsoft.com/fwlink/?linkid=2226090"><!--
-                            --> <Run x:Uid="ms-resource:///DevHome.SetupFlow/Resources/LearnMore" /> <!--
-                            --></Hyperlink> <!--
-                        --></Span>
+                        <Run x:Uid="ms-resource:///DevHome.SetupFlow/Resources/DevDriveWindowOnlyOneDevDriveAllowedHeader" />
+                        <Hyperlink UnderlineStyle="None" NavigateUri="https://go.microsoft.com/fwlink/?linkid=2226090">
+                            <Run x:Uid="ms-resource:///DevHome.SetupFlow/Resources/LearnMore" />
+                        </Hyperlink>
                 </TextBlock>
                 <TextBlock
                     x:Uid="ms-resource:///DevHome.SetupFlow/Resources/DevDriveWindowLaunchSettingsDisksAndVolumesHeader"

diff --git a/tools/SetupFlow/DevHome.SetupFlow/Views/DevDriveView.xaml.cs b/tools/SetupFlow/DevHome.SetupFlow/Views/DevDriveView.xaml.cs
@@ -3,7 +3,6 @@
 
 using DevHome.SetupFlow.ViewModels;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Input;
 
 namespace DevHome.SetupFlow.Views;
 
@@ -15,17 +14,5 @@ public DevDriveView(DevDriveViewModel viewModel)
     {
         ViewModel = viewModel;
         this.InitializeComponent();
-
-        this.Loaded += (_, _) =>
-        {
-            var option = new FindNextElementOptions();
-            option.SearchRoot = GoToLearnMoreHyperlink;
-
-            // An invisible element above the hyperlink is eating a tab.
-            // Set IsTabStop to false to prevent users having to double-tab to get to the first
-            // focusable element.
-            var focusableElement = FocusManager.FindNextElement(FocusNavigationDirection.Up, option);
-            focusableElement.SetValue(IsTabStopProperty, false);
-        };
     }
 }