language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-08-02 09:52:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

C++: Fix and test the reset function on model adapter

Browse source 
They were causing infinite recursion because they were calling
themselves.

Also add the missing MapModel::reset

Yet another motivation for https://github.com/slint-ui/slint/issues/3888
as the code was mixing the `reset` function on the adapter meaning
"please re-apply the adapter filter/map/sort function" with the `reset`
function on Model which means "the subclass has changed and we should
notify listeners".

Fixes #4968
This commit is contained in:
Olivier Goffart 2024-03-28 09:47:35 +01:00
parent dc5004f9c4
commit fe38a1e97d
2 changed files with 100 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
api/cpp/include/slint.h
View file

@ -632,7 +632,7 @@ struct FilterModelInner : private_api::ModelChangeListener
void reset() override
{
update_mapping();
target_model.reset();
target_model.Model<ModelData>::reset();
}
void update_mapping()
@ -721,7 +721,7 @@ struct MapModelInner : private_api::ModelChangeListener
{
target_model.row_removed(index, count);
}
void reset() override { target_model.reset(); }
void reset() override { target_model.Model<SourceModelData>::reset(); }
slint::MapModel<SourceModelData, MappedModelData> &target_model;
};
@ -767,6 +767,10 @@ public:
/// Returns the source model of this filter model.
std::shared_ptr<Model<SourceModelData>> source_model() const { return model; }
/// Re-applies the model's mapping function on each row of the source model. Use this if state
/// external to the mapping function has changed.
void reset() { inner->reset(); }
private:
std::shared_ptr<private_api::MapModelInner<SourceModelData, MappedModelData>> inner;
std::shared_ptr<slint::Model<SourceModelData>> model;
@ -874,7 +878,7 @@ struct SortModelInner : private_api::ModelChangeListener
void reset() override
{
sorted_rows_dirty = true;
target_model.reset();
target_model.Model<ModelData>::reset();
}
void ensure_sorted()
@ -987,7 +991,7 @@ struct ReverseModelInner : private_api::ModelChangeListener
target_model.row_removed(source_model->row_count() - first_removed_row, count);
}
void reset() override { source_model.reset(); }
void reset() override { target_model.reset(); }
std::shared_ptr<slint::Model<ModelData>> source_model;
slint::ReverseModel<ModelData> &target_model;