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

LibDraw+LibGUI: Move radio button painting into StylePainter

Browse source 
This will allow WindowServer to draw radio buttons :^)
This commit is contained in:
Andreas Kling 2020-01-08 20:29:12 +01:00
parent 6c549959c6
commit cc8c26c39b
3 changed files with 30 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Libraries/LibGUI/GRadioButton.cpp
View file

@ -1,12 +1,8 @@
#include <LibDraw/GraphicsBitmap.h>
#include <LibDraw/StylePainter.h>
#include <LibGUI/GPainter.h>
#include <LibGUI/GRadioButton.h>
static RefPtr<GraphicsBitmap> s_unfilled_circle_bitmap;
static RefPtr<GraphicsBitmap> s_filled_circle_bitmap;
static RefPtr<GraphicsBitmap> s_changing_filled_circle_bitmap;
static RefPtr<GraphicsBitmap> s_changing_unfilled_circle_bitmap;
GRadioButton::GRadioButton(GWidget* parent)
: GRadioButton({}, parent)
{
@ -15,12 +11,6 @@ GRadioButton::GRadioButton(GWidget* parent)
GRadioButton::GRadioButton(const StringView& text, GWidget* parent)
: GAbstractButton(text, parent)
{
if (!s_unfilled_circle_bitmap) {
s_unfilled_circle_bitmap = GraphicsBitmap::load_from_file("/res/icons/unfilled-radio-circle.png");
s_filled_circle_bitmap = GraphicsBitmap::load_from_file("/res/icons/filled-radio-circle.png");
s_changing_filled_circle_bitmap = GraphicsBitmap::load_from_file("/res/icons/changing-filled-radio-circle.png");
s_changing_unfilled_circle_bitmap = GraphicsBitmap::load_from_file("/res/icons/changing-unfilled-radio-circle.png");
}
}
GRadioButton::~GRadioButton()
@ -29,14 +19,7 @@ GRadioButton::~GRadioButton()
Size GRadioButton::circle_size()
{
return s_unfilled_circle_bitmap->size();
}
static const GraphicsBitmap& circle_bitmap(bool checked, bool changing)
{
if (changing)
return checked ? *s_changing_filled_circle_bitmap : *s_changing_unfilled_circle_bitmap;
return checked ? *s_filled_circle_bitmap : *s_unfilled_circle_bitmap;
return { 12, 12 };
}
void GRadioButton::paint_event(GPaintEvent& event)
@ -47,8 +30,7 @@ void GRadioButton::paint_event(GPaintEvent& event)
Rect circle_rect { { 2, 0 }, circle_size() };
circle_rect.center_vertically_within(rect());
auto& bitmap = circle_bitmap(is_checked(), is_being_pressed());
painter.blit(circle_rect.location(), bitmap, bitmap.rect());
StylePainter::paint_radio_button(painter, circle_rect, palette(), is_checked(), is_being_pressed());
Rect text_rect { circle_rect.right() + 4, 0, font().width(text()), font().glyph_height() };
text_rect.center_vertically_within(rect());