Skip to content

Commit

Permalink
LibGUI+WindowServer: Tweak hover shadows slightly
Browse files Browse the repository at this point in the history
Move the shadow 1 more pixel away from the unhovered icon location,
making a total 2 pixel distance between the icon and the shadow.
Also tweak the shadow color to be a darkened variant of the base color
underneath the icon.
  • Loading branch information
awesomekling committed Dec 27, 2020
1 parent fe6a312 commit 04f1f74
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Libraries/LibGUI/Button.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ void Button::paint_event(PaintEvent& event)
if (is_being_pressed() || is_checked())
painter.translate(1, 1);
else if (m_icon && is_enabled() && is_hovered() && button_style() == Gfx::ButtonStyle::CoolBar) {
auto shadow_color = palette().threed_shadow1();
painter.blit_filtered(icon_location, *m_icon, m_icon->rect(), [&shadow_color](auto) {
auto shadow_color = palette().button().darkened(0.7f);
painter.blit_filtered(icon_location.translated(1, 1), *m_icon, m_icon->rect(), [&shadow_color](auto) {
return shadow_color;
});
icon_location.move_by(-1, -1);
Expand Down
5 changes: 2 additions & 3 deletions Services/WindowServer/Menu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -248,9 +248,8 @@ void Menu::draw()
icon_rect.center_vertically_within(text_rect);

if (&item == hovered_item() && item.is_enabled()) {
auto shadow_color = palette.threed_shadow1();
shadow_color = palette.menu_selection().darkened();
painter.blit_filtered(icon_rect.location(), *item.icon(), item.icon()->rect(), [&shadow_color](auto) {
auto shadow_color = palette.menu_selection().darkened(0.7f);
painter.blit_filtered(icon_rect.location().translated(1, 1), *item.icon(), item.icon()->rect(), [&shadow_color](auto) {
return shadow_color;
});
icon_rect.move_by(-1, -1);
Expand Down

0 comments on commit 04f1f74

Please sign in to comment.