Skip to content

Fix: Fixed an issue where changing the layout size wouldn't work in the adaptive layout #15853

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 24, 2024
Merged

Fix: Fixed an issue where changing the layout size wouldn't work in the adaptive layout #15853

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 26 additions & 44 deletions src/Files.App/Actions/Display/LayoutAction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,6 @@ protected virtual void OnContextChanged(string propertyName)
internal sealed class LayoutDecreaseSizeAction : ObservableObject, IAction
{
private static readonly IUserSettingsService UserSettingsService = Ioc.Default.GetRequiredService<IUserSettingsService>();
private readonly IDisplayPageContext DisplayPageContext = Ioc.Default.GetRequiredService<IDisplayPageContext>();
private readonly IContentPageContext ContentPageContext = Ioc.Default.GetRequiredService<IContentPageContext>();

public string Label
Expand All @@ -188,15 +187,15 @@ public HotKey MediaHotKey

public bool IsExecutable =>
ContentPageContext.PageType is not ContentPageTypes.Home &&
((DisplayPageContext.LayoutType == LayoutTypes.Details && UserSettingsService.LayoutSettingsService.DetailsViewSize > DetailsViewSizeKind.Compact) ||
(DisplayPageContext.LayoutType == LayoutTypes.List && UserSettingsService.LayoutSettingsService.ListViewSize > ListViewSizeKind.Compact) ||
(DisplayPageContext.LayoutType == LayoutTypes.Grid && UserSettingsService.LayoutSettingsService.GridViewSize > GridViewSizeKind.Small) ||
(DisplayPageContext.LayoutType == LayoutTypes.Columns && UserSettingsService.LayoutSettingsService.ColumnsViewSize > ColumnsViewSizeKind.Compact));
ContentPageContext.ShellPage?.InstanceViewModel.FolderSettings.LayoutMode is FolderLayoutModes layoutMode &&
((layoutMode is FolderLayoutModes.DetailsView && UserSettingsService.LayoutSettingsService.DetailsViewSize > DetailsViewSizeKind.Compact) ||
(layoutMode is FolderLayoutModes.ListView && UserSettingsService.LayoutSettingsService.ListViewSize > ListViewSizeKind.Compact) ||
(layoutMode is FolderLayoutModes.GridView && UserSettingsService.LayoutSettingsService.GridViewSize > GridViewSizeKind.Small) ||
(layoutMode is FolderLayoutModes.ColumnView && UserSettingsService.LayoutSettingsService.ColumnsViewSize > ColumnsViewSizeKind.Compact));

public LayoutDecreaseSizeAction()
{
ContentPageContext.PropertyChanged += ContentPageContext_PropertyChanged;
DisplayPageContext.PropertyChanged += DisplayPageContext_PropertyChanged;
UserSettingsService.LayoutSettingsService.PropertyChanged += UserSettingsService_PropertyChanged;
}

Expand All @@ -210,16 +209,6 @@ private void ContentPageContext_PropertyChanged(object? sender, PropertyChangedE
}
}

private void DisplayPageContext_PropertyChanged(object? sender, PropertyChangedEventArgs e)
{
switch (e.PropertyName)
{
case nameof(IDisplayPageContext.LayoutType):
OnPropertyChanged(nameof(IsExecutable));
break;
}
}

