Skip to content

Commit 2b39194

Browse files
yaira2yaira2
committed
Rename
1 parent 47a93e5 commit 2b39194

File tree

8 files changed

+71
-71
lines changed

8 files changed

+71
-71
lines changed

‎src/Files.App/Actions/Display/LayoutAction.cs

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -188,10 +188,10 @@ public HotKey MediaHotKey
188188

189189
public bool IsExecutable =>
190190
ContentPageContext.PageType is not ContentPageTypes.Home &&
191-
((DisplayPageContext.LayoutType == LayoutTypes.Details && UserSettingsService.LayoutSettingsService.ItemSizeDetailsView > DetailsViewSizeKind.Compact) ||
192-
(DisplayPageContext.LayoutType == LayoutTypes.List && UserSettingsService.LayoutSettingsService.ItemSizeListView > ListViewSizeKind.Compact) ||
193-
(DisplayPageContext.LayoutType == LayoutTypes.Grid && UserSettingsService.LayoutSettingsService.ItemSizeGridView > GridViewSizeKind.Compact) ||
194-
(DisplayPageContext.LayoutType == LayoutTypes.Columns && UserSettingsService.LayoutSettingsService.ItemSizeColumnsView > ColumnsViewSizeKind.Compact));
191+
((DisplayPageContext.LayoutType == LayoutTypes.Details && UserSettingsService.LayoutSettingsService.DetailsViewItemSize > DetailsViewSizeKind.Compact) ||
192+
(DisplayPageContext.LayoutType == LayoutTypes.List && UserSettingsService.LayoutSettingsService.ListViewItemSize > ListViewSizeKind.Compact) ||
193+
(DisplayPageContext.LayoutType == LayoutTypes.Grid && UserSettingsService.LayoutSettingsService.GridViewItemSize > GridViewSizeKind.Compact) ||
194+
(DisplayPageContext.LayoutType == LayoutTypes.Columns && UserSettingsService.LayoutSettingsService.ColumnsViewItemSize > ColumnsViewSizeKind.Compact));
195195

