mirror of
https://github.com/RGBCube/serenity
synced 2025-05-28 09:35:09 +00:00
LibGUI: Put all classes in the GUI namespace and remove the leading G
This took me a moment. Welcome to the new world of GUI::Widget! :^)
This commit is contained in:
parent
2d39da5405
commit
c5bd9d4ed1
337 changed files with 5400 additions and 4816 deletions
|
@ -29,22 +29,24 @@
|
|||
#include <LibGUI/GLabel.h>
|
||||
#include <LibGUI/GPainter.h>
|
||||
|
||||
GLabel::GLabel(GWidget* parent)
|
||||
: GFrame(parent)
|
||||
namespace GUI {
|
||||
|
||||
Label::Label(Widget* parent)
|
||||
: Frame(parent)
|
||||
{
|
||||
}
|
||||
|
||||
GLabel::GLabel(const StringView& text, GWidget* parent)
|
||||
: GFrame(parent)
|
||||
Label::Label(const StringView& text, Widget* parent)
|
||||
: Frame(parent)
|
||||
, m_text(text)
|
||||
{
|
||||
}
|
||||
|
||||
GLabel::~GLabel()
|
||||
Label::~Label()
|
||||
{
|
||||
}
|
||||
|
||||
void GLabel::set_icon(GraphicsBitmap* icon)
|
||||
void Label::set_icon(GraphicsBitmap* icon)
|
||||
{
|
||||
if (m_icon == icon)
|
||||
return;
|
||||
|
@ -52,7 +54,7 @@ void GLabel::set_icon(GraphicsBitmap* icon)
|
|||
update();
|
||||
}
|
||||
|
||||
void GLabel::set_text(const StringView& text)
|
||||
void Label::set_text(const StringView& text)
|
||||
{
|
||||
if (text == m_text)
|
||||
return;
|
||||
|
@ -60,11 +62,11 @@ void GLabel::set_text(const StringView& text)
|
|||
update();
|
||||
}
|
||||
|
||||
void GLabel::paint_event(GPaintEvent& event)
|
||||
void Label::paint_event(PaintEvent& event)
|
||||
{
|
||||
GFrame::paint_event(event);
|
||||
Frame::paint_event(event);
|
||||
|
||||
GPainter painter(*this);
|
||||
Painter painter(*this);
|
||||
painter.add_clip_rect(event.rect());
|
||||
|
||||
if (m_icon) {
|
||||
|
@ -92,8 +94,10 @@ void GLabel::paint_event(GPaintEvent& event)
|
|||
}
|
||||
}
|
||||
|
||||
void GLabel::size_to_fit()
|
||||
void Label::size_to_fit()
|
||||
{
|
||||
set_size_policy(SizePolicy::Fixed, SizePolicy::Fill);
|
||||
set_preferred_size(font().width(m_text), 0);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue