0ct0pu5/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

WindowServer: Make window switcher look more like other overlays

Browse source 
Render the window switcher with the same background and shadow as other
WindowServer overlays.

Note that we don't actually render it as a WindowServer::Overlay, as the
window switcher uses mouse and keyboard events, and there's currently
no way for an overlay to receive events.
This commit is contained in:
Andreas Kling 2021-11-14 12:20:18 +01:00
parent 7fb2540ffe
commit 7e5b22333e
Notes: sideshowbarker 2024-07-18 01:10:10 +09:00
3 changed files with 29 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -178,6 +178,8 @@ MultiScaleBitmaps const* WindowFrame::shadow_bitmap() const
return s_taskbar_shadow;
case WindowType::AppletArea:
return nullptr;
case WindowType::WindowSwitcher:
return nullptr;
default:
if (auto* highlight_window = WindowManager::the().highlight_window())
return highlight_window == &m_window ? s_active_window_shadow : s_inactive_window_shadow;

33
Userland/Services/WindowServer/WindowSwitcher.cpp
View file

@ -169,9 +169,19 @@ Gfx::IntRect WindowSwitcher::item_rect(int index) const
void WindowSwitcher::draw()
{
auto palette = WindowManager::the().palette();
Gfx::IntRect rect = { {}, m_rect.size() };
Gfx::Painter painter(*m_switcher_window->backing_store());
painter.fill_rect({ {}, m_rect.size() }, palette.window());
painter.draw_rect({ {}, m_rect.size() }, palette.threed_shadow2());
painter.clear_rect(rect, Color::Transparent);
// FIXME: Perhaps the WindowSwitcher could render as an overlay instead.
// That would require adding support for event handling to overlays.
if (auto* shadow_bitmap = WindowManager::the().overlay_rect_shadow()) {
// FIXME: Support other scale factors.
int scale_factor = 1;
Gfx::StylePainter::paint_simple_rect_shadow(painter, rect, shadow_bitmap->bitmap(scale_factor), true, true);
}
for (size_t index = 0; index < m_windows.size(); ++index) {
auto& window = *m_windows.at(index);
auto item_rect = this->item_rect(index);
@ -180,21 +190,20 @@ void WindowSwitcher::draw()
if (static_cast<int>(index) == m_selected_index) {
painter.fill_rect(item_rect, palette.selection());
text_color = palette.selection_text();
rect_text_color = palette.threed_shadow1();
rect_text_color = palette.selection_text().with_alpha(0xcc);
} else {
if (static_cast<int>(index) == m_hovered_index)
Gfx::StylePainter::paint_button(painter, item_rect, palette, Gfx::ButtonStyle::Coolbar, false, true);
text_color = palette.window_text();
rect_text_color = palette.threed_shadow2();
Gfx::StylePainter::paint_frame(painter, item_rect, palette, Gfx::FrameShape::Panel, Gfx::FrameShadow::Raised, 2);
text_color = Color::White;
rect_text_color = Color(Color::White).with_alpha(0xcc);
}
item_rect.shrink(item_padding(), 0);
Gfx::IntRect thumbnail_rect = { item_rect.location().translated(0, 5), { thumbnail_width(), thumbnail_height() } };
if (window.backing_store()) {
painter.draw_scaled_bitmap(thumbnail_rect, *window.backing_store(), window.backing_store()->rect());
Gfx::StylePainter::paint_frame(painter, thumbnail_rect.inflated(4, 4), palette, Gfx::FrameShape::Container, Gfx::FrameShadow::Sunken, 2);
}
if (window.backing_store())
painter.draw_scaled_bitmap(thumbnail_rect, *window.backing_store(), window.backing_store()->rect(), 1.0f, Gfx::Painter::ScalingMode::BilinearBlend);
Gfx::IntRect icon_rect = { thumbnail_rect.bottom_right().translated(-window.icon().width(), -window.icon().height()), { window.icon().width(), window.icon().height() } };
painter.blit(icon_rect.location(), window.icon(), window.icon().rect());
painter.draw_text(item_rect.translated(thumbnail_width() + 12, 0).translated(1, 1), window.computed_title(), WindowManager::the().window_title_font(), Gfx::TextAlignment::CenterLeft, text_color.inverted());
painter.draw_text(item_rect.translated(thumbnail_width() + 12, 0), window.computed_title(), WindowManager::the().window_title_font(), Gfx::TextAlignment::CenterLeft, text_color);
auto window_details = m_windows_on_multiple_stacks ? String::formatted("{} on {}:{}", window.rect().to_string(), window.window_stack().row() + 1, window.window_stack().column() + 1) : window.rect().to_string();
painter.draw_text(item_rect, window_details, Gfx::TextAlignment::CenterRight, rect_text_color);
@ -254,8 +263,10 @@ void WindowSwitcher::refresh()
m_rect.set_width(thumbnail_width() + longest_title_width + space_for_window_details + padding() * 2 + item_padding() * 2);
m_rect.set_height(window_count * item_height() + padding() * 2);
m_rect.center_within(Screen::main().rect());
if (!m_switcher_window)
if (!m_switcher_window) {
m_switcher_window = Window::construct(*this, WindowType::WindowSwitcher);
m_switcher_window->set_has_alpha_channel(true);
}
m_switcher_window->set_rect(m_rect);
redraw();
}

10
Userland/Services/WindowServer/WindowSwitcher.h
View file

@ -50,11 +50,11 @@ public:
private:
WindowSwitcher();
int thumbnail_width() const { return 40; }
int thumbnail_height() const { return 40; }
int item_height() const { return 10 + thumbnail_height(); }
int padding() const { return 8; }
int item_padding() const { return 8; }
int thumbnail_width() const { return 64; }
int thumbnail_height() const { return 64; }
int item_height() const { return 14 + thumbnail_height(); }
int padding() const { return 30; }
int item_padding() const { return 10; }
void draw();
void redraw();