From d5ef98fda064bd628b34c55ab3746461712e9e47 Mon Sep 17 00:00:00 2001 From: 0x5BFA <62196528+0x5bfa@users.noreply.github.com> Date: Sat, 15 Nov 2025 01:21:25 +0900 Subject: [PATCH] Init --- .../Sidebar/SidebarItem.Properties.cs | 134 ++++++------------ .../Sidebar/SidebarItemAutomationPeer.cs | 28 ++-- .../Sidebar/SidebarView.Properties.cs | 119 ++++------------ .../Sidebar/SidebarViewAutomationPeer.cs | 9 +- .../UserControls/SidebarViewModel.cs | 94 ++++++------ 5 files changed, 132 insertions(+), 252 deletions(-) diff --git a/src/Files.App.Controls/Sidebar/SidebarItem.Properties.cs b/src/Files.App.Controls/Sidebar/SidebarItem.Properties.cs index 79a336758fca..4670b0b79611 100644 --- a/src/Files.App.Controls/Sidebar/SidebarItem.Properties.cs +++ b/src/Files.App.Controls/Sidebar/SidebarItem.Properties.cs @@ -1,90 +1,41 @@ // Copyright (c) Files Community // Licensed under the MIT License. +using CommunityToolkit.WinUI; + namespace Files.App.Controls { public sealed partial class SidebarItem : Control { - public SidebarView? Owner - { - get { return (SidebarView?)GetValue(OwnerProperty); } - set { SetValue(OwnerProperty, value); } - } - public static readonly DependencyProperty OwnerProperty = - DependencyProperty.Register(nameof(Owner), typeof(SidebarView), typeof(SidebarItem), new PropertyMetadata(null)); + [GeneratedDependencyProperty] + public partial SidebarView? Owner { get; set; } - public bool IsSelected - { - get { return (bool)GetValue(IsSelectedProperty); } - set { SetValue(IsSelectedProperty, value); } - } - public static readonly DependencyProperty IsSelectedProperty = - DependencyProperty.Register(nameof(IsSelected), typeof(bool), typeof(SidebarItem), new PropertyMetadata(false, OnPropertyChanged)); + [GeneratedDependencyProperty] + public partial bool IsSelected { get; set; } - public bool IsExpanded - { - get { return (bool)GetValue(IsExpandedProperty); } - set { SetValue(IsExpandedProperty, value); } - } - public static readonly DependencyProperty IsExpandedProperty = - DependencyProperty.Register(nameof(IsExpanded), typeof(bool), typeof(SidebarItem), new PropertyMetadata(true, OnPropertyChanged)); + [GeneratedDependencyProperty(DefaultValue = true)] + public partial bool IsExpanded { get; set; } - public bool IsInFlyout - { - get { return (bool)GetValue(IsInFlyoutProperty); } - set { SetValue(IsInFlyoutProperty, value); } - } - public static readonly DependencyProperty IsInFlyoutProperty = - DependencyProperty.Register(nameof(IsInFlyout), typeof(bool), typeof(SidebarItem), new PropertyMetadata(false)); + [GeneratedDependencyProperty] + public partial bool IsInFlyout { get; set; } - public double ChildrenPresenterHeight - { - get { return (double)GetValue(ChildrenPresenterHeightProperty); } - set { SetValue(ChildrenPresenterHeightProperty, value); } - } - // Using 30 as a default in case something goes wrong - public static readonly DependencyProperty ChildrenPresenterHeightProperty = - DependencyProperty.Register(nameof(ChildrenPresenterHeight), typeof(double), typeof(SidebarItem), new PropertyMetadata(30d)); + [GeneratedDependencyProperty(DefaultValue = 30D)] + public partial double ChildrenPresenterHeight { get; set; } - public ISidebarItemModel? Item - { - get { return (ISidebarItemModel)GetValue(ItemProperty); } - set { SetValue(ItemProperty, value); } - } - public static readonly DependencyProperty ItemProperty = - DependencyProperty.Register(nameof(Item), typeof(ISidebarItemModel), typeof(SidebarItem), new PropertyMetadata(null)); + [GeneratedDependencyProperty] + public partial ISidebarItemModel? Item { get; set; } - public bool UseReorderDrop - { - get { return (bool)GetValue(UseReorderDropProperty); } - set { SetValue(UseReorderDropProperty, value); } - } - public static readonly DependencyProperty UseReorderDropProperty = - DependencyProperty.Register(nameof(UseReorderDrop), typeof(bool), typeof(SidebarItem), new PropertyMetadata(false)); + [GeneratedDependencyProperty] + public partial bool UseReorderDrop { get; set; } - public FrameworkElement? Icon - { - get { return (FrameworkElement?)GetValue(IconProperty); } - set { SetValue(IconProperty, value); } - } - public static readonly DependencyProperty IconProperty = - DependencyProperty.Register(nameof(Icon), typeof(FrameworkElement), typeof(SidebarItem), new PropertyMetadata(null)); + [GeneratedDependencyProperty] + public partial FrameworkElement? Icon { get; set; } - public FrameworkElement? Decorator - { - get { return (FrameworkElement?)GetValue(DecoratorProperty); } - set { SetValue(DecoratorProperty, value); } - } - public static readonly DependencyProperty DecoratorProperty = - DependencyProperty.Register(nameof(Decorator), typeof(FrameworkElement), typeof(SidebarItem), new PropertyMetadata(null)); + [GeneratedDependencyProperty] + public partial FrameworkElement? Decorator { get; set; } - public SidebarDisplayMode DisplayMode - { - get { return (SidebarDisplayMode)GetValue(DisplayModeProperty); } - set { SetValue(DisplayModeProperty, value); } - } - public static readonly DependencyProperty DisplayModeProperty = - DependencyProperty.Register(nameof(DisplayMode), typeof(SidebarDisplayMode), typeof(SidebarItem), new PropertyMetadata(SidebarDisplayMode.Expanded, OnPropertyChanged)); + [GeneratedDependencyProperty(DefaultValue = SidebarDisplayMode.Expanded)] + public partial SidebarDisplayMode DisplayMode { get; set; } public static void SetTemplateRoot(DependencyObject target, FrameworkElement value) { @@ -95,31 +46,26 @@ public static FrameworkElement GetTemplateRoot(DependencyObject target) return (FrameworkElement)target.GetValue(TemplateRootProperty); } public static readonly DependencyProperty TemplateRootProperty = - DependencyProperty.Register("TemplateRoot", typeof(FrameworkElement), typeof(FrameworkElement), new PropertyMetadata(null)); + DependencyProperty.Register("TemplateRoot", typeof(FrameworkElement), typeof(SidebarItem), new PropertyMetadata(null)); + + partial void OnIsSelectedPropertyChanged(DependencyPropertyChangedEventArgs e) + { + UpdateSelectionState(); + } + + partial void OnIsExpandedPropertyChanged(DependencyPropertyChangedEventArgs e) + { + UpdateExpansionState(); + } + + partial void OnItemPropertyChanged(DependencyPropertyChangedEventArgs e) + { + HandleItemChange(); + } - public static void OnPropertyChanged(DependencyObject sender, DependencyPropertyChangedEventArgs e) + partial void OnDisplayModePropertyChanged(DependencyPropertyChangedEventArgs e) { - if (sender is not SidebarItem item) return; - if (e.Property == DisplayModeProperty) - { - item.SidebarDisplayModeChanged((SidebarDisplayMode)e.OldValue); - } - else if (e.Property == IsSelectedProperty) - { - item.UpdateSelectionState(); - } - else if (e.Property == IsExpandedProperty) - { - item.UpdateExpansionState(); - } - else if (e.Property == ItemProperty) - { - item.HandleItemChange(); - } - else - { - Debug.Write(e.Property.ToString()); - } + SidebarDisplayModeChanged((SidebarDisplayMode)e.OldValue); } } } diff --git a/src/Files.App.Controls/Sidebar/SidebarItemAutomationPeer.cs b/src/Files.App.Controls/Sidebar/SidebarItemAutomationPeer.cs index 47721f6cc443..f649efa6b937 100644 --- a/src/Files.App.Controls/Sidebar/SidebarItemAutomationPeer.cs +++ b/src/Files.App.Controls/Sidebar/SidebarItemAutomationPeer.cs @@ -15,19 +15,25 @@ public ExpandCollapseState ExpandCollapseState { get { - if (Owner.HasChildren) - return Owner.IsExpanded ? ExpandCollapseState.Expanded : ExpandCollapseState.Collapsed; - return ExpandCollapseState.LeafNode; + return Owner.HasChildren + ? Owner.IsExpanded + ? ExpandCollapseState.Expanded + : ExpandCollapseState.Collapsed + : ExpandCollapseState.LeafNode; } } - public bool IsSelected => Owner.IsSelected; - public IRawElementProviderSimple SelectionContainer => ProviderFromPeer(CreatePeerForElement(Owner.Owner)); + + public bool IsSelected + => Owner.IsSelected; + + public IRawElementProviderSimple SelectionContainer + => ProviderFromPeer(CreatePeerForElement(Owner.Owner)); private new SidebarItem Owner { get; init; } public SidebarItemAutomationPeer(SidebarItem owner) : base(owner) { - this.Owner = owner; + Owner = owner; } protected override AutomationControlType GetAutomationControlTypeCore() @@ -59,18 +65,13 @@ protected override object GetPatternCore(PatternInterface patternInterface) public void Collapse() { if (Owner.CollapseEnabled) - { Owner.IsExpanded = false; - } } public void Expand() { - if (Owner.CollapseEnabled) - { Owner.IsExpanded = true; - } } public void Invoke() @@ -106,13 +107,10 @@ protected override int GetPositionInSetCore() private IList GetOwnerCollection() { if (Owner.FindAscendant() is SidebarItem parent && parent.Item?.Children is IList list) - { return list; - } if (Owner?.Owner is not null && Owner.Owner.ViewModel.SidebarItems is IList items) - { return items; - } + return new List(); } } diff --git a/src/Files.App.Controls/Sidebar/SidebarView.Properties.cs b/src/Files.App.Controls/Sidebar/SidebarView.Properties.cs index 966484265344..5b1b43a3d8cc 100644 --- a/src/Files.App.Controls/Sidebar/SidebarView.Properties.cs +++ b/src/Files.App.Controls/Sidebar/SidebarView.Properties.cs @@ -1,113 +1,56 @@ // Copyright (c) Files Community // Licensed under the MIT License. +using CommunityToolkit.WinUI; + namespace Files.App.Controls { public sealed partial class SidebarView { - public SidebarDisplayMode DisplayMode - { - get { return (SidebarDisplayMode)GetValue(DisplayModeProperty); } - set { SetValue(DisplayModeProperty, value); } - } - public static readonly DependencyProperty DisplayModeProperty = - DependencyProperty.Register(nameof(DisplayMode), typeof(SidebarDisplayMode), typeof(SidebarView), new PropertyMetadata(SidebarDisplayMode.Expanded, OnPropertyChanged)); + [GeneratedDependencyProperty(DefaultValue = SidebarDisplayMode.Expanded)] + public partial SidebarDisplayMode DisplayMode { get; set; } - public UIElement InnerContent - { - get { return (UIElement)GetValue(InnerContentProperty); } - set { SetValue(InnerContentProperty, value); } - } - public static readonly DependencyProperty InnerContentProperty = - DependencyProperty.Register(nameof(InnerContent), typeof(UIElement), typeof(SidebarView), new PropertyMetadata(null)); + [GeneratedDependencyProperty] + public partial UIElement? InnerContent { get; set; } - public UIElement SidebarContent - { - get { return (UIElement)GetValue(SidebarContentProperty); } - set { SetValue(SidebarContentProperty, value); } - } - public static readonly DependencyProperty SidebarContentProperty = - DependencyProperty.Register("SidebarContent", typeof(UIElement), typeof(SidebarView), new PropertyMetadata(null)); + [GeneratedDependencyProperty] + public partial UIElement? SidebarContent { get; set; } - public UIElement Footer - { - get { return (UIElement)GetValue(FooterProperty); } - set { SetValue(FooterProperty, value); } - } - public static readonly DependencyProperty FooterProperty = - DependencyProperty.Register("Footer", typeof(UIElement), typeof(SidebarView), new PropertyMetadata(null)); + [GeneratedDependencyProperty] + public partial UIElement? Footer { get; set; } - public bool IsPaneOpen - { - get { return (bool)GetValue(IsPaneOpenProperty); } - set { SetValue(IsPaneOpenProperty, value); } - } - public static readonly DependencyProperty IsPaneOpenProperty = - DependencyProperty.Register(nameof(IsPaneOpen), typeof(bool), typeof(SidebarView), new PropertyMetadata(false, OnPropertyChanged)); + [GeneratedDependencyProperty] + public partial bool IsPaneOpen { get; set; } - public double OpenPaneLength - { - get { return (double)GetValue(OpenPaneLengthProperty); } - set - { - SetValue(OpenPaneLengthProperty, value); - NegativeOpenPaneLength = -value; - } - } - public static readonly DependencyProperty OpenPaneLengthProperty = - DependencyProperty.Register(nameof(OpenPaneLength), typeof(double), typeof(SidebarView), new PropertyMetadata(240d, OnPropertyChanged)); + [GeneratedDependencyProperty(DefaultValue = 240D)] + public partial double OpenPaneLength { get; set; } - public double NegativeOpenPaneLength - { - get { return (double)GetValue(NegativeOpenPaneLengthProperty); } - set { SetValue(NegativeOpenPaneLengthProperty, value); } - } - public static readonly DependencyProperty NegativeOpenPaneLengthProperty = - DependencyProperty.Register(nameof(NegativeOpenPaneLength), typeof(double), typeof(SidebarView), new PropertyMetadata(null)); + [GeneratedDependencyProperty] + public partial double NegativeOpenPaneLength { get; set; } - public ISidebarViewModel ViewModel - { - get => (ISidebarViewModel)GetValue(ViewModelProperty); - set => SetValue(ViewModelProperty, value); - } - public static readonly DependencyProperty ViewModelProperty = - DependencyProperty.Register(nameof(ViewModel), typeof(ISidebarViewModel), typeof(SidebarView), new PropertyMetadata(null)); + [GeneratedDependencyProperty] + public partial ISidebarViewModel? ViewModel { get; set; } + + [GeneratedDependencyProperty] + public partial ISidebarItemModel? SelectedItem { get; set; } - public ISidebarItemModel SelectedItem + [GeneratedDependencyProperty] + public partial object? MenuItemsSource { get; set; } + + partial void OnDisplayModePropertyChanged(DependencyPropertyChangedEventArgs e) { - get => (ISidebarItemModel)GetValue(SelectedItemProperty); - set - { - SetValue(SelectedItemProperty, value); - } + UpdateDisplayMode(); } - public static readonly DependencyProperty SelectedItemProperty = - DependencyProperty.Register(nameof(SelectedItem), typeof(ISidebarItemModel), typeof(SidebarView), new PropertyMetadata(null)); - public object MenuItemsSource + partial void OnIsPaneOpenPropertyChanged(DependencyPropertyChangedEventArgs e) { - get => (object)GetValue(MenuItemsSourceProperty); - set => SetValue(MenuItemsSourceProperty, value); + UpdateMinimalMode(); } - public static readonly DependencyProperty MenuItemsSourceProperty = - DependencyProperty.Register(nameof(MenuItemsSource), typeof(object), typeof(SidebarView), new PropertyMetadata(null)); - public static void OnPropertyChanged(DependencyObject sender, DependencyPropertyChangedEventArgs e) + partial void OnOpenPaneLengthPropertyChanged(DependencyPropertyChangedEventArgs e) { - if (sender is not SidebarView control) return; - - if (e.Property == OpenPaneLengthProperty) - { - control.UpdateOpenPaneLengthColumn(); - } - else if (e.Property == DisplayModeProperty) - { - control.UpdateDisplayMode(); - } - else if (e.Property == IsPaneOpenProperty) - { - control.UpdateMinimalMode(); - } + NegativeOpenPaneLength = -(double)(e.NewValue); + UpdateOpenPaneLengthColumn(); } } } diff --git a/src/Files.App.Controls/Sidebar/SidebarViewAutomationPeer.cs b/src/Files.App.Controls/Sidebar/SidebarViewAutomationPeer.cs index 94c98558942e..f155dd2e9bfc 100644 --- a/src/Files.App.Controls/Sidebar/SidebarViewAutomationPeer.cs +++ b/src/Files.App.Controls/Sidebar/SidebarViewAutomationPeer.cs @@ -21,19 +21,16 @@ public SidebarViewAutomationPeer(SidebarView owner) : base(owner) protected override object GetPatternCore(PatternInterface patternInterface) { if (patternInterface == PatternInterface.Selection) - { return this; - } + return base.GetPatternCore(patternInterface); } public IRawElementProviderSimple[] GetSelection() { if (Owner.SelectedItemContainer != null) - return - [ - ProviderFromPeer(CreatePeerForElement(Owner.SelectedItemContainer)) - ]; + return [ProviderFromPeer(CreatePeerForElement(Owner.SelectedItemContainer))]; + return []; } } diff --git a/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs b/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs index 6c07f8ea1d20..b391ddba952c 100644 --- a/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs +++ b/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs @@ -21,11 +21,21 @@ namespace Files.App.ViewModels.UserControls { public sealed partial class SidebarViewModel : ObservableObject, IDisposable, ISidebarViewModel { - private INetworkService NetworkService { get; } = Ioc.Default.GetRequiredService(); - private IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetRequiredService(); - private ICommandManager Commands { get; } = Ioc.Default.GetRequiredService(); + // Dependency Injection + + private readonly INetworkService NetworkService = Ioc.Default.GetRequiredService(); + private readonly IUserSettingsService UserSettingsService = Ioc.Default.GetRequiredService(); + private readonly ICommandManager Commands = Ioc.Default.GetRequiredService(); private readonly DrivesViewModel drivesViewModel = Ioc.Default.GetRequiredService(); - private readonly IFileTagsService fileTagsService; + private readonly IFileTagsService fileTagsService = Ioc.Default.GetRequiredService(); + private readonly IQuickAccessService QuickAccessService = Ioc.Default.GetRequiredService(); + + // Fields + + private readonly Microsoft.UI.Dispatching.DispatcherQueue _dispatcherQueue = Microsoft.UI.Dispatching.DispatcherQueue.GetForCurrentThread(); + private INavigationControlItem _rightClickedItem; + + // Properties private IShellPanesPage paneHolder; public IShellPanesPage PaneHolder @@ -34,18 +44,16 @@ public IShellPanesPage PaneHolder set => SetProperty(ref paneHolder, value); } - public MenuFlyout PaneFlyout; + public MenuFlyout PaneFlyout { get; set; } public IFilesystemHelpers FilesystemHelpers => PaneHolder?.FilesystemHelpers; - private Microsoft.UI.Dispatching.DispatcherQueue dispatcherQueue; - private INavigationControlItem rightClickedItem; public object SidebarItems => sidebarItems; - public BulkConcurrentObservableCollection sidebarItems { get; init; } + public BulkConcurrentObservableCollection sidebarItems { get; init; } = []; + public PinnedFoldersManager SidebarPinnedModel => App.QuickAccessManager.Model; - public IQuickAccessService QuickAccessService { get; } = Ioc.Default.GetRequiredService(); private SidebarDisplayMode sidebarDisplayMode; public SidebarDisplayMode SidebarDisplayMode @@ -236,14 +244,23 @@ public INavigationControlItem SidebarSelectedItem set => SetProperty(ref selectedSidebarItem, value); } + // Commands + + private ICommand CreateLibraryCommand = new AsyncRelayCommand(LibraryManager.ShowCreateNewLibraryDialogAsync); + private ICommand RestoreLibrariesCommand = new AsyncRelayCommand(LibraryManager.ShowRestoreDefaultLibrariesDialogAsync); + private ICommand HideSectionCommand; + private ICommand PinItemCommand; + private ICommand UnpinItemCommand; + private ICommand EjectDeviceCommand; + private ICommand OpenPropertiesCommand; + private ICommand ReorderItemsCommand; + + // Constructor + public SidebarViewModel() { - dispatcherQueue = Microsoft.UI.Dispatching.DispatcherQueue.GetForCurrentThread(); - fileTagsService = Ioc.Default.GetRequiredService(); - - sidebarItems = []; UserSettingsService.OnSettingChangedEvent += UserSettingsService_OnSettingChangedEvent; - CreateItemHomeAsync(); + CreateSectionAsync(SectionType.Home); Manager_DataChanged(SectionType.Pinned, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset)); Manager_DataChanged(SectionType.Library, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset)); @@ -270,14 +287,9 @@ public SidebarViewModel() ReorderItemsCommand = new AsyncRelayCommand(ReorderItemsAsync); } - private Task CreateItemHomeAsync() - { - return CreateSectionAsync(SectionType.Home); - } - private async void Manager_DataChanged(object sender, NotifyCollectionChangedEventArgs e) { - await dispatcherQueue.EnqueueOrInvokeAsync(async () => + await _dispatcherQueue.EnqueueOrInvokeAsync(async () => { var sectionType = (SectionType)sender; var section = await GetOrCreateSectionAsync(sectionType); @@ -731,7 +743,7 @@ public async void HandleItemContextInvokedAsync(object sender, ItemContextInvoke SelectedTagChanged?.Invoke(this, new SelectedTagChangedEventArgs(items)); } - rightClickedItem = item; + _rightClickedItem = item; RightClickedItemChanged?.Invoke(this, item); var itemContextMenuFlyout = new CommandBarFlyout() @@ -762,7 +774,7 @@ private async void ItemContextMenuFlyout_Opened(object? sender, object e) return; itemContextMenuFlyout.Opened -= ItemContextMenuFlyout_Opened; - await ShellContextFlyoutFactory.LoadShellMenuItemsAsync(rightClickedItem.Path, itemContextMenuFlyout, rightClickedItem.MenuOptions); + await ShellContextFlyoutFactory.LoadShellMenuItemsAsync(_rightClickedItem.Path, itemContextMenuFlyout, _rightClickedItem.MenuOptions); } public async void HandleItemInvokedAsync(object item, PointerUpdateKind pointerUpdateKind) @@ -835,36 +847,20 @@ public async void HandleItemInvokedAsync(object item, PointerUpdateKind pointerU shellPage.NavigateToPath(navigationPath, sourcePageType); } - public readonly ICommand CreateLibraryCommand = new AsyncRelayCommand(LibraryManager.ShowCreateNewLibraryDialogAsync); - - public readonly ICommand RestoreLibrariesCommand = new AsyncRelayCommand(LibraryManager.ShowRestoreDefaultLibrariesDialogAsync); - - private ICommand HideSectionCommand { get; } - - private ICommand PinItemCommand { get; } - - private ICommand UnpinItemCommand { get; } - - private ICommand EjectDeviceCommand { get; } - - private ICommand OpenPropertiesCommand { get; } - - private ICommand ReorderItemsCommand { get; } - private void PinItem() { - if (rightClickedItem is DriveItem) - _ = QuickAccessService.PinToSidebarAsync(new[] { rightClickedItem.Path }); + if (_rightClickedItem is DriveItem) + _ = QuickAccessService.PinToSidebarAsync(new[] { _rightClickedItem.Path }); } private void UnpinItem() { - if (rightClickedItem.Section == SectionType.Pinned || rightClickedItem is DriveItem) - _ = QuickAccessService.UnpinFromSidebarAsync(rightClickedItem.Path); + if (_rightClickedItem.Section == SectionType.Pinned || _rightClickedItem is DriveItem) + _ = QuickAccessService.UnpinFromSidebarAsync(_rightClickedItem.Path); } private void HideSection() { - switch (rightClickedItem.Section) + switch (_rightClickedItem.Section) { case SectionType.Pinned: UserSettingsService.GeneralSettingsService.ShowPinnedSection = false; @@ -903,11 +899,11 @@ private void OpenProperties(CommandBarFlyout menu) flyoutClosed = async (s, e) => { menu.Closed -= flyoutClosed; - if (rightClickedItem is DriveItem) - FilePropertiesHelpers.OpenPropertiesWindow(rightClickedItem, PaneHolder.ActivePane); - else if (rightClickedItem is LibraryLocationItem library) + if (_rightClickedItem is DriveItem) + FilePropertiesHelpers.OpenPropertiesWindow(_rightClickedItem, PaneHolder.ActivePane); + else if (_rightClickedItem is LibraryLocationItem library) FilePropertiesHelpers.OpenPropertiesWindow(new LibraryItem(library), PaneHolder.ActivePane); - else if (rightClickedItem is LocationItem locationItem) + else if (_rightClickedItem is LocationItem locationItem) { var listedItem = new ListedItem(null!) { @@ -935,7 +931,7 @@ private void OpenProperties(CommandBarFlyout menu) private void EjectDevice() { - DriveHelpers.EjectDeviceAsync(rightClickedItem.Path); + DriveHelpers.EjectDeviceAsync(_rightClickedItem.Path); } private List GetLocationItemMenuItems(INavigationControlItem item, CommandBarFlyout menu) @@ -1018,7 +1014,7 @@ private List GetLocationItemMenuItems(INavigatio }, new ContextMenuFlyoutItemViewModel() { - Text = string.Format(Strings.SideBarHideSectionFromSideBar_Text.GetLocalizedResource(), rightClickedItem.Text), + Text = string.Format(Strings.SideBarHideSectionFromSideBar_Text.GetLocalizedResource(), _rightClickedItem.Text), Glyph = "\uE77A", Command = HideSectionCommand, ShowItem = options.ShowHideSection