From 39ac82adf1b0b5c4db11b0137f8b13714b084313 Mon Sep 17 00:00:00 2001 From: Thibault Deckers Date: Sun, 21 Jul 2024 12:28:09 +0200 Subject: [PATCH] #1089 fixed collection menu action resolution --- lib/widgets/collection/app_bar.dart | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/widgets/collection/app_bar.dart b/lib/widgets/collection/app_bar.dart index 3efb2070f..d6b019281 100644 --- a/lib/widgets/collection/app_bar.dart +++ b/lib/widgets/collection/app_bar.dart @@ -94,6 +94,11 @@ class _CollectionAppBarState extends State with SingleTickerPr TileLayout.list, ]; + static const _trashSelectionQuickActions = [ + EntrySetAction.delete, + EntrySetAction.restore, + ]; + @override void initState() { super.initState(); @@ -388,7 +393,7 @@ class _CollectionAppBarState extends State with SingleTickerPr final hasSelection = selectedItemCount > 0; final browsingQuickActions = settings.collectionBrowsingQuickActions; - final selectionQuickActions = isTrash ? [EntrySetAction.delete, EntrySetAction.restore] : settings.collectionSelectionQuickActions; + final selectionQuickActions = isTrash ? _trashSelectionQuickActions : settings.collectionSelectionQuickActions; final quickActions = (isSelecting ? selectionQuickActions : browsingQuickActions).take(max(0, availableCount - 1)).toList(); final quickActionButtons = quickActions.where(isVisible).map( (action) => _buildButtonIcon(context, action, enabled: canApply(action), selection: selection), @@ -430,7 +435,7 @@ class _CollectionAppBarState extends State with SingleTickerPr title: context.l10n.collectionActionEdit, items: [ _buildRotateAndFlipMenuItems(context, canApply: canApply), - ...EntrySetActions.edit.where((v) => isVisible(v) && !selectionQuickActions.contains(v)).map((action) => _toMenuItem(action, enabled: canApply(action), selection: selection)), + ...EntrySetActions.edit.where((v) => isVisible(v) && !quickActions.contains(v)).map((action) => _toMenuItem(action, enabled: canApply(action), selection: selection)), ], ), ];