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

Revert "StatusBar: Allow GML files to set the number of labels to create"

Browse source 
This reverts commit e11ec20650.

Broke FileManager, Browser, etc.
This commit is contained in:
Andreas Kling 2021-02-02 19:02:01 +01:00
parent 31e04907b4
commit 775ae27a55
2 changed files with 7 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Userland/Libraries/LibGUI/StatusBar.cpp
View file

@ -44,15 +44,15 @@ StatusBar::StatusBar(int label_count)
layout()->set_margins({ 0, 0, 0, 0 }); layout()->set_margins({ 0, 0, 0, 0 });
layout()->set_spacing(2); layout()->set_spacing(2);
if (label_count > 0) { if (label_count < 1)
label_count = 1;
for (auto i = 0; i < label_count; i++) for (auto i = 0; i < label_count; i++)
m_labels.append(create_label()); m_labels.append(create_label());
m_corner = add<ResizeCorner>(); m_corner = add<ResizeCorner>();
}
REGISTER_STRING_PROPERTY("text", text, set_text); REGISTER_STRING_PROPERTY("text", text, set_text);
REGISTER_INT_PROPERTY("label_count", label_count, set_label_count);
} }
StatusBar::~StatusBar() StatusBar::~StatusBar()
@ -104,19 +104,4 @@ void StatusBar::resize_event(ResizeEvent& event)
Widget::resize_event(event); Widget::resize_event(event);
} }
void StatusBar::set_label_count(int label_count)
{
ASSERT(m_labels.is_empty());
m_label_count = label_count;
for (auto i = 0; i < label_count; ++i) {
m_labels.append(create_label());
}
m_corner = add<ResizeCorner>();
}
NonnullRefPtr<Label> StatusBar::label(int index) const
{
return m_labels.at(index);
}
} }

9
Userland/Libraries/LibGUI/StatusBar.h
View file

@ -39,10 +39,9 @@ public:
String text(int index) const; String text(int index) const;
void set_text(const StringView&); void set_text(const StringView&);
void set_text(int index, const StringView&); void set_text(int index, const StringView&);
NonnullRefPtr<Label> label(int index) const;
protected: protected:
explicit StatusBar(int label_count = 0); explicit StatusBar(int label_count = 1);
virtual void paint_event(PaintEvent&) override; virtual void paint_event(PaintEvent&) override;
virtual void resize_event(ResizeEvent&) override; virtual void resize_event(ResizeEvent&) override;
@ -50,12 +49,6 @@ private:
NonnullRefPtr<Label> create_label(); NonnullRefPtr<Label> create_label();
NonnullRefPtrVector<Label> m_labels; NonnullRefPtrVector<Label> m_labels;
RefPtr<ResizeCorner> m_corner; RefPtr<ResizeCorner> m_corner;
// Used to initialize the number of labels that should
// be created from a GML file as opposed to the constructor.
int label_count() const { return m_label_count; }
void set_label_count(int);
int m_label_count {};
}; };
} }