#186

Xcube-Studio · Sep 29, 2023 · 202f6cd · 202f6cd
1 parent 5e2580a
commit 202f6cd
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 0 deletions.
diff --git a/Natsurainko.FluentLauncher/Views/Home/HomePage.xaml b/Natsurainko.FluentLauncher/Views/Home/HomePage.xaml
@@ -7,6 +7,7 @@
     xmlns:vm="using:Natsurainko.FluentLauncher.ViewModels.Home"
     d:DataContext="{d:DesignInstance vm:HomeViewModel}"
     Background="Transparent"
+    Loaded="Page_Loaded"
     mc:Ignorable="d">
 
     <Grid>
@@ -77,12 +78,16 @@
                 <ColumnDefinition Width="1*" MaxWidth="250" />
             </Grid.ColumnDefinitions>
             <Button
+                x:Name="LaunchButton"
                 Grid.Column="2"
                 HorizontalAlignment="Stretch"
                 VerticalAlignment="Stretch"
                 Command="{Binding LaunchCommand}"
                 FontSize="16"
                 Style="{ThemeResource AccentButtonStyle}">
+                <ToolTipService.ToolTip>
+                    <TextBlock x:Uid="Home_HomePage_LaunchButton" />
+                </ToolTipService.ToolTip>
                 <Grid>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto" />

diff --git a/Natsurainko.FluentLauncher/Views/Home/HomePage.xaml.cs b/Natsurainko.FluentLauncher/Views/Home/HomePage.xaml.cs
@@ -8,4 +8,9 @@ public HomePage()
     {
         InitializeComponent();
     }
+
+    private void Page_Loaded(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
+    {
+        LaunchButton.Focus(Microsoft.UI.Xaml.FocusState.Programmatic);
+    }
 }
diff --git a/Natsurainko.FluentLauncher/Views/Home/NewHomePage.xaml b/Natsurainko.FluentLauncher/Views/Home/NewHomePage.xaml
@@ -67,9 +67,16 @@
                     </HyperlinkButton>
                 </StackPanel>
                 <Button
+                    x:Name="LaunchButton"
                     Grid.Column="4"
                     Command="{Binding LaunchCommand}"
                     Style="{ThemeResource AccentButtonStyle}">
+                    <ToolTipService.ToolTip>
+                        <TextBlock x:Uid="Home_HomePage_LaunchButton" />
+                    </ToolTipService.ToolTip>
+                    <Button.KeyboardAccelerators>
+                        <KeyboardAccelerator Key="Enter" />
+                    </Button.KeyboardAccelerators>
                     <Grid Margin="10,0">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto" />

diff --git a/Natsurainko.FluentLauncher/Views/Home/NewHomePage.xaml.cs b/Natsurainko.FluentLauncher/Views/Home/NewHomePage.xaml.cs
@@ -21,6 +21,8 @@ private void Button_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
 
     private void Page_Loaded(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
     {
+        LaunchButton.Focus(Microsoft.UI.Xaml.FocusState.Programmatic);
+
         SharedShadow.Receivers.Add(BackgroundGrid);
         PanelGrid.Translation += new System.Numerics.Vector3(0, 0, 48);
     }