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

LibGUI: Convert GItemView to ObjectPtr

Browse source
This commit is contained in:
Andreas Kling 2019-09-21 15:47:58 +02:00
parent 93851c3832
commit c13b9e2214
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Applications/FileManager/DirectoryView.cpp
View file

@ -76,7 +76,7 @@ DirectoryView::DirectoryView(GWidget* parent)
, m_model(GDirectoryModel::create()) , m_model(GDirectoryModel::create())
{ {
set_active_widget(nullptr); set_active_widget(nullptr);
m_item_view = new GItemView(this); m_item_view = GItemView::construct(this);
m_item_view->set_model(model()); m_item_view->set_model(model());
m_table_view = new GTableView(this); m_table_view = new GTableView(this);

2
Applications/FileManager/DirectoryView.h
View file

@ -73,5 +73,5 @@ private:
void add_path_to_history(const StringView& path); void add_path_to_history(const StringView& path);
GTableView* m_table_view { nullptr }; GTableView* m_table_view { nullptr };
GItemView* m_item_view { nullptr }; ObjectPtr<GItemView> m_item_view;
}; };

3
Libraries/LibGUI/GItemView.h
View file

@ -11,7 +11,6 @@ class Painter;
class GItemView : public GAbstractView { class GItemView : public GAbstractView {
C_OBJECT(GItemView) C_OBJECT(GItemView)
public: public:
explicit GItemView(GWidget* parent);
virtual ~GItemView() override; virtual ~GItemView() override;
int content_width() const; int content_width() const;
@ -24,6 +23,8 @@ public:
void set_model_column(int column) { m_model_column = column; } void set_model_column(int column) { m_model_column = column; }
private: private:
explicit GItemView(GWidget* parent);
virtual void did_update_model() override; virtual void did_update_model() override;
virtual void paint_event(GPaintEvent&) override; virtual void paint_event(GPaintEvent&) override;
virtual void resize_event(GResizeEvent&) override; virtual void resize_event(GResizeEvent&) override;