Fix VDS filters not applying after refresh (#5662)
Some checks are pending
Build Desktop / Configure (push) Waiting to run
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (Debian, DEB, 12) (push) Blocked by required conditions
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (Debian, DEB, skip, 11) (push) Blocked by required conditions
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (Fedora, RPM, 41) (push) Blocked by required conditions
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (Fedora, RPM, skip, 40) (push) Blocked by required conditions
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (Ubuntu, DEB, 24.04) (push) Blocked by required conditions
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (Ubuntu, DEB, skip, 20.04) (push) Blocked by required conditions
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (Ubuntu, DEB, skip, 22.04) (push) Blocked by required conditions
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (yes, Arch, skip) (push) Blocked by required conditions
Build Desktop / macOS ${{matrix.target}}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }} (3, 1, macos-14, Apple, 14, Release, 15.4) (push) Blocked by required conditions
Build Desktop / macOS ${{matrix.target}}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }} (3, 1, macos-15, Apple, 15, Release, 16.2) (push) Blocked by required conditions
Build Desktop / macOS ${{matrix.target}}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }} (3, macos-15, Apple, 15, Debug, 16.2) (push) Blocked by required conditions
Build Desktop / macOS ${{matrix.target}}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }} (4, 1, macos-13, Intel, 13, Release, 14.3.1) (push) Blocked by required conditions
Build Desktop / Windows ${{matrix.target}} (msvc2019_64, 5.15.*, 7) (push) Blocked by required conditions
Build Desktop / Windows ${{matrix.target}} (msvc2019_64, qtimageformats qtmultimedia qtwebsockets, 6.6.*, 10) (push) Blocked by required conditions

* reapply sort and filters after each reset

* fix unflatten folder still not applying afterwards
This commit is contained in:
RickyRister
2025-03-04 16:57:28 -08:00
committed by GitHub
parent ecbdd32a2d
commit 08bb18cefe
4 changed files with 17 additions and 8 deletions

View File

@@ -105,10 +105,7 @@ void DeckPreviewWidget::initializeUi(const bool deckLoadSuccess)
void DeckPreviewWidget::updateVisibility()
{
if (isVisible() != checkVisibility()) {
setHidden(!checkVisibility());
emit visibilityUpdated();
}
setHidden(!checkVisibility());
}
bool DeckPreviewWidget::checkVisibility() const

View File

@@ -43,7 +43,6 @@ public:
signals:
void deckLoadRequested(const QString &filePath);
void openDeckEditor(const DeckLoader *deck);
void visibilityUpdated();
public slots:
void setFilePath(const QString &filePath);

View File

@@ -164,6 +164,17 @@ void VisualDeckStorageWidget::retranslateUi()
searchFolderNamesCheckBox->setText(tr("Include Folder Names in Search"));
}
/**
* Reapplies all sort and filter options by calling the appropriate update methods.
*/
void VisualDeckStorageWidget::reapplySortAndFilters()
{
updateSortOrder();
updateTagFilter();
updateColorFilter();
updateSearchFilter();
}
void VisualDeckStorageWidget::createRootFolderWidget()
{
folderWidget = new VisualDeckStorageFolderDisplayWidget(this, this, SettingsCache::instance().getDeckPath(), false,
@@ -172,14 +183,14 @@ void VisualDeckStorageWidget::createRootFolderWidget()
scrollArea->setWidget(folderWidget); // this automatically destroys the old folderWidget
scrollArea->widget()->setMaximumWidth(scrollArea->viewport()->width());
scrollArea->widget()->adjustSize();
updateSortOrder();
reapplySortAndFilters();
}
void VisualDeckStorageWidget::updateShowFolders(bool enabled)
{
if (folderWidget) {
folderWidget->updateShowFolders(enabled);
updateSortOrder();
reapplySortAndFilters();
}
}
@@ -227,4 +238,4 @@ void VisualDeckStorageWidget::updateTagsVisibility(const bool visible)
} else {
tagFilterWidget->setHidden(true);
}
}
}

View File

@@ -66,6 +66,8 @@ private:
QCheckBox *searchFolderNamesCheckBox;
QScrollArea *scrollArea;
VisualDeckStorageFolderDisplayWidget *folderWidget;
void reapplySortAndFilters();
};
#endif // VISUAL_DECK_STORAGE_WIDGET_H