Code Quality: Fix column layout sizing (#14822)

yaira2 · web-flow · commit 6ab55ccc338d · 2024-02-23T09:11:00.000-08:00
diff --git a/src/Files.App/Views/Layouts/ColumnLayoutPage.xaml b/src/Files.App/Views/Layouts/ColumnLayoutPage.xaml
@@ -131,6 +131,7 @@
 			<Setter Property="HorizontalContentAlignment" Value="Stretch" />
 			<Setter Property="MinHeight" Value="1" />
 			<Setter Property="Margin" Value="-2" />
+			<Setter Property="Padding" Value="4,0" />
 		</Style>
 
 		<Style
@@ -140,6 +141,7 @@
 			<Setter Property="HorizontalContentAlignment" Value="Stretch" />
 			<Setter Property="MinHeight" Value="1" />
 			<Setter Property="Margin" Value="0" />
+			<Setter Property="Padding" Value="4,0" />
 		</Style>
 
 	</local:BaseGroupableLayoutPage.Resources>
diff --git a/src/Files.App/Views/Layouts/ColumnLayoutPage.xaml.cs b/src/Files.App/Views/Layouts/ColumnLayoutPage.xaml.cs
@@ -48,13 +48,6 @@ public sealed partial class ColumnLayoutPage : BaseGroupableLayoutPage
 		public int RowHeight
 		{
 			get => LayoutSizeKindHelper.GetColumnsViewRowHeight(UserSettingsService.LayoutSettingsService.ColumnsViewSize);
-			set
-			{
-				if (value != LayoutSizeKindHelper.GetColumnsViewRowHeight(UserSettingsService.LayoutSettingsService.ColumnsViewSize))
-				{
-					NotifyPropertyChanged(nameof(RowHeight));
-				}
-			}
 		}
 
 		// Constructor
@@ -178,7 +171,9 @@ private void LayoutSettingsService_PropertyChanged(object? sender, PropertyChang
 
 			if (e.PropertyName == nameof(ILayoutSettingsService.ColumnsViewSize))
 			{
-				RowHeight = LayoutSizeKindHelper.GetColumnsViewRowHeight(UserSettingsService.LayoutSettingsService.ColumnsViewSize);
+				NotifyPropertyChanged(nameof(RowHeight));
+
+				// Update the container style to match the item size
 				SetItemContainerStyle();
 			}
 		}
diff --git a/src/Files.App/Views/Layouts/DetailsLayoutPage.xaml.cs b/src/Files.App/Views/Layouts/DetailsLayoutPage.xaml.cs
@@ -61,11 +61,6 @@ public double MaxWidthForRenameTextbox
 		public int RowHeight
 		{
 			get => LayoutSizeKindHelper.GetDetailsViewRowHeight((DetailsViewSizeKind)UserSettingsService.LayoutSettingsService.DetailsViewSize);
-			set
-			{
-				if (value != LayoutSizeKindHelper.GetDetailsViewRowHeight((DetailsViewSizeKind)UserSettingsService.LayoutSettingsService.DetailsViewSize))
-					NotifyPropertyChanged(nameof(RowHeight));
-			}
 		}
 
 
@@ -200,7 +195,7 @@ private void LayoutSettingsService_PropertyChanged(object? sender, PropertyChang
 				// Get current scroll position
 				var previousOffset = ContentScroller?.VerticalOffset;
 
-				RowHeight = LayoutSizeKindHelper.GetDetailsViewRowHeight(UserSettingsService.LayoutSettingsService.DetailsViewSize);
+				NotifyPropertyChanged(nameof(RowHeight));
 
 				// Update the container style to match the item size
 				SetItemContainerStyle();
diff --git a/src/Files.App/Views/Layouts/GridLayoutPage.xaml.cs b/src/Files.App/Views/Layouts/GridLayoutPage.xaml.cs
@@ -38,11 +38,6 @@ public sealed partial class GridLayoutPage : BaseGroupableLayoutPage
 		public int RowHeightListView
 		{
 			get => LayoutSizeKindHelper.GetListViewRowHeight(UserSettingsService.LayoutSettingsService.ListViewSize);
-			set
-			{
-				if (value != LayoutSizeKindHelper.GetListViewRowHeight(UserSettingsService.LayoutSettingsService.ListViewSize))
-					NotifyPropertyChanged(nameof(RowHeightListView));
-			}
 		}
 
 		/// <summary>
@@ -51,11 +46,6 @@ public int RowHeightListView
 		public int ItemWidthTilesView
 		{
 			get => LayoutSizeKindHelper.GetTilesViewItemWidth(UserSettingsService.LayoutSettingsService.TilesViewSize);
-			set
-			{
-				if (value != LayoutSizeKindHelper.GetTilesViewItemWidth(UserSettingsService.LayoutSettingsService.TilesViewSize))
-					NotifyPropertyChanged(nameof(ItemWidthTilesView));
-			}
 		}
 
 		/// <summary>
@@ -64,11 +54,6 @@ public int ItemWidthTilesView
 		public int ItemWidthGridView
 		{
 			get => LayoutSizeKindHelper.GetGridViewItemWidth(UserSettingsService.LayoutSettingsService.GridViewSize);
-			set
-			{
-				if (value != LayoutSizeKindHelper.GetGridViewItemWidth(UserSettingsService.LayoutSettingsService.GridViewSize))
-					NotifyPropertyChanged(nameof(ItemWidthGridView));
-			}
 		}
 
 		public bool IsPointerOver
@@ -166,20 +151,28 @@ private void LayoutSettingsService_PropertyChanged(object? sender, PropertyChang
 
 			if (e.PropertyName == nameof(ILayoutSettingsService.ListViewSize))
 			{
-				RowHeightListView = LayoutSizeKindHelper.GetListViewRowHeight(UserSettingsService.LayoutSettingsService.ListViewSize);
+				NotifyPropertyChanged(nameof(RowHeightListView));
+
+				// Update the container style to match the item size
 				SetItemContainerStyle();
+
 				FolderSettings_IconHeightChanged();
 			}
 			if (e.PropertyName == nameof(ILayoutSettingsService.TilesViewSize))
 			{
-				ItemWidthTilesView = LayoutSizeKindHelper.GetTilesViewItemWidth(UserSettingsService.LayoutSettingsService.TilesViewSize);
+				NotifyPropertyChanged(nameof(ItemWidthTilesView));
+
+				// Update the container style to match the item size
 				SetItemContainerStyle();
 				FolderSettings_IconHeightChanged();
 			}
 			if (e.PropertyName == nameof(ILayoutSettingsService.GridViewSize))
 			{
-				ItemWidthGridView = LayoutSizeKindHelper.GetGridViewItemWidth(UserSettingsService.LayoutSettingsService.GridViewSize);
+				NotifyPropertyChanged(nameof(ItemWidthGridView));
+
+				// Update the container style to match the item size
 				SetItemContainerStyle();
+
 				FolderSettings_IconHeightChanged();
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -48,13 +48,6 @@ public sealed partial class ColumnLayoutPage : BaseGroupableLayoutPage`
`48`	`48`	`public int RowHeight`
`49`	`49`	`{`
`50`	`50`	`get => LayoutSizeKindHelper.GetColumnsViewRowHeight(UserSettingsService.LayoutSettingsService.ColumnsViewSize);`
`51`		`- set`
`52`		`- {`
`53`		`- if (value != LayoutSizeKindHelper.GetColumnsViewRowHeight(UserSettingsService.LayoutSettingsService.ColumnsViewSize))`
`54`		`- {`
`55`		`- NotifyPropertyChanged(nameof(RowHeight));`
`56`		`- }`
`57`		`- }`
`58`	`51`	`}`
`59`	`52`
`60`	`53`	`// Constructor`
`@@ -178,7 +171,9 @@ private void LayoutSettingsService_PropertyChanged(object? sender, PropertyChang`
`178`	`171`
`179`	`172`	`if (e.PropertyName == nameof(ILayoutSettingsService.ColumnsViewSize))`
`180`	`173`	`{`
`181`		`- RowHeight = LayoutSizeKindHelper.GetColumnsViewRowHeight(UserSettingsService.LayoutSettingsService.ColumnsViewSize);`
	`174`	`+ NotifyPropertyChanged(nameof(RowHeight));`
	`175`	`+`
	`176`	`+ // Update the container style to match the item size`
`182`	`177`	`SetItemContainerStyle();`
`183`	`178`	`}`
`184`	`179`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,11 +38,6 @@ public sealed partial class GridLayoutPage : BaseGroupableLayoutPage`
`38`	`38`	`public int RowHeightListView`
`39`	`39`	`{`
`40`	`40`	`get => LayoutSizeKindHelper.GetListViewRowHeight(UserSettingsService.LayoutSettingsService.ListViewSize);`
`41`		`- set`
`42`		`- {`
`43`		`- if (value != LayoutSizeKindHelper.GetListViewRowHeight(UserSettingsService.LayoutSettingsService.ListViewSize))`
`44`		`- NotifyPropertyChanged(nameof(RowHeightListView));`
`45`		`- }`
`46`	`41`	`}`
`47`	`42`
`48`	`43`	`/// <summary>`
`@@ -51,11 +46,6 @@ public int RowHeightListView`
`51`	`46`	`public int ItemWidthTilesView`
`52`	`47`	`{`
`53`	`48`	`get => LayoutSizeKindHelper.GetTilesViewItemWidth(UserSettingsService.LayoutSettingsService.TilesViewSize);`
`54`		`- set`
`55`		`- {`
`56`		`- if (value != LayoutSizeKindHelper.GetTilesViewItemWidth(UserSettingsService.LayoutSettingsService.TilesViewSize))`
`57`		`- NotifyPropertyChanged(nameof(ItemWidthTilesView));`
`58`		`- }`
`59`	`49`	`}`
`60`	`50`
`61`	`51`	`/// <summary>`
`@@ -64,11 +54,6 @@ public int ItemWidthTilesView`
`64`	`54`	`public int ItemWidthGridView`
`65`	`55`	`{`
`66`	`56`	`get => LayoutSizeKindHelper.GetGridViewItemWidth(UserSettingsService.LayoutSettingsService.GridViewSize);`
`67`		`- set`
`68`		`- {`
`69`		`- if (value != LayoutSizeKindHelper.GetGridViewItemWidth(UserSettingsService.LayoutSettingsService.GridViewSize))`
`70`		`- NotifyPropertyChanged(nameof(ItemWidthGridView));`
`71`		`- }`
`72`	`57`	`}`
`73`	`58`
`74`	`59`	`public bool IsPointerOver`
`@@ -166,20 +151,28 @@ private void LayoutSettingsService_PropertyChanged(object? sender, PropertyChang`
`166`	`151`
`167`	`152`	`if (e.PropertyName == nameof(ILayoutSettingsService.ListViewSize))`
`168`	`153`	`{`
`169`		`- RowHeightListView = LayoutSizeKindHelper.GetListViewRowHeight(UserSettingsService.LayoutSettingsService.ListViewSize);`
	`154`	`+ NotifyPropertyChanged(nameof(RowHeightListView));`
	`155`	`+`
	`156`	`+ // Update the container style to match the item size`
`170`	`157`	`SetItemContainerStyle();`
	`158`	`+`
`171`	`159`	`FolderSettings_IconHeightChanged();`
`172`	`160`	`}`
`173`	`161`	`if (e.PropertyName == nameof(ILayoutSettingsService.TilesViewSize))`
`174`	`162`	`{`
`175`		`- ItemWidthTilesView = LayoutSizeKindHelper.GetTilesViewItemWidth(UserSettingsService.LayoutSettingsService.TilesViewSize);`
	`163`	`+ NotifyPropertyChanged(nameof(ItemWidthTilesView));`
	`164`	`+`
	`165`	`+ // Update the container style to match the item size`
`176`	`166`	`SetItemContainerStyle();`
`177`	`167`	`FolderSettings_IconHeightChanged();`
`178`	`168`	`}`
`179`	`169`	`if (e.PropertyName == nameof(ILayoutSettingsService.GridViewSize))`
`180`	`170`	`{`
`181`		`- ItemWidthGridView = LayoutSizeKindHelper.GetGridViewItemWidth(UserSettingsService.LayoutSettingsService.GridViewSize);`
	`171`	`+ NotifyPropertyChanged(nameof(ItemWidthGridView));`
	`172`	`+`
	`173`	`+ // Update the container style to match the item size`
`182`	`174`	`SetItemContainerStyle();`
	`175`	`+`
`183`	`176`	`FolderSettings_IconHeightChanged();`
`184`	`177`	`}`
`185`	`178`	`}`