196196
public LayoutDecreaseSizeAction()
197197
{
@@ -224,10 +224,10 @@ private void UserSettingsService_PropertyChanged(object? sender, PropertyChanged
224224
{
225225
switch (e.PropertyName)
226226
{
227-
case nameof(ILayoutSettingsService.ItemSizeDetailsView):
228-
case nameof(ILayoutSettingsService.ItemSizeListView):
229-
case nameof(ILayoutSettingsService.ItemSizeGridView):
230-
case nameof(ILayoutSettingsService.ItemSizeColumnsView):
227+
case nameof(ILayoutSettingsService.DetailsViewItemSize):
228+
case nameof(ILayoutSettingsService.ListViewItemSize):
229+
case nameof(ILayoutSettingsService.GridViewItemSize):
230+
case nameof(ILayoutSettingsService.ColumnsViewItemSize):
231231
OnPropertyChanged(nameof(IsExecutable));
232232
break;
233233
}
@@ -238,22 +238,22 @@ public Task ExecuteAsync()
238238
switch (DisplayPageContext.LayoutType)
239239
{
240240
case LayoutTypes.Details:
241-
if (UserSettingsService.LayoutSettingsService.ItemSizeDetailsView > DetailsViewSizeKind.Compact)
242-
UserSettingsService.LayoutSettingsService.ItemSizeDetailsView -= 1;
241+
if (UserSettingsService.LayoutSettingsService.DetailsViewItemSize > DetailsViewSizeKind.Compact)
242+
UserSettingsService.LayoutSettingsService.DetailsViewItemSize -= 1;
243243
break;
244244
case LayoutTypes.List:
245-
if (UserSettingsService.LayoutSettingsService.ItemSizeListView > ListViewSizeKind.Compact)
246-
UserSettingsService.LayoutSettingsService.ItemSizeListView -= 1;
245+
if (UserSettingsService.LayoutSettingsService.ListViewItemSize > ListViewSizeKind.Compact)
246+
UserSettingsService.LayoutSettingsService.ListViewItemSize -= 1;
247247
break;
248248
case LayoutTypes.Tiles:
249249
break;
250250
case LayoutTypes.Grid:
251-
if (UserSettingsService.LayoutSettingsService.ItemSizeGridView > GridViewSizeKind.Compact)
252-
UserSettingsService.LayoutSettingsService.ItemSizeGridView -= 1;
251+
if (UserSettingsService.LayoutSettingsService.GridViewItemSize > GridViewSizeKind.Compact)
252+
UserSettingsService.LayoutSettingsService.GridViewItemSize -= 1;
253253
break;
254254
case LayoutTypes.Columns:
255-
if (UserSettingsService.LayoutSettingsService.ItemSizeColumnsView > ColumnsViewSizeKind.Compact)
256-
UserSettingsService.LayoutSettingsService.ItemSizeColumnsView -= 1;
255+
if (UserSettingsService.LayoutSettingsService.ColumnsViewItemSize > ColumnsViewSizeKind.Compact)
256+
UserSettingsService.LayoutSettingsService.ColumnsViewItemSize -= 1;
257257
break;
258258
}
259259

@@ -281,10 +281,10 @@ public HotKey MediaHotKey
281281

282282
public bool IsExecutable =>
283283
ContentPageContext.PageType is not ContentPageTypes.Home &&
284-
((DisplayPageContext.LayoutType == LayoutTypes.Details && UserSettingsService.LayoutSettingsService.ItemSizeDetailsView < DetailsViewSizeKind.ExtraLarge) ||
285-
(DisplayPageContext.LayoutType == LayoutTypes.List && UserSettingsService.LayoutSettingsService.ItemSizeListView < ListViewSizeKind.ExtraLarge) ||
286-
(DisplayPageContext.LayoutType == LayoutTypes.Grid && UserSettingsService.LayoutSettingsService.ItemSizeGridView < GridViewSizeKind.Eleven) ||
287-
(DisplayPageContext.LayoutType == LayoutTypes.Columns && UserSettingsService.LayoutSettingsService.ItemSizeColumnsView < ColumnsViewSizeKind.ExtraLarge));
284+
((DisplayPageContext.LayoutType == LayoutTypes.Details && UserSettingsService.LayoutSettingsService.DetailsViewItemSize < DetailsViewSizeKind.ExtraLarge) ||
285+
(DisplayPageContext.LayoutType == LayoutTypes.List && UserSettingsService.LayoutSettingsService.ListViewItemSize < ListViewSizeKind.ExtraLarge) ||
286+
(DisplayPageContext.LayoutType == LayoutTypes.Grid && UserSettingsService.LayoutSettingsService.GridViewItemSize < GridViewSizeKind.Eleven) ||
287+
(DisplayPageContext.LayoutType == LayoutTypes.Columns && UserSettingsService.LayoutSettingsService.ColumnsViewItemSize < ColumnsViewSizeKind.ExtraLarge));
288288

289289
public LayoutIncreaseSizeAction()
290290
{
@@ -317,10 +317,10 @@ private void UserSettingsService_PropertyChanged(object? sender, PropertyChanged
317317
{
318318
switch (e.PropertyName)
319319
{
320-
case nameof(ILayoutSettingsService.ItemSizeDetailsView):
321-
case nameof(ILayoutSettingsService.ItemSizeListView):
322-
case nameof(ILayoutSettingsService.ItemSizeGridView):
323-
case nameof(ILayoutSettingsService.ItemSizeColumnsView):
320+
case nameof(ILayoutSettingsService.DetailsViewItemSize):
321+
case nameof(ILayoutSettingsService.ListViewItemSize):
322+
case nameof(ILayoutSettingsService.GridViewItemSize):
323+
case nameof(ILayoutSettingsService.ColumnsViewItemSize):
324324
OnPropertyChanged(nameof(IsExecutable));
325325
break;
326326
}
@@ -331,22 +331,22 @@ public Task ExecuteAsync()
331331
switch (DisplayPageContext.LayoutType)
332332
{
333333
case LayoutTypes.Details:
334-
if (UserSettingsService.LayoutSettingsService.ItemSizeDetailsView < DetailsViewSizeKind.ExtraLarge)
335-
UserSettingsService.LayoutSettingsService.ItemSizeDetailsView += 1;
334+
if (UserSettingsService.LayoutSettingsService.DetailsViewItemSize < DetailsViewSizeKind.ExtraLarge)
335+
UserSettingsService.LayoutSettingsService.DetailsViewItemSize += 1;
336336
break;
337337
case LayoutTypes.List:
338-
if (UserSettingsService.LayoutSettingsService.ItemSizeListView < ListViewSizeKind.ExtraLarge)
339-
UserSettingsService.LayoutSettingsService.ItemSizeListView += 1;
338+
if (UserSettingsService.LayoutSettingsService.ListViewItemSize < ListViewSizeKind.ExtraLarge)
339+
UserSettingsService.LayoutSettingsService.ListViewItemSize += 1;
340340
break;
341341
case LayoutTypes.Tiles:
342342
break;
343343
case LayoutTypes.Grid:
344-
if (UserSettingsService.LayoutSettingsService.ItemSizeGridView < GridViewSizeKind.Eleven)
345-
UserSettingsService.LayoutSettingsService.ItemSizeGridView += 1;
344+
if (UserSettingsService.LayoutSettingsService.GridViewItemSize < GridViewSizeKind.Eleven)
345+
UserSettingsService.LayoutSettingsService.GridViewItemSize += 1;
346346
break;
347347
case LayoutTypes.Columns:
348-
if (UserSettingsService.LayoutSettingsService.ItemSizeColumnsView < ColumnsViewSizeKind.ExtraLarge)
349-
UserSettingsService.LayoutSettingsService.ItemSizeColumnsView += 1;
348+
if (UserSettingsService.LayoutSettingsService.ColumnsViewItemSize < ColumnsViewSizeKind.ExtraLarge)
349+
UserSettingsService.LayoutSettingsService.ColumnsViewItemSize += 1;
350350
break;
351351
}
352352

‎src/Files.App/Helpers/Layout/LayoutPreferencesManager.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,10 +235,10 @@ public uint GetRoundedIconSize()
235235
=> Constants.ShellIconSizes.Large,
236236
FolderLayoutModes.ColumnView
237237
=> Constants.ShellIconSizes.Large,
238-
_ when LayoutMode == FolderLayoutModes.GridView && UserSettingsService.LayoutSettingsService.ItemSizeGridView <= GridViewSizeKind.Small ||
238+
_ when LayoutMode == FolderLayoutModes.GridView && UserSettingsService.LayoutSettingsService.GridViewItemSize <= GridViewSizeKind.Small ||
239239
LayoutMode == FolderLayoutModes.TilesView
240240
=> 96,
241-
_ when LayoutMode == FolderLayoutModes.GridView && UserSettingsService.LayoutSettingsService.ItemSizeGridView <= GridViewSizeKind.Large
241+
_ when LayoutMode == FolderLayoutModes.GridView && UserSettingsService.LayoutSettingsService.GridViewItemSize <= GridViewSizeKind.Large
242242
=> 128,
243243
_ => 256,
244244
};

‎src/Files.App/Services/Settings/LayoutSettingsService.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,31 +11,31 @@ public LayoutSettingsService(ISettingsSharingContext settingsSharingContext)
1111
RegisterSettingsContext(settingsSharingContext);
1212
}
1313

14-
public DetailsViewSizeKind ItemSizeDetailsView
14+
public DetailsViewSizeKind DetailsViewItemSize
1515
{
1616
get => Get(DetailsViewSizeKind.Small);
1717
set => Set(value);
1818
}
1919

20-
public ListViewSizeKind ItemSizeListView
20+
public ListViewSizeKind ListViewItemSize
2121
{
2222
get => Get(ListViewSizeKind.Small);
2323
set => Set(value);
2424
}
2525

26-
public TilesViewSizeKind ItemSizeTilesView
26+
public TilesViewSizeKind TilesViewItemSize
2727
{
2828
get => Get(TilesViewSizeKind.Small);
2929
set => Set(value);
3030
}
3131

32-
public GridViewSizeKind ItemSizeGridView
32+
public GridViewSizeKind GridViewItemSize
3333
{
3434
get => Get(GridViewSizeKind.ExtraLarge);
3535
set => Set(value);
3636
}
3737

38-
public ColumnsViewSizeKind ItemSizeColumnsView
38+
public ColumnsViewSizeKind ColumnsViewItemSize
3939
{
4040
get => Get(ColumnsViewSizeKind.Small);
4141
set => Set(value);

‎src/Files.App/UserControls/InnerNavigationToolbar.xaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -780,7 +780,7 @@
780780
SnapsTo="Ticks"
781781
TickFrequency="1"
782782
TickPlacement="BottomRight"
783-
Value="{x:Bind UserSettingsService.LayoutSettingsService.ItemSizeDetailsView, Mode=TwoWay, Converter={StaticResource GenericEnumConverter}, ConverterParameter='0-0,1-1,2-2,3-3,4-4'}" />
783+
Value="{x:Bind UserSettingsService.LayoutSettingsService.DetailsViewItemSize, Mode=TwoWay, Converter={StaticResource GenericEnumConverter}, ConverterParameter='0-0,1-1,2-2,3-3,4-4'}" />
784784

785785
<!-- Tiles -->
786786
<Slider
@@ -799,7 +799,7 @@
799799
SnapsTo="Ticks"
800800
TickFrequency="1"
801801
TickPlacement="BottomRight"
802-
Value="{x:Bind UserSettingsService.LayoutSettingsService.ItemSizeListView, Mode=TwoWay, Converter={StaticResource GenericEnumConverter}, ConverterParameter='0-0,1-1,2-2,3-3,4-4'}" />
802+
Value="{x:Bind UserSettingsService.LayoutSettingsService.ListViewItemSize, Mode=TwoWay, Converter={StaticResource GenericEnumConverter}, ConverterParameter='0-0,1-1,2-2,3-3,4-4'}" />
803803

804804
<!-- Grid -->
805805
<Slider
@@ -811,7 +811,7 @@
811811
TickFrequency="1"
812812
TickPlacement="BottomRight"
813813
Visibility="{x:Bind ViewModel.IsGridLayout, Mode=OneWay}"
814-
Value="{x:Bind UserSettingsService.LayoutSettingsService.ItemSizeGridView, Mode=TwoWay, Converter={StaticResource GenericEnumConverter}, ConverterParameter='0-0,1-1,2-2,3-3,4-4,5-5,6-6,7-7,8-8,9-9,10-10,11-11'}" />
814+
Value="{x:Bind UserSettingsService.LayoutSettingsService.GridViewItemSize, Mode=TwoWay, Converter={StaticResource GenericEnumConverter}, ConverterParameter='0-0,1-1,2-2,3-3,4-4,5-5,6-6,7-7,8-8,9-9,10-10,11-11'}" />
815815

816816
<!-- Columns -->
817817
<Slider
@@ -823,7 +823,7 @@
823823
SnapsTo="Ticks"
824824
TickFrequency="1"
825825
TickPlacement="BottomRight"
826-
Value="{x:Bind UserSettingsService.LayoutSettingsService.ItemSizeColumnsView, Mode=TwoWay, Converter={StaticResource GenericEnumConverter}, ConverterParameter='0-0,1-1,2-2,3-3,4-4'}" />
826+
Value="{x:Bind UserSettingsService.LayoutSettingsService.ColumnsViewItemSize, Mode=TwoWay, Converter={StaticResource GenericEnumConverter}, ConverterParameter='0-0,1-1,2-2,3-3,4-4'}" />
827827
</Grid>
828828

829829
<!-- (Divider) -->

‎src/Files.App/Views/Layouts/ColumnLayoutPage.xaml.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ public sealed partial class ColumnLayoutPage : BaseGroupableLayoutPage
4747
/// </summary>
4848
public int RowHeight
4949
{
50-
get => LayoutSizeKindHelper.GetColumnsViewRowHeight(UserSettingsService.LayoutSettingsService.ItemSizeColumnsView);
50+
get => LayoutSizeKindHelper.GetColumnsViewRowHeight(UserSettingsService.LayoutSettingsService.ColumnsViewItemSize);
5151
set
5252
{
53-
if (value != LayoutSizeKindHelper.GetColumnsViewRowHeight(UserSettingsService.LayoutSettingsService.ItemSizeColumnsView))
53+
if (value != LayoutSizeKindHelper.GetColumnsViewRowHeight(UserSettingsService.LayoutSettingsService.ColumnsViewItemSize))
5454
{
5555
NotifyPropertyChanged(nameof(RowHeight));
5656
}
@@ -176,9 +176,9 @@ private void LayoutSettingsService_PropertyChanged(object? sender, PropertyChang
176176
{
177177
// TODO keep scroll position when changing styles (see details view)
178178

179-
if (e.PropertyName == nameof(ILayoutSettingsService.ItemSizeColumnsView))
179+
if (e.PropertyName == nameof(ILayoutSettingsService.ColumnsViewItemSize))
180180
{
181-
RowHeight = LayoutSizeKindHelper.GetColumnsViewRowHeight(UserSettingsService.LayoutSettingsService.ItemSizeColumnsView);
181+
RowHeight = LayoutSizeKindHelper.GetColumnsViewRowHeight(UserSettingsService.LayoutSettingsService.ColumnsViewItemSize);
182182
SetItemContainerStyle();
183183
}
184184
}
@@ -240,7 +240,7 @@ protected override bool CanGetItemFromElement(object element)
240240
/// </summary>
241241
private void SetItemContainerStyle()
242242
{
243-
if (UserSettingsService.LayoutSettingsService.ItemSizeColumnsView == ColumnsViewSizeKind.Compact)
243+
if (UserSettingsService.LayoutSettingsService.ColumnsViewItemSize == ColumnsViewSizeKind.Compact)
244244
{
245245
// Toggle style to force item size to update
246246
FileList.ItemContainerStyle = RegularItemContainerStyle;

‎src/Files.App/Views/Layouts/DetailsLayoutPage.xaml.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ public double MaxWidthForRenameTextbox
6060
/// </summary>
6161
public int RowHeight
6262
{
63-
get => LayoutSizeKindHelper.GetDetailsViewRowHeight((DetailsViewSizeKind)UserSettingsService.LayoutSettingsService.ItemSizeDetailsView);
63+
get => LayoutSizeKindHelper.GetDetailsViewRowHeight((DetailsViewSizeKind)UserSettingsService.LayoutSettingsService.DetailsViewItemSize);
6464
set
6565
{
66-
if (value != LayoutSizeKindHelper.GetDetailsViewRowHeight((DetailsViewSizeKind)UserSettingsService.LayoutSettingsService.ItemSizeDetailsView))
66+
if (value != LayoutSizeKindHelper.GetDetailsViewRowHeight((DetailsViewSizeKind)UserSettingsService.LayoutSettingsService.DetailsViewItemSize))
6767
NotifyPropertyChanged(nameof(RowHeight));
6868
}
6969
}
@@ -195,12 +195,12 @@ protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
195195

196196
private void LayoutSettingsService_PropertyChanged(object? sender, PropertyChangedEventArgs e)
197197
{
198-
if (e.PropertyName == nameof(ILayoutSettingsService.ItemSizeDetailsView))
198+
if (e.PropertyName == nameof(ILayoutSettingsService.DetailsViewItemSize))
199199
{
200200
// Get current scroll position
201201
var previousOffset = ContentScroller?.VerticalOffset;
202202

203-
RowHeight = LayoutSizeKindHelper.GetDetailsViewRowHeight(UserSettingsService.LayoutSettingsService.ItemSizeDetailsView);
203+
RowHeight = LayoutSizeKindHelper.GetDetailsViewRowHeight(UserSettingsService.LayoutSettingsService.DetailsViewItemSize);
204204

205205
// Update the container style to match the item size
206206
SetItemContainerStyle();
@@ -215,7 +215,7 @@ private void LayoutSettingsService_PropertyChanged(object? sender, PropertyChang
215215
/// </summary>
216216
private void SetItemContainerStyle()
217217
{
218-
if (UserSettingsService.LayoutSettingsService.ItemSizeDetailsView == DetailsViewSizeKind.Compact)
218+
if (UserSettingsService.LayoutSettingsService.DetailsViewItemSize == DetailsViewSizeKind.Compact)
219219
{
220220
// Toggle style to force item size to update
221221
FileList.ItemContainerStyle = RegularItemContainerStyle;

‎src/Files.App/Views/Layouts/GridLayoutPage.xaml.cs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ public sealed partial class GridLayoutPage : BaseGroupableLayoutPage
3737
/// </summary>
3838
public int RowHeightListView
3939
{
40-
get => LayoutSizeKindHelper.GetListViewRowHeight(UserSettingsService.LayoutSettingsService.ItemSizeListView);
40+
get => LayoutSizeKindHelper.GetListViewRowHeight(UserSettingsService.LayoutSettingsService.ListViewItemSize);
4141
set
4242
{
43-
if (value != LayoutSizeKindHelper.GetListViewRowHeight(UserSettingsService.LayoutSettingsService.ItemSizeListView))
43+
if (value != LayoutSizeKindHelper.GetListViewRowHeight(UserSettingsService.LayoutSettingsService.ListViewItemSize))
4444
NotifyPropertyChanged(nameof(RowHeightListView));
4545
}
4646
}
@@ -50,10 +50,10 @@ public int RowHeightListView
5050
/// </summary>
5151
public int ItemWidthTilesView
5252
{
53-
get => LayoutSizeKindHelper.GetTilesViewItemWidth(UserSettingsService.LayoutSettingsService.ItemSizeTilesView);
53+
get => LayoutSizeKindHelper.GetTilesViewItemWidth(UserSettingsService.LayoutSettingsService.TilesViewItemSize);
5454
set
5555
{
56-
if (value != LayoutSizeKindHelper.GetTilesViewItemWidth(UserSettingsService.LayoutSettingsService.ItemSizeTilesView))
56+
if (value != LayoutSizeKindHelper.GetTilesViewItemWidth(UserSettingsService.LayoutSettingsService.TilesViewItemSize))
5757
NotifyPropertyChanged(nameof(ItemWidthTilesView));
5858
}
5959
}
@@ -63,10 +63,10 @@ public int ItemWidthTilesView
6363
/// </summary>
6464
public int ItemWidthGridView
6565
{
66-
get => LayoutSizeKindHelper.GetGridViewItemWidth(UserSettingsService.LayoutSettingsService.ItemSizeGridView);
66+
get => LayoutSizeKindHelper.GetGridViewItemWidth(UserSettingsService.LayoutSettingsService.GridViewItemSize);
6767
set
6868
{
69-
if (value != LayoutSizeKindHelper.GetGridViewItemWidth(UserSettingsService.LayoutSettingsService.ItemSizeGridView))
69+
if (value != LayoutSizeKindHelper.GetGridViewItemWidth(UserSettingsService.LayoutSettingsService.GridViewItemSize))
7070
NotifyPropertyChanged(nameof(ItemWidthGridView));
7171
}
7272
}
@@ -164,21 +164,21 @@ private void LayoutSettingsService_PropertyChanged(object? sender, PropertyChang
164164
{
165165
// TODO keep scroll position when changing styles (see details view)
166166

167-
if (e.PropertyName == nameof(ILayoutSettingsService.ItemSizeListView))
167+
if (e.PropertyName == nameof(ILayoutSettingsService.ListViewItemSize))
168168
{
169-
RowHeightListView = LayoutSizeKindHelper.GetListViewRowHeight(UserSettingsService.LayoutSettingsService.ItemSizeListView);
169+
RowHeightListView = LayoutSizeKindHelper.GetListViewRowHeight(UserSettingsService.LayoutSettingsService.ListViewItemSize);
170170
SetItemContainerStyle();
171171
FolderSettings_IconHeightChanged();
172172
}
173-
if (e.PropertyName == nameof(ILayoutSettingsService.ItemSizeTilesView))
173+
if (e.PropertyName == nameof(ILayoutSettingsService.TilesViewItemSize))
174174
{
175-
ItemWidthTilesView = LayoutSizeKindHelper.GetTilesViewItemWidth(UserSettingsService.LayoutSettingsService.ItemSizeTilesView);
175+
ItemWidthTilesView = LayoutSizeKindHelper.GetTilesViewItemWidth(UserSettingsService.LayoutSettingsService.TilesViewItemSize);
176176
SetItemContainerStyle();
177177
FolderSettings_IconHeightChanged();
178178
}
179-
if (e.PropertyName == nameof(ILayoutSettingsService.ItemSizeGridView))
179+
if (e.PropertyName == nameof(ILayoutSettingsService.GridViewItemSize))
180180
{
181-
ItemWidthGridView = LayoutSizeKindHelper.GetGridViewItemWidth(UserSettingsService.LayoutSettingsService.ItemSizeGridView);
181+
ItemWidthGridView = LayoutSizeKindHelper.GetGridViewItemWidth(UserSettingsService.LayoutSettingsService.GridViewItemSize);
182182
SetItemContainerStyle();
183183
FolderSettings_IconHeightChanged();
184184
}
@@ -238,7 +238,7 @@ private void SetItemTemplate()
238238

239239
private void SetItemContainerStyle()
240240
{
241-
if (FolderSettings?.LayoutMode == FolderLayoutModes.ListView && UserSettingsService.LayoutSettingsService.ItemSizeListView == ListViewSizeKind.Compact)
241+
if (FolderSettings?.LayoutMode == FolderLayoutModes.ListView && UserSettingsService.LayoutSettingsService.ListViewItemSize == ListViewSizeKind.Compact)
242242
{
243243
// Toggle style to force item size to update
244244
FileList.ItemContainerStyle = DefaultItemContainerStyle;

0 commit comments

Comments
 (0)