RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 04:57:44 +00:00
Code Issues Activity Actions

More work on focus.

Browse source 
ListBox now renders differently depending on focus state.
This commit is contained in:
Andreas Kling 2018-10-13 20:59:25 +02:00
parent 1929cb6b71
commit 6f1b384cde
6 changed files with 39 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Widgets/Window.cpp
View file

@ -56,8 +56,7 @@ void Window::event(Event& event)
//printf("hit test for %d,%d found: %s{%p} %d,%d\n", me.x(), me.y(), result.widget->className(), result.widget, result.localX, result.localY);
// FIXME: Re-use the existing event instead of crafting a new one?
auto localEvent = make<MouseEvent>(event.type(), result.localX, result.localY, me.button());
result.widget->event(*localEvent);
return m_mainWidget->event(event);
return result.widget->event(*localEvent);
}
return Object::event(event);
}
@ -101,10 +100,14 @@ void Window::setFocusedWidget(Widget* widget)
{
if (m_focusedWidget.ptr() == widget)
return;
auto* previouslyFocusedWidget = m_focusedWidget.ptr();
if (!widget) {
m_focusedWidget = nullptr;
return;
} else {
m_focusedWidget = widget->makeWeakPtr();
m_focusedWidget->repaint(Rect());
}
m_focusedWidget = widget->makeWeakPtr();
if (previouslyFocusedWidget)
previouslyFocusedWidget->repaint(Rect());
}