Skip to content

Code Quality: Properly dispose events in layout pages #17437

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
Aug 13, 2025
Merged

Code Quality: Properly dispose events in layout pages #17437

Show file tree
Hide file tree
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
13 changes: 10 additions & 3 deletions src/Files.App/Views/Layouts/DetailsLayoutPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ public sealed partial class DetailsLayoutPage : BaseGroupableLayoutPage
/// </summary>
private uint currentIconSize;

private RectangleSelection? _rectangleSelection;

// Properties

protected override ListViewBase ListViewBase => FileList;
Expand Down Expand Up @@ -77,8 +79,8 @@ public DetailsLayoutPage() : base()
{
InitializeComponent();
DataContext = this;
var selectionRectangle = RectangleSelection.Create(FileList, SelectionRectangle, FileList_SelectionChanged);
selectionRectangle.SelectionEnded += SelectionRectangle_SelectionEnded;
_rectangleSelection = RectangleSelection.Create(FileList, SelectionRectangle, FileList_SelectionChanged);
_rectangleSelection.SelectionEnded += SelectionRectangle_SelectionEnded;

UpdateSortOptionsCommand = new RelayCommand<string>(x =>
{
Expand Down Expand Up @@ -202,6 +204,11 @@ protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
FolderSettings.SortOptionPreferenceUpdated -= FolderSettings_SortOptionPreferenceUpdated;
ParentShellPageInstance.ShellViewModel.PageTypeUpdated -= FilesystemViewModel_PageTypeUpdated;
UserSettingsService.LayoutSettingsService.PropertyChanged -= LayoutSettingsService_PropertyChanged;
if (_rectangleSelection is not null)
{
_rectangleSelection.SelectionEnded -= SelectionRectangle_SelectionEnded;
_rectangleSelection = null;
}
}

private void LayoutSettingsService_PropertyChanged(object? sender, PropertyChangedEventArgs e)
Expand Down Expand Up @@ -1053,4 +1060,4 @@ private static GitProperties GetEnabledGitProperties(ColumnsViewModel columnsVie
};
}
}
}
}
14 changes: 11 additions & 3 deletions src/Files.App/Views/Layouts/GridLayoutPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ public sealed partial class GridLayoutPage : BaseGroupableLayoutPage

private volatile bool shouldSetVerticalScrollMode;

private RectangleSelection? _rectangleSelection;

// Properties

public ScrollViewer? ContentScroller { get; private set; }
Expand Down Expand Up @@ -149,8 +151,8 @@ public GridLayoutPage() : base()
InitializeComponent();
DataContext = this;

var selectionRectangle = RectangleSelection.Create(ListViewBase, SelectionRectangle, FileList_SelectionChanged);
selectionRectangle.SelectionEnded += SelectionRectangle_SelectionEnded;
_rectangleSelection = RectangleSelection.Create(ListViewBase, SelectionRectangle, FileList_SelectionChanged);
_rectangleSelection.SelectionEnded += SelectionRectangle_SelectionEnded;
}

// Methods
Expand Down Expand Up @@ -222,6 +224,12 @@ protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
FolderSettings.LayoutModeChangeRequested -= FolderSettings_LayoutModeChangeRequested;

UserSettingsService.LayoutSettingsService.PropertyChanged -= LayoutSettingsService_PropertyChanged;

if (_rectangleSelection is not null)
{
_rectangleSelection.SelectionEnded -= SelectionRectangle_SelectionEnded;
_rectangleSelection = null;
}
}

private void LayoutSettingsService_PropertyChanged(object? sender, PropertyChangedEventArgs e)
Expand Down Expand Up @@ -827,4 +835,4 @@ private void UpdateCheckboxVisibility(object sender, bool isPointerOver)
}
}
}
}
}
Loading