#1095fixed removing deactivated hidden item

This commit is contained in:
Thibault Deckers 2024-07-24 20:12:27 +02:00
parent afc09e2ab4
commit 39bb9251dc
2 changed files with 16 additions and 7 deletions

View file

@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
## <a id="unreleased"></a>[Unreleased] ## <a id="unreleased"></a>[Unreleased]
### Added
- Viewer: display more items in tag/copy/move quick action choosers
## <a id="v1.11.8"></a>[v1.11.8] - 2024-07-19 ## <a id="v1.11.8"></a>[v1.11.8] - 2024-07-19
### Added ### Added

View file

@ -9,17 +9,18 @@ mixin PrivacySettings on SettingsAccess, SearchSettings {
set hiddenFilters(Set<CollectionFilter> newValue) => set(SettingKeys.hiddenFiltersKey, newValue.map((filter) => filter.toJson()).toList()); set hiddenFilters(Set<CollectionFilter> newValue) => set(SettingKeys.hiddenFiltersKey, newValue.map((filter) => filter.toJson()).toList());
void changeFilterVisibility(Set<CollectionFilter> filters, bool visible) { void changeFilterVisibility(Set<CollectionFilter> filters, bool visible) {
final _deactivatedHiddenFilters = deactivatedHiddenFilters;
final _hiddenFilters = hiddenFilters; final _hiddenFilters = hiddenFilters;
_deactivatedHiddenFilters.removeAll(filters);
if (visible) { if (visible) {
_hiddenFilters.removeAll(filters); _hiddenFilters.removeAll(filters);
} else { } else {
_hiddenFilters.addAll(filters); _hiddenFilters.addAll(filters);
searchHistory = searchHistory..removeWhere(filters.contains); searchHistory = searchHistory..removeWhere(filters.contains);
final _deactivatedHiddenFilters = deactivatedHiddenFilters;
_deactivatedHiddenFilters.removeAll(filters);
deactivatedHiddenFilters = _deactivatedHiddenFilters;
} }
deactivatedHiddenFilters = _deactivatedHiddenFilters;
hiddenFilters = _hiddenFilters; hiddenFilters = _hiddenFilters;
} }
@ -29,14 +30,18 @@ mixin PrivacySettings on SettingsAccess, SearchSettings {
void activateHiddenFilter(CollectionFilter filter, bool active) { void activateHiddenFilter(CollectionFilter filter, bool active) {
final _deactivatedHiddenFilters = deactivatedHiddenFilters; final _deactivatedHiddenFilters = deactivatedHiddenFilters;
final _hiddenFilters = hiddenFilters;
if (active) { if (active) {
_deactivatedHiddenFilters.remove(filter); _deactivatedHiddenFilters.remove(filter);
_hiddenFilters.add(filter);
searchHistory = searchHistory..remove(filter);
} else { } else {
_deactivatedHiddenFilters.add(filter); _deactivatedHiddenFilters.add(filter);
_hiddenFilters.remove(filter);
} }
deactivatedHiddenFilters = _deactivatedHiddenFilters;
final visible = !active; deactivatedHiddenFilters = _deactivatedHiddenFilters;
changeFilterVisibility({filter}, visible); hiddenFilters = _hiddenFilters;
} }
} }