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

Services: Convert WindowFrame button bitmaps to themable PNGs

Browse source 
Custom buttons can now be set using TitleButtonIcons under the
Paths group in themes. WindowFrame recognizes window-close.png,
window-minimize.png, window-maximize.png and window-restore.png
filenames.
This commit is contained in:
thankyouverycool 2020-07-29 16:22:05 -04:00 • committed by Andreas Kling
parent 41aacdf815
commit c815fa7f47
5 changed files with 75 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Services/WindowServer/Button.cpp
View file

@ -33,10 +33,9 @@
namespace WindowServer {
Button::Button(WindowFrame& frame, NonnullRefPtr<Gfx::CharacterBitmap>&& bitmap, Function<void(Button&)>&& on_click_handler)
Button::Button(WindowFrame& frame, Function<void(Button&)>&& on_click_handler)
: on_click(move(on_click_handler))
, m_frame(frame)
, m_bitmap(move(bitmap))
{
}
@ -50,11 +49,13 @@ void Button::paint(Gfx::Painter& painter)
Gfx::PainterStateSaver saver(painter);
painter.translate(relative_rect().location());
Gfx::StylePainter::paint_button(painter, rect(), palette, Gfx::ButtonStyle::Normal, m_pressed, m_hovered);
auto x_location = rect().center();
x_location.move_by(-(m_bitmap->width() / 2), -(m_bitmap->height() / 2));
if (m_pressed)
x_location.move_by(1, 1);
painter.draw_bitmap(x_location, *m_bitmap, palette.button_text());
if (m_icon) {
auto icon_location = rect().center().translated(-(m_icon->width() / 2), -(m_icon->height() / 2));
if (m_pressed)
painter.translate(1, 1);
painter.blit(icon_location, *m_icon, m_icon->rect());
}
}
void Button::on_mouse_event(const MouseEvent& event)