Move settings to sidebar

Author: marcelwgn

src/Files.App/UserControls/AddressToolbar.xaml

@@ -620,28 +620,6 @@
 						Style="{StaticResource App.ThemedIcons.AppUpdatedBox}" />
 				</Button>
 
-				<!--  Open the Settings dialog  -->
-				<Button
-					x:Name="SettingsButton"
-					AccessKey="I"
-					AccessKeyInvoked="Button_AccessKeyInvoked"
-					AutomationProperties.AutomationId="SettingsButton"
-					AutomationProperties.Name="{x:Bind ViewModel.Commands.OpenSettings.Label, Mode=OneWay}"
-					Command="{x:Bind ViewModel.Commands.OpenSettings, Mode=OneWay}"
-					Style="{StaticResource AddressToolbarButtonStyle}"
-					ToolTipService.Placement="Bottom"
-					ToolTipService.ToolTip="{x:Bind ViewModel.Commands.OpenSettings.LabelWithHotKey, Mode=OneWay}"
-					Visibility="{x:Bind ShowSettingsButton, Mode=OneWay}">
-					<AnimatedIcon x:Name="SettingAnimatedIcon" Height="16">
-						<AnimatedIcon.Source>
-							<animatedvisuals:AnimatedSettingsVisualSource />
-						</AnimatedIcon.Source>
-						<AnimatedIcon.FallbackIconSource>
-							<SymbolIconSource Symbol="Setting" />
-						</AnimatedIcon.FallbackIconSource>
-					</AnimatedIcon>
-				</Button>
-
 			</StackPanel>
 
 			<!--  Status Center TeachingTip  -->

src/Files.App/UserControls/AddressToolbar.xaml.cs

@@ -16,7 +16,6 @@ namespace Files.App.UserControls
 {
 	[DependencyProperty<bool>("IsSidebarPaneOpenToggleButtonVisible")]
 	[DependencyProperty<bool>("ShowOngoingTasks")]
-	[DependencyProperty<bool>("ShowSettingsButton")]
 	[DependencyProperty<bool>("ShowSearchBox")]
 	[DependencyProperty<AddressToolbarViewModel>("ViewModel")]
 	public sealed partial class AddressToolbar : UserControl

src/Files.App/Views/MainPage.xaml

@@ -13,7 +13,8 @@
 	xmlns:toolkit="using:CommunityToolkit.WinUI.Controls"
 	xmlns:uc="using:Files.App.UserControls"
 	xmlns:viewmodels="using:Files.App.ViewModels"
-	xmlns:wctconverters="using:CommunityToolkit.WinUI.Converters"
+	xmlns:wctconverters="using:CommunityToolkit.WinUI.Converters" 
+	xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
 	AllowDrop="True"
 	Background="{ThemeResource App.Theme.BackgroundBrush}"
 	DataContext="{x:Bind ViewModel, Mode=OneWay}"
@@ -152,7 +153,6 @@
 			OngoingTasksViewModel="{x:Bind OngoingTasksViewModel}"
 			ShowOngoingTasks="True"
 			ShowSearchBox="True"
-			ShowSettingsButton="{x:Bind WindowContext.IsCompactOverlay, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}"
 			TabIndex="1" />
 
 		<!--  Content Area  -->
@@ -257,6 +257,47 @@
 						x:Load="{x:Bind ViewModel.ShowShelfPane, Mode=OneWay}" />
 				</Grid>
 			</controls:SidebarView.InnerContent>
+
+			<controls:SidebarView.Footer>
+				<StackPanel 
+					Padding="4" 
+					Spacing="4">
+					<Border HorizontalAlignment="Stretch" Height="1" BorderBrush="{ThemeResource ControlStrokeColorDefaultBrush}" BorderThickness="1"/>
+					<!--  Open the Settings dialog  -->
+					<Button
+						x:Name="SettingsButton"
+						AccessKey="I"
+						AccessKeyInvoked="SettingsButton_AccessKeyInvoked"
+						AutomationProperties.AutomationId="SettingsButton"
+						AutomationProperties.Name="{x:Bind Commands.OpenSettings.Label, Mode=OneWay}"
+						Command="{x:Bind Commands.OpenSettings, Mode=OneWay}"
+						Height="32"
+						HorizontalAlignment="Stretch"
+						HorizontalContentAlignment="Stretch"
+						ToolTipService.Placement="Bottom"
+						ToolTipService.ToolTip="{x:Bind Commands.OpenSettings.LabelWithHotKey, Mode=OneWay}">
+						<Grid HorizontalAlignment="Stretch">
+							<Grid.ColumnDefinitions>
+								<ColumnDefinition Width="Auto" />
+								<ColumnDefinition Width="*" />
+							</Grid.ColumnDefinitions>
+							<AnimatedIcon x:Name="SettingAnimatedIcon" Height="16" Margin="4,0,0,0">
+								<AnimatedIcon.Source>
+									<animatedvisuals:AnimatedSettingsVisualSource />
+								</AnimatedIcon.Source>
+								<AnimatedIcon.FallbackIconSource>
+									<SymbolIconSource Symbol="Setting" />
+								</AnimatedIcon.FallbackIconSource>
+							</AnimatedIcon>
+
+							<TextBlock 
+								Grid.Column="1" 
+								Margin="16,0,0,0"
+								Text="{x:Bind Commands.OpenSettings.Label, Mode=OneWay}"/>
+						</Grid>
+					</Button>
+				</StackPanel>
+			</controls:SidebarView.Footer>
 		</controls:SidebarView>
 
 		<VisualStateManager.VisualStateGroups>

src/Files.App/Views/MainPage.xaml.cs

@@ -19,6 +19,7 @@
 using VirtualKey = Windows.System.VirtualKey;
 using GridSplitter = Files.App.Controls.GridSplitter;
 using Files.App.Controls;
+using Microsoft.UI.Xaml.Media;
 
 namespace Files.App.Views
 {
@@ -494,5 +495,13 @@ private void PaneSplitter_ManipulationStarted(object sender, ManipulationStarted
 			this.ChangeCursor(InputSystemCursor.Create(InfoPane.Position == PreviewPanePositions.Right ?
 				InputSystemCursorShape.SizeWestEast : InputSystemCursorShape.SizeNorthSouth));
 		}
+
+
+		private void SettingsButton_AccessKeyInvoked(UIElement sender, AccessKeyInvokedEventArgs args)
+		{
+			// Suppress access key invocation if any dialog is open
+			if (VisualTreeHelper.GetOpenPopupsForXamlRoot(MainWindow.Instance.Content.XamlRoot).Any())
+				args.Handled = true;
+		}
 	}
 }