mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-04-22 04:25:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Let the WindowManager track the active window.

Browse source 
We draw the active window in a different color, obviously. :^)
This commit is contained in:
Andreas Kling 2018-10-13 17:42:24 +02:00
parent 560405667e
commit 44a32039be
Notes: sideshowbarker 2024-07-19 18:48:58 +09:00
4 changed files with 63 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Widgets/Window.cpp
View file

@ -85,3 +85,9 @@ void Window::event(Event& event)
return Object::event(event);
}
bool Window::isActive() const
{
return WindowManager::the().activeWindow() == this;
}

2
Widgets/Window.h
View file

@ -37,6 +37,8 @@ public:
void repaint();
bool isActive() const;
private:
String m_title;
Rect m_rect;

55
Widgets/WindowManager.cpp
View file

@ -46,8 +46,11 @@ WindowManager& WindowManager::the()
WindowManager::WindowManager()
{
m_windowBorderColor = Color(0, 64, 192);
m_windowTitleColor = Color::White;
m_activeWindowBorderColor = Color(0, 64, 192);
m_activeWindowTitleColor = Color::White;
m_inactiveWindowBorderColor = Color(64, 64, 64);
m_inactiveWindowTitleColor = Color::White;
}
WindowManager::~WindowManager()
@ -102,26 +105,33 @@ void WindowManager::paintWindowFrame(Window& window)
return;
}
p.drawRect(borderRect, Color::White);
p.drawRect(outerRect, m_windowBorderColor);
auto titleColor = &window == activeWindow() ? m_activeWindowTitleColor : m_inactiveWindowTitleColor;
auto borderColor = &window == activeWindow() ? m_activeWindowBorderColor : m_inactiveWindowBorderColor;
p.fillRect(titleBarRect, m_windowBorderColor);
p.fillRect(bottomRect, m_windowBorderColor);
p.fillRect(leftRect, m_windowBorderColor);
p.fillRect(rightRect, m_windowBorderColor);
p.drawRect(borderRect, Color::MidGray);
p.drawRect(outerRect, borderColor);
p.drawText(titleBarRect, window.title(), Painter::TextAlignment::Center, m_windowTitleColor);
p.fillRect(titleBarRect, borderColor);
p.fillRect(bottomRect, borderColor);
p.fillRect(leftRect, borderColor);
p.fillRect(rightRect, borderColor);
p.drawText(titleBarRect, window.title(), Painter::TextAlignment::Center, titleColor);
}
void WindowManager::addWindow(Window& window)
{
m_windows.set(&window);
if (!activeWindow())
setActiveWindow(&window);
}
void WindowManager::removeWindow(Window& window)
{
ASSERT(m_windows.contains(&window));
m_windows.remove(&window);
if (!activeWindow() && !m_windows.isEmpty())
setActiveWindow(*m_windows.begin());
}
void WindowManager::notifyTitleChanged(Window& window)
@ -149,7 +159,7 @@ void WindowManager::handleTitleBarMouseEvent(Window& window, MouseEvent& event)
byte r = (((double)rand()) / (double)RAND_MAX) * 255.0;
byte g = (((double)rand()) / (double)RAND_MAX) * 255.0;
byte b = (((double)rand()) / (double)RAND_MAX) * 255.0;
m_windowBorderColor = Color(r, g, b);
m_activeWindowBorderColor = Color(r, g, b);
paintWindowFrame(window);
#endif
}
@ -204,11 +214,15 @@ void WindowManager::processMouseEvent(MouseEvent& event)
// FIXME: Respect z-order of windows...
for (auto* window : m_windows) {
if (titleBarRectForWindow(*window).contains(event.position())) {
if (event.type() == Event::MouseDown)
setActiveWindow(window);
handleTitleBarMouseEvent(*window, event);
return;
}
if (window->rect().contains(event.position())) {
if (event.type() == Event::MouseDown)
setActiveWindow(window);
// FIXME: Re-use the existing event instead of crafting a new one?
auto localEvent = make<MouseEvent>(event.type(), event.x() - window->rect().x(), event.y() - window->rect().y(), event.button());
window->event(*localEvent);
@ -260,3 +274,24 @@ void WindowManager::setRootWidget(Widget* widget)
m_rootWidget = widget;
EventLoop::main().postEvent(m_rootWidget, make<ShowEvent>());
}
void WindowManager::setActiveWindow(Window* window)
{
if (window == m_activeWindow.ptr())
return;
auto* previouslyActiveWindow = m_activeWindow.ptr();
m_activeWindow = window->makeWeakPtr();
if (previouslyActiveWindow) {
paintWindowFrame(*previouslyActiveWindow);
previouslyActiveWindow->repaint();
}
if (m_activeWindow) {
paintWindowFrame(*m_activeWindow);
m_activeWindow->repaint();
}
}

12
Widgets/WindowManager.h
View file

@ -24,6 +24,9 @@ public:
Widget* rootWidget() { return m_rootWidget; }
void setRootWidget(Widget*);
Window* activeWindow() { return m_activeWindow.ptr(); }
void setActiveWindow(Window*);
private:
WindowManager();
~WindowManager();
@ -35,13 +38,18 @@ private:
virtual void event(Event&) override;
Color m_windowBorderColor;
Color m_windowTitleColor;
Color m_activeWindowBorderColor;
Color m_activeWindowTitleColor;
Color m_inactiveWindowBorderColor;
Color m_inactiveWindowTitleColor;
void paintWindowFrame(Window&);
HashTable<Window*> m_windows;
Widget* m_rootWidget { nullptr };
WeakPtr<Window> m_activeWindow;
WeakPtr<Window> m_dragWindow;
Point m_dragOrigin;