Move Download Settings Button

CollapseLauncher · Mar 12, 2024 · 6d0306d · 6d0306d
1 parent 2936d26
commit 6d0306d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 15 deletions.
diff --git a/CollapseLauncher/XAMLs/MainApp/Pages/Dialogs/SimpleDialogs.cs b/CollapseLauncher/XAMLs/MainApp/Pages/Dialogs/SimpleDialogs.cs
@@ -862,7 +862,7 @@ internal static async Task<ContentDialogResult> Dialog_DownloadSettings(UIElemen
                 OffContent = Lang._Misc.Disabled,
                 OnContent = Lang._Misc.Enabled
             };
-            startAfterInstall.Toggled += (_, _) => currentGameProperty._GameInstall.StartAfterInstall = (bool)startAfterInstall.IsOn;
+            startAfterInstall.Toggled += (_, _) => currentGameProperty._GameInstall.StartAfterInstall = startAfterInstall.IsOn;
 
             StackPanel panel = new StackPanel()
             {

diff --git a/CollapseLauncher/XAMLs/MainApp/Pages/HomePage.xaml b/CollapseLauncher/XAMLs/MainApp/Pages/HomePage.xaml
@@ -864,27 +864,32 @@
                            FontSize="10"
                            FontWeight="Bold"
                            Text="{x:Bind helper:Locale.Lang._Misc.TimeRemainHMSFormatPlaceholder}"/>
-                <Button
-                    x:Name="ProgressSettingsButton"
-                    Margin="-5,15,-5,0"
-                    CornerRadius="15"
-                    HorizontalAlignment="Center"
-                    PointerEntered="AnimateGameRegSettingIcon_Start"
-                    PointerExited="AnimateGameRegSettingIcon_End"
-                    Shadow="{ThemeResource SharedShadow}"
-                    Click="ProgressSettingsButton_OnClick">
-                    <Button.Content>
-                        <AnimatedIcon x:Name="GameRegionSettingIcon2" Width="20">
+            </StackPanel>
+            <Button
+                x:Name="ProgressSettingsButton"
+                CornerRadius="15"
+                HorizontalAlignment="Right"
+                VerticalAlignment="Bottom"
+                PointerEntered="AnimateGameRegSettingIcon_Start"
+                PointerExited="AnimateGameRegSettingIcon_End"
+                Shadow="{ThemeResource SharedShadow}"
+                Click="ProgressSettingsButton_OnClick">
+                <Button.Content>
+                    <Grid Margin="-16"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch" 
+                        Background="{ThemeResource GameSettingsBtnBrush}">
+                        <AnimatedIcon x:Name="GameRegionSettingIcon2" Width="20" Margin="11, 16, 11, 16">
                             <AnimatedIcon.Source>
                                 <animatedvisuals:AnimatedSettingsVisualSource />
                             </AnimatedIcon.Source>
                             <AnimatedIcon.FallbackIconSource>
                                 <FontIconSource FontFamily="Segoe MDL2 Assets" Glyph="&#xE70E;" />
                             </AnimatedIcon.FallbackIconSource>
                         </AnimatedIcon>
-                    </Button.Content>
-                </Button>
-            </StackPanel>
+                    </Grid>
+                </Button.Content>
+            </Button>
         </Grid>
         <StackPanel Grid.Row="2"
                     Grid.Column="1"