Skip to content

Code Quality: Improved Shelf pane #17069

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Code Quality: Improved Shelf pane #17069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33d95ad
Code Quality: Fixed Shelf context menu
yaira2 Apr 24, 2025
c9f3fd5
Clear file selection when selecting item in the pane
yaira2 Apr 25, 2025
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
12 changes: 2 additions & 10 deletions src/Files.App/UserControls/Pane/ShelfPane.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,10 @@
Padding="8,4,8,4"
CanDragItems="True"
DragItemsStarting="ListView_DragItemsStarting"
GotFocus="ShelfItemsList_GotFocus"
ItemContainerTransitions="{x:Null}"
ItemsSource="{x:Bind ItemsSource, Mode=OneWay}"
RightTapped="ShelfItemsList_RightTapped"
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.VerticalScrollMode="Auto"
SelectionMode="Extended">
Expand All @@ -126,16 +128,6 @@
TextTrimming="CharacterEllipsis"
TextWrapping="NoWrap"
ToolTipService.ToolTip="{x:Bind Path, Mode=OneWay}" />

<Grid.ContextFlyout>
<MenuFlyout>
<MenuFlyoutItem Command="{x:Bind RemoveCommand}" Text="{helpers:ResourceString Name=RemoveFromShelf}">
<MenuFlyoutItem.Icon>
<FontIcon Glyph="&#xE738;" />
</MenuFlyoutItem.Icon>
</MenuFlyoutItem>
</MenuFlyout>
</Grid.ContextFlyout>
</Grid>
</DataTemplate>
</ListView.ItemTemplate>
Expand Down
35 changes: 35 additions & 0 deletions src/Files.App/UserControls/Pane/ShelfPane.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,32 @@ private void ListView_DragItemsStarting(object sender, DragItemsStartingEventArg
dataObjectProvider.SetDataObject(ppDataObject);
}

private void ShelfItemsList_RightTapped(object sender, Microsoft.UI.Xaml.Input.RightTappedRoutedEventArgs e)
{
if (e.OriginalSource is not Microsoft.UI.Xaml.FrameworkElement widgetCardItem ||
widgetCardItem.DataContext is not ShelfItem item ||
item.Path is null)
return;

var menuFlyout = new MenuFlyout();

menuFlyout.Items.Add (new MenuFlyoutItem
{
Text = Strings.RemoveFromShelf.GetLocalizedResource(),
Icon = new FontIcon { Glyph = "\uE738" },
Command = new RelayCommand(item.Remove)
});

menuFlyout.ShowAt(widgetCardItem);
e.Handled = true;
}

private void ShelfItemsList_GotFocus(object sender, RoutedEventArgs e)
{
if (ItemFocusedCommand is not null)
ItemFocusedCommand.Execute(null);
}

public ObservableCollection<ShelfItem>? ItemsSource
{
get => (ObservableCollection<ShelfItem>?)GetValue(ItemsSourceProperty);
Expand All @@ -101,5 +127,14 @@ public ICommand? ClearCommand
}
public static readonly DependencyProperty ClearCommandProperty =
DependencyProperty.Register(nameof(ClearCommand), typeof(ICommand), typeof(ShelfPane), new PropertyMetadata(null));

public ICommand? ItemFocusedCommand
{
get => (ICommand?)GetValue(ItemFocusedCommandProperty);
set => SetValue(ItemFocusedCommandProperty, value);
}
public static readonly DependencyProperty ItemFocusedCommandProperty =
DependencyProperty.Register(nameof(ItemFocusedCommand), typeof(ICommand), typeof(ShelfPane), new PropertyMetadata(null));

}
}
1 change: 1 addition & 0 deletions src/Files.App/Views/MainPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,7 @@
Margin="4,0,0,8"
x:Load="{x:Bind ViewModel.ShowShelfPane, Mode=OneWay}"
ClearCommand="{x:Bind ViewModel.ShelfViewModel.ClearItemsCommand}"
ItemFocusedCommand="{x:Bind Commands.ClearSelection, Mode=OneWay}"
ItemsSource="{x:Bind ViewModel.ShelfViewModel.Items}" />
</Grid>
</controls:SidebarView.InnerContent>
Expand Down
Loading