From 18b6c47178440bc30d31d48b5f55a5518eeba064 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Thu, 8 Oct 2020 11:02:36 +0200 Subject: [PATCH] LibGUI: Set initial AbstractButton background/foreground color roles Widgets should respect the background/foreground roles in a way that makes sense for the widget. --- Libraries/LibGUI/AbstractButton.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Libraries/LibGUI/AbstractButton.cpp b/Libraries/LibGUI/AbstractButton.cpp index ae14dddc42..36dc287941 100644 --- a/Libraries/LibGUI/AbstractButton.cpp +++ b/Libraries/LibGUI/AbstractButton.cpp @@ -35,6 +35,9 @@ namespace GUI { AbstractButton::AbstractButton(const StringView& text) : m_text(text) { + set_background_role(Gfx::ColorRole::Button); + set_foreground_role(Gfx::ColorRole::ButtonText); + m_auto_repeat_timer = add(); m_auto_repeat_timer->on_timeout = [this] { click(); @@ -172,7 +175,7 @@ void AbstractButton::paint_text(Painter& painter, const Gfx::IntRect& rect, cons if (text().is_empty()) return; - painter.draw_text(clipped_rect, text(), font, text_alignment, palette().button_text(), Gfx::TextElision::Right); + painter.draw_text(clipped_rect, text(), font, text_alignment, palette().color(foreground_role()), Gfx::TextElision::Right); if (is_focused()) painter.draw_rect(clipped_rect.inflated(6, 4), palette().focus_outline()); }