RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 15:07:45 +00:00
Code Issues Activity Actions

LibGUI: Reverse FilteringProxyModel update propagation flow

Browse source 
FilteringProxyModel is a narrowing projection of its parent model with
a filter applied. That means that updates of FilteringProxyModel should
not propagate to its parent model, but the opposite - updates happening
in the parent model should "trickle down" and trigger an update of the
filtering model.
This commit is contained in:
Vyacheslav Pukhanov 2021-11-23 21:13:54 +03:00 • committed by Andreas Kling
parent 781bc67a96
commit 2189cc6bf1
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Userland/Libraries/LibGUI/FilteringProxyModel.cpp
View file

@ -46,7 +46,6 @@ Variant FilteringProxyModel::data(ModelIndex const& index, ModelRole role) const
void FilteringProxyModel::invalidate() void FilteringProxyModel::invalidate()
{ {
m_model.invalidate();
filter(); filter();
did_update(); did_update();
} }

12
Userland/Libraries/LibGUI/FilteringProxyModel.h
View file

@ -14,14 +14,18 @@
namespace GUI { namespace GUI {
class FilteringProxyModel final : public Model { class FilteringProxyModel final : public Model
, public ModelClient {
public: public:
static NonnullRefPtr<FilteringProxyModel> construct(Model& model) static NonnullRefPtr<FilteringProxyModel> construct(Model& model)
{ {
return adopt_ref(*new FilteringProxyModel(model)); return adopt_ref(*new FilteringProxyModel(model));
} }
virtual ~FilteringProxyModel() override {}; virtual ~FilteringProxyModel() override
{
m_model.unregister_client(*this);
};
virtual int row_count(ModelIndex const& = ModelIndex()) const override; virtual int row_count(ModelIndex const& = ModelIndex()) const override;
virtual int column_count(ModelIndex const& = ModelIndex()) const override; virtual int column_count(ModelIndex const& = ModelIndex()) const override;
@ -35,11 +39,15 @@ public:
ModelIndex map(ModelIndex const&) const; ModelIndex map(ModelIndex const&) const;
protected:
virtual void model_did_update([[maybe_unused]] unsigned flags) override { invalidate(); }
private: private:
void filter(); void filter();
explicit FilteringProxyModel(Model& model) explicit FilteringProxyModel(Model& model)
: m_model(model) : m_model(model)
{ {
m_model.register_client(*this);
} }
Model& m_model; Model& m_model;