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

LibGUI+LibGfx+WindowServer: Auto-generate disabled action icons :^)

Browse source 
This patch adds a simple filter that makes button and menu item icons
have that "'90s disabled" look when disabled. It's pretty awesome.
This commit is contained in:
Andreas Kling 2020-10-27 21:17:50 +01:00
parent ea14c67e29
commit 3ec19ae4b6
5 changed files with 23 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Libraries/LibGUI/Button.cpp
View file

@ -78,7 +78,7 @@ void Button::paint_event(PaintEvent& event)
else else
painter.blit(icon_location, *m_icon, m_icon->rect()); painter.blit(icon_location, *m_icon, m_icon->rect());
} else { } else {
painter.blit_dimmed(icon_location, *m_icon, m_icon->rect()); painter.blit_disabled(icon_location, *m_icon, m_icon->rect(), palette());
} }
} }
auto& font = is_checked() ? Gfx::Font::default_bold_font() : this->font(); auto& font = is_checked() ? Gfx::Font::default_bold_font() : this->font();

16
Libraries/LibGfx/Painter.cpp
View file

@ -37,6 +37,7 @@
#include <AK/Utf32View.h> #include <AK/Utf32View.h>
#include <AK/Utf8View.h> #include <AK/Utf8View.h>
#include <LibGfx/CharacterBitmap.h> #include <LibGfx/CharacterBitmap.h>
#include <LibGfx/Palette.h>
#include <LibGfx/Path.h> #include <LibGfx/Path.h>
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
@ -1612,4 +1613,19 @@ void Painter::fill_path(Path& path, Color color, WindingRule winding_rule)
#endif #endif
} }
void Painter::blit_disabled(const IntPoint& location, const Gfx::Bitmap& bitmap, const IntRect& rect, const Palette& palette)
{
auto bright_color = palette.threed_highlight();
auto dark_color = palette.threed_shadow1();
blit_filtered(location.translated(1, 1), bitmap, rect, [&](auto) {
return bright_color;
});
blit_filtered(location, bitmap, rect, [&](Color src) {
int gray = src.to_grayscale().red();
if (gray > 160)
return bright_color;
return dark_color;
});
}
} }

1
Libraries/LibGfx/Painter.h
View file

@ -76,6 +76,7 @@ public:
void draw_tiled_bitmap(const IntRect& dst_rect, const Gfx::Bitmap&); void draw_tiled_bitmap(const IntRect& dst_rect, const Gfx::Bitmap&);
void blit_offset(const IntPoint&, const Gfx::Bitmap&, const IntRect& src_rect, const IntPoint&); void blit_offset(const IntPoint&, const Gfx::Bitmap&, const IntRect& src_rect, const IntPoint&);
void blit_scaled(const IntRect&, const Gfx::Bitmap&, const IntRect&, float, float); void blit_scaled(const IntRect&, const Gfx::Bitmap&, const IntRect&, float, float);
void blit_disabled(const IntPoint&, const Gfx::Bitmap&, const IntRect&, const Palette&);
void draw_text(const IntRect&, const StringView&, const Font&, TextAlignment = TextAlignment::TopLeft, Color = Color::Black, TextElision = TextElision::None); void draw_text(const IntRect&, const StringView&, const Font&, TextAlignment = TextAlignment::TopLeft, Color = Color::Black, TextElision = TextElision::None);
void draw_text(const IntRect&, const StringView&, TextAlignment = TextAlignment::TopLeft, Color = Color::Black, TextElision = TextElision::None); void draw_text(const IntRect&, const StringView&, TextAlignment = TextAlignment::TopLeft, Color = Color::Black, TextElision = TextElision::None);
void draw_text(const IntRect&, const Utf32View&, const Font&, TextAlignment = TextAlignment::TopLeft, Color = Color::Black, TextElision = TextElision::None); void draw_text(const IntRect&, const Utf32View&, const Font&, TextAlignment = TextAlignment::TopLeft, Color = Color::Black, TextElision = TextElision::None);

2
Services/Taskbar/TaskbarButton.cpp
View file

@ -153,7 +153,7 @@ void TaskbarButton::paint_event(GUI::PaintEvent& event)
else else
painter.blit(icon_location, icon, icon.rect()); painter.blit(icon_location, icon, icon.rect());
} else { } else {
painter.blit_dimmed(icon_location, icon, icon.rect()); painter.blit_disabled(icon_location, icon, icon.rect(), palette());
} }
if (!has_progress) if (!has_progress)

5
Services/WindowServer/Menu.cpp
View file

@ -255,7 +255,10 @@ void Menu::draw()
}); });
icon_rect.move_by(-1, -1); icon_rect.move_by(-1, -1);
} }
painter.blit(icon_rect.location(), *item.icon(), item.icon()->rect()); if (item.is_enabled())
painter.blit(icon_rect.location(), *item.icon(), item.icon()->rect());
else
painter.blit_disabled(icon_rect.location(), *item.icon(), item.icon()->rect(), palette);
} }
auto& previous_font = painter.font(); auto& previous_font = painter.font();
if (item.is_default()) if (item.is_default())