LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-13 11:42:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

WindowServer: Draw a coolbar border around the hovered switcher item

Browse Source 
This gives a small but nice indication that the switcher window list
items are clickable. :^)
This commit is contained in:
Andreas Kling 2020-02-11 18:53:56 +01:00
parent 4c620dea83
commit 0f00e9a1c7
Notes: sideshowbarker 2024-07-19 09:26:15 +09:00 
Author: https://github.com/awesomekling
Commit: https://github.com/SerenityOS/serenity/commit/0f00e9a1c75
2 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Servers/WindowServer/WindowSwitcher.cpp
View File

@ -77,15 +77,28 @@ void WindowSwitcher::event(Core::Event& event)
return;
auto& mouse_event = static_cast<MouseEvent&>(event);
if (mouse_event.type() == Event::MouseDown) {
for (int i = 0; i < m_windows.size(); ++i) {
auto item_rect = this->item_rect(i);
if (item_rect.contains(mouse_event.position())) {
select_window_at_index(i);
break;
}
int new_hovered_index = -1;
for (int i = 0; i < m_windows.size(); ++i) {
auto item_rect = this->item_rect(i);
if (item_rect.contains(mouse_event.position())) {
new_hovered_index = i;
break;
}
}
if (mouse_event.type() == Event::MouseMove) {
if (m_hovered_index != new_hovered_index) {
m_hovered_index = new_hovered_index;
redraw();
}
}
if (new_hovered_index == -1)
return;
if (mouse_event.type() == Event::MouseDown)
select_window_at_index(new_hovered_index);
event.accept();
}
@ -142,6 +155,11 @@ void WindowSwitcher::select_window_at_index(int index)
auto* highlight_window = m_windows.at(index).ptr();
ASSERT(highlight_window);
WindowManager::the().set_highlight_window(highlight_window);
redraw();
}
void WindowSwitcher::redraw()
{
draw();
WindowManager::the().invalidate(m_rect);
}
@ -172,6 +190,8 @@ void WindowSwitcher::draw()
text_color = palette.selection_text();
rect_text_color = palette.threed_shadow1();
} else {
if (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();
}
@ -222,15 +242,13 @@ void WindowSwitcher::refresh()
if (!m_switcher_window)
m_switcher_window = Window::construct(*this, WindowType::WindowSwitcher);
m_switcher_window->set_rect(m_rect);
draw();
redraw();
}
void WindowSwitcher::refresh_if_needed()
{
if (m_visible) {
if (m_visible)
refresh();
WindowManager::the().invalidate(m_rect);
}
}
}

2
Servers/WindowServer/WindowSwitcher.h
View File

@ -75,6 +75,7 @@ public:
Window* switcher_window() { return m_switcher_window.ptr(); }
private:
void redraw();
void select_window_at_index(int index);
Gfx::Rect item_rect(int index) const;
@ -85,6 +86,7 @@ private:
bool m_visible { false };
Vector<WeakPtr<Window>> m_windows;
int m_selected_index { 0 };
int m_hovered_index { -1 };
};
}