RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 16:48:12 +00:00
Code Issues Activity Actions

LibGUI: Remove confusing GModelNotification concept

Browse source 
This was a bad idea and it didn't stick. Instead we should just use the
simple "on_foo" hook functions like we do for everything else. :^)
This commit is contained in:
Andreas Kling 2019-08-20 19:43:12 +02:00
parent 4f3234148a
commit f7dce05c82
6 changed files with 8 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Libraries/LibGUI/GAbstractView.cpp
View file

@ -28,17 +28,10 @@ void GAbstractView::set_model(RefPtr<GModel>&& model)
did_update_model();
}
void GAbstractView::model_notification(const GModelNotification& notification)
{
if (on_model_notification)
on_model_notification(notification);
}
void GAbstractView::did_update_model()
{
if (!model() || model()->selected_index() != m_edit_index)
stop_editing();
model_notification(GModelNotification(GModelNotification::ModelUpdated));
}
void GAbstractView::did_update_selection()

2
Libraries/LibGUI/GAbstractView.h
View file

@ -34,12 +34,10 @@ public:
Function<void(const GModelIndex&)> on_activation;
Function<void(const GModelIndex&)> on_selection;
Function<void(const GModelIndex&, const GContextMenuEvent&)> on_context_menu_request;
Function<void(const GModelNotification&)> on_model_notification;
Function<OwnPtr<GModelEditingDelegate>(const GModelIndex&)> aid_create_editing_delegate;
protected:
virtual void model_notification(const GModelNotification&);
virtual void did_scroll() override;
void activate(const GModelIndex&);
void update_edit_widget_position();

21
Libraries/LibGUI/GModel.h
View file

@ -18,27 +18,6 @@ enum class GSortOrder {
Descending
};
class GModelNotification {
public:
enum Type {
Invalid = 0,
ModelUpdated,
};
explicit GModelNotification(Type type, const GModelIndex& index = GModelIndex())
: m_type(type)
, m_index(index)
{
}
Type type() const { return m_type; }
GModelIndex index() const { return m_index; }
private:
Type m_type { Invalid };
GModelIndex m_index;
};
class GModel : public RefCounted<GModel> {
public:
struct ColumnMetadata {