beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 07:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

LibGfx+WindowServer: Add theme flag TitleButtonsIconOnly

Browse source 
With this flag set to true only the icon of the title button is painted.
This is useful for themes with a more non-serenity look such as
Coffee and Cupertino (that currently try to hide the button).
This commit is contained in:
MacDue 2022-04-23 15:23:22 +01:00 committed by Linus Groh
parent 5998e7f8a2
commit 9b30fe9864
Notes: sideshowbarker 2024-07-17 11:33:02 +09:00 
Author: https://github.com/MacDue
Commit: https://github.com/SerenityOS/serenity/commit/9b30fe9864
Pull-request: https://github.com/SerenityOS/serenity/pull/13782
Reviewed-by: https://github.com/linusg
5 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Userland/Libraries/LibGfx/Palette.h
View file

@ -143,6 +143,7 @@ public:
Gfx::TextAlignment title_alignment() const { return alignment(AlignmentRole::TitleAlignment); }
bool is_dark() const { return flag(FlagRole::IsDark); }
bool title_buttons_icon_only() const { return flag(FlagRole::TitleButtonsIconOnly); }
int window_border_thickness() const { return metric(MetricRole::BorderThickness); }
int window_border_radius() const { return metric(MetricRole::BorderRadius); }

3
Userland/Libraries/LibGfx/SystemTheme.h
View file

@ -105,7 +105,8 @@ namespace Gfx {
C(TitleAlignment)
#define ENUMERATE_FLAG_ROLES(C) \
C(IsDark)
C(IsDark) \
C(TitleButtonsIconOnly)
#define ENUMERATE_METRIC_ROLES(C) \
C(BorderThickness) \

4
Userland/Services/WindowServer/Button.cpp
View file

@ -27,7 +27,9 @@ void Button::paint(Screen& screen, Gfx::Painter& painter)
auto palette = WindowManager::the().palette();
Gfx::PainterStateSaver saver(painter);
painter.translate(relative_rect().location());
Gfx::StylePainter::paint_button(painter, rect(), palette, Gfx::ButtonStyle::Normal, m_pressed, m_hovered);
if (m_style == Style::Normal)
Gfx::StylePainter::paint_button(painter, rect(), palette, Gfx::ButtonStyle::Normal, m_pressed, m_hovered);
if (m_icon) {
auto& bitmap = m_icon->bitmap(screen.scale_factor());

8
Userland/Services/WindowServer/Button.h
View file

@ -42,6 +42,13 @@ public:
void set_icon(RefPtr<MultiScaleBitmaps> const& icon) { m_icon = icon; }
enum class Style {
Normal,
IconOnly
};
void set_style(Style style) { m_style = style; }
private:
WindowFrame& m_frame;
Gfx::IntRect m_relative_rect;
@ -49,6 +56,7 @@ private:
bool m_pressed { false };
bool m_visible { true };
bool m_hovered { false };
Style m_style { Style::Normal };
};
}

16
Userland/Services/WindowServer/WindowFrame.cpp
View file

@ -120,12 +120,22 @@ void WindowFrame::set_button_icons()
if (m_window.is_frameless())
return;
if (m_window.is_closeable())
auto button_style = WindowManager::the().palette().title_buttons_icon_only()
? Button::Style::IconOnly
: Button::Style::Normal;
if (m_window.is_closeable()) {
m_close_button->set_icon(m_window.is_modified() ? *s_close_modified_icon : *s_close_icon);
if (m_window.is_minimizable())
m_close_button->set_style(button_style);
}
if (m_window.is_minimizable()) {
m_minimize_button->set_icon(s_minimize_icon);
if (m_window.is_resizable())
m_minimize_button->set_style(button_style);
}
if (m_window.is_resizable()) {
m_maximize_button->set_icon(m_window.is_maximized() ? *s_restore_icon : *s_maximize_icon);
m_maximize_button->set_style(button_style);
}
}
void WindowFrame::reload_config()