Feature: Removed margin when using the Compact Spacing option (files-…

…community#13145)
QuaintMako · Aug 7, 2023 · b03c2fd · b03c2fd
1 parent 6194696
commit b03c2fd
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 15 deletions.
diff --git a/src/Files.App/App.xaml b/src/Files.App/App.xaml
@@ -10,6 +10,9 @@
 			<!--  Default list view item height  -->
 			<x:Double x:Key="ListItemHeight">36</x:Double>
 
+			<!--  Default list view item margin  -->
+			<x:Double x:Key="ListItemMargin">0</x:Double>
+
 			<!--  Default nav menu item height  -->
 			<x:Double x:Key="NavigationViewItemOnLeftMinHeight">32</x:Double>
 

diff --git a/src/Files.App/Services/ResourcesService.cs b/src/Files.App/Services/ResourcesService.cs
@@ -45,10 +45,12 @@ public void SetAppThemeFontFamily(string contentControlThemeFontFamily)
 		/// <inheritdoc/>
 		public void SetCompactSpacing(bool useCompactSpacing)
 		{
-			var listItemHeight = useCompactSpacing ? 24 : 36;
+			var listItemHeight = useCompactSpacing ? 28 : 36;
+			var listItemMargin = useCompactSpacing ? "-2" : "0";
 			var navigationViewItemOnLeftMinHeight = useCompactSpacing ? 20 : 32;
 
 			Application.Current.Resources["ListItemHeight"] = listItemHeight;
+			Application.Current.Resources["ListItemMargin"] = listItemMargin;
 			Application.Current.Resources["NavigationViewItemOnLeftMinHeight"] = navigationViewItemOnLeftMinHeight;
 		}
 

diff --git a/src/Files.App/UserControls/Widgets/RecentFilesWidget.xaml b/src/Files.App/UserControls/Widgets/RecentFilesWidget.xaml
@@ -51,6 +51,7 @@
 				<Style BasedOn="{StaticResource DefaultListViewItemStyle}" TargetType="ListViewItem">
 					<Setter Property="MinHeight" Value="1" />
 					<Setter Property="Height" Value="{ThemeResource ListItemHeight}" />
+					<Setter Property="Margin" Value="{ThemeResource ListItemMargin}" />
 				</Style>
 			</ListView.ItemContainerStyle>
 

diff --git a/src/Files.App/Views/LayoutModes/ColumnViewBase.xaml b/src/Files.App/Views/LayoutModes/ColumnViewBase.xaml
@@ -383,6 +383,7 @@
 						<Style BasedOn="{StaticResource DefaultListViewItemStyle}" TargetType="ListViewItem">
 							<Setter Property="HorizontalContentAlignment" Value="Stretch" />
 							<Setter Property="MinHeight" Value="1" />
+							<Setter Property="Margin" Value="{ThemeResource ListItemMargin}" />
 							<Setter Property="Height" Value="{ThemeResource ListItemHeight}" />
 							<Setter Property="Padding" Value="4,0" />
 						</Style>

diff --git a/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml b/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml
@@ -1418,6 +1418,7 @@
 						<Style BasedOn="{StaticResource DefaultListViewItemStyle}" TargetType="ListViewItem">
 							<Setter Property="HorizontalContentAlignment" Value="Stretch" />
 							<Setter Property="MinHeight" Value="1" />
+							<Setter Property="Margin" Value="{ThemeResource ListItemMargin}" />
 							<Setter Property="Height" Value="{ThemeResource ListItemHeight}" />
 						</Style>
 					</ListView.ItemContainerStyle>

diff --git a/src/Files.App/Views/Properties/SecurityAdvancedPage.xaml b/src/Files.App/Views/Properties/SecurityAdvancedPage.xaml
@@ -236,13 +236,6 @@
 					<behaviors:StickyHeaderBehavior />
 				</i:Interaction.Behaviors>
 
-				<ListView.ItemContainerStyle>
-					<Style BasedOn="{StaticResource DefaultListViewItemStyle}" TargetType="ListViewItem">
-						<Setter Property="MinHeight" Value="1" />
-						<Setter Property="Height" Value="{ThemeResource ListItemHeight}" />
-					</Style>
-				</ListView.ItemContainerStyle>
-
 				<ListView.Header>
 					<Grid
 						x:Name="HeaderGrid"

diff --git a/src/Files.App/Views/Properties/SecurityPage.xaml b/src/Files.App/Views/Properties/SecurityPage.xaml
@@ -134,13 +134,6 @@
 						SelectedItem="{x:Bind SecurityViewModel.SelectedAccessControlEntry, Mode=TwoWay}"
 						SelectionMode="Single">
 
-						<ListView.ItemContainerStyle>
-							<Style BasedOn="{StaticResource DefaultListViewItemStyle}" TargetType="ListViewItem">
-								<Setter Property="MinHeight" Value="1" />
-								<Setter Property="Height" Value="{ThemeResource ListItemHeight}" />
-							</Style>
-						</ListView.ItemContainerStyle>
-
 						<ListView.ItemTemplate>
 							<DataTemplate x:DataType="security:AccessControlEntry">
 								<Grid ColumnSpacing="4">