From 758e926b999dc44c60f0b5fb46a2c52f92cbde03 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Wed, 8 May 2019 14:32:46 +0200 Subject: [PATCH] GGroupBox: Rename "name" property to "title" --- DevTools/VisualBuilder/VBWidget.cpp | 2 +- LibGUI/GGroupBox.cpp | 14 +++++++------- LibGUI/GGroupBox.h | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/DevTools/VisualBuilder/VBWidget.cpp b/DevTools/VisualBuilder/VBWidget.cpp index 83e92167de..385b918052 100644 --- a/DevTools/VisualBuilder/VBWidget.cpp +++ b/DevTools/VisualBuilder/VBWidget.cpp @@ -127,7 +127,7 @@ void VBWidget::setup_properties() } if (m_type == VBWidgetType::GGroupBox) { - VB_ADD_PROPERTY(GGroupBox, "name", name, set_name, string); + VB_ADD_PROPERTY(GGroupBox, "title", title, set_title, string); } if (m_type == VBWidgetType::GScrollBar) { diff --git a/LibGUI/GGroupBox.cpp b/LibGUI/GGroupBox.cpp index 2187442d01..915b66e0dc 100644 --- a/LibGUI/GGroupBox.cpp +++ b/LibGUI/GGroupBox.cpp @@ -2,9 +2,9 @@ #include #include -GGroupBox::GGroupBox(const String& name, GWidget* parent) +GGroupBox::GGroupBox(const String& title, GWidget* parent) : GWidget(parent) - , m_name(name) + , m_title(title) { set_fill_with_background_color(true); set_background_color(Color::LightGray); @@ -25,15 +25,15 @@ void GGroupBox::paint_event(GPaintEvent& event) }; StylePainter::paint_frame(painter, frame_rect, FrameShape::Box, FrameShadow::Sunken, 2); - Rect text_rect { 4, 0, font().width(m_name) + 6, font().glyph_height() }; + Rect text_rect { 4, 0, font().width(m_title) + 6, font().glyph_height() }; painter.fill_rect(text_rect, background_color()); - painter.draw_text(text_rect, m_name, TextAlignment::Center, foreground_color()); + painter.draw_text(text_rect, m_title, TextAlignment::Center, foreground_color()); } -void GGroupBox::set_name(const String& name) +void GGroupBox::set_title(const String& title) { - if (m_name == name) + if (m_title == title) return; - m_name = name; + m_title = title; update(); } diff --git a/LibGUI/GGroupBox.h b/LibGUI/GGroupBox.h index 6700b3132b..4b630ea365 100644 --- a/LibGUI/GGroupBox.h +++ b/LibGUI/GGroupBox.h @@ -4,11 +4,11 @@ class GGroupBox : public GWidget { public: - GGroupBox(const String& name, GWidget* parent); + GGroupBox(const String& title, GWidget* parent); virtual ~GGroupBox() override; - String name() const { return m_name; } - void set_name(const String&); + String title() const { return m_title; } + void set_title(const String&); virtual const char* class_name() const override { return "GGroupBox"; } @@ -16,5 +16,5 @@ protected: virtual void paint_event(GPaintEvent&) override; private: - String m_name; + String m_title; };