private void UserSettingsService_PropertyChanged(object? sender, PropertyChangedEventArgs e)
{
switch (e.PropertyName)
Expand All @@ -235,26 +224,28 @@ private void UserSettingsService_PropertyChanged(object? sender, PropertyChanged

public Task ExecuteAsync(object? parameter = null)
{
switch (DisplayPageContext.LayoutType)
switch (ContentPageContext.ShellPage?.InstanceViewModel.FolderSettings.LayoutMode)
{
case LayoutTypes.Details:
case FolderLayoutModes.DetailsView:
if (UserSettingsService.LayoutSettingsService.DetailsViewSize > DetailsViewSizeKind.Compact)
UserSettingsService.LayoutSettingsService.DetailsViewSize -= 1;
break;
case LayoutTypes.List:
case FolderLayoutModes.ListView:
if (UserSettingsService.LayoutSettingsService.ListViewSize > ListViewSizeKind.Compact)
UserSettingsService.LayoutSettingsService.ListViewSize -= 1;
break;
case LayoutTypes.Tiles:
case FolderLayoutModes.TilesView:
break;
case LayoutTypes.Grid:
case FolderLayoutModes.GridView:
if (UserSettingsService.LayoutSettingsService.GridViewSize > GridViewSizeKind.Small)
UserSettingsService.LayoutSettingsService.GridViewSize -= 1;
break;
case LayoutTypes.Columns:
case FolderLayoutModes.ColumnView:
if (UserSettingsService.LayoutSettingsService.ColumnsViewSize > ColumnsViewSizeKind.Compact)
UserSettingsService.LayoutSettingsService.ColumnsViewSize -= 1;
break;
default:
break;
}

return Task.CompletedTask;
Expand All @@ -264,7 +255,6 @@ public Task ExecuteAsync(object? parameter = null)
internal sealed class LayoutIncreaseSizeAction : ObservableObject, IAction
{
private static readonly IUserSettingsService UserSettingsService = Ioc.Default.GetRequiredService<IUserSettingsService>();
private readonly IDisplayPageContext DisplayPageContext = Ioc.Default.GetRequiredService<IDisplayPageContext>();
private readonly IContentPageContext ContentPageContext = Ioc.Default.GetRequiredService<IContentPageContext>();

public string Label
Expand All @@ -281,15 +271,15 @@ public HotKey MediaHotKey

public bool IsExecutable =>
ContentPageContext.PageType is not ContentPageTypes.Home &&
((DisplayPageContext.LayoutType == LayoutTypes.Details && UserSettingsService.LayoutSettingsService.DetailsViewSize < DetailsViewSizeKind.ExtraLarge) ||
(DisplayPageContext.LayoutType == LayoutTypes.List && UserSettingsService.LayoutSettingsService.ListViewSize < ListViewSizeKind.ExtraLarge) ||
(DisplayPageContext.LayoutType == LayoutTypes.Grid && UserSettingsService.LayoutSettingsService.GridViewSize < GridViewSizeKind.ExtraLarge) ||
(DisplayPageContext.LayoutType == LayoutTypes.Columns && UserSettingsService.LayoutSettingsService.ColumnsViewSize < ColumnsViewSizeKind.ExtraLarge));
ContentPageContext.ShellPage?.InstanceViewModel.FolderSettings.LayoutMode is FolderLayoutModes layoutMode &&
((layoutMode is FolderLayoutModes.DetailsView && UserSettingsService.LayoutSettingsService.DetailsViewSize < DetailsViewSizeKind.ExtraLarge) ||
(layoutMode is FolderLayoutModes.ListView && UserSettingsService.LayoutSettingsService.ListViewSize < ListViewSizeKind.ExtraLarge) ||
(layoutMode is FolderLayoutModes.GridView && UserSettingsService.LayoutSettingsService.GridViewSize < GridViewSizeKind.ExtraLarge) ||
(layoutMode is FolderLayoutModes.ColumnView && UserSettingsService.LayoutSettingsService.ColumnsViewSize < ColumnsViewSizeKind.ExtraLarge));

public LayoutIncreaseSizeAction()
{
ContentPageContext.PropertyChanged += ContentPageContext_PropertyChanged;
DisplayPageContext.PropertyChanged += DisplayPageContext_PropertyChanged;
UserSettingsService.LayoutSettingsService.PropertyChanged += UserSettingsService_PropertyChanged;
}

Expand All @@ -303,16 +293,6 @@ private void ContentPageContext_PropertyChanged(object? sender, PropertyChangedE
}
}

private void DisplayPageContext_PropertyChanged(object? sender, PropertyChangedEventArgs e)
{
switch (e.PropertyName)
{
case nameof(IDisplayPageContext.LayoutType):
OnPropertyChanged(nameof(IsExecutable));
break;
}
}

private void UserSettingsService_PropertyChanged(object? sender, PropertyChangedEventArgs e)
{
switch (e.PropertyName)
Expand All @@ -328,26 +308,28 @@ private void UserSettingsService_PropertyChanged(object? sender, PropertyChanged

public Task ExecuteAsync(object? parameter = null)
{
switch (DisplayPageContext.LayoutType)
switch (ContentPageContext.ShellPage?.InstanceViewModel.FolderSettings.LayoutMode)
{
case LayoutTypes.Details:
case FolderLayoutModes.DetailsView:
if (UserSettingsService.LayoutSettingsService.DetailsViewSize < DetailsViewSizeKind.ExtraLarge)
UserSettingsService.LayoutSettingsService.DetailsViewSize += 1;
break;
case LayoutTypes.List:
case FolderLayoutModes.ListView:
if (UserSettingsService.LayoutSettingsService.ListViewSize < ListViewSizeKind.ExtraLarge)
UserSettingsService.LayoutSettingsService.ListViewSize += 1;
break;
case LayoutTypes.Tiles:
case FolderLayoutModes.TilesView:
break;
case LayoutTypes.Grid:
case FolderLayoutModes.GridView:
if (UserSettingsService.LayoutSettingsService.GridViewSize < GridViewSizeKind.ExtraLarge)
UserSettingsService.LayoutSettingsService.GridViewSize += 1;
break;
case LayoutTypes.Columns:
case FolderLayoutModes.ColumnView:
if (UserSettingsService.LayoutSettingsService.ColumnsViewSize < ColumnsViewSizeKind.ExtraLarge)
UserSettingsService.LayoutSettingsService.ColumnsViewSize += 1;
break;
default:
break;
}

return Task.CompletedTask;
Expand Down