RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 14:47:35 +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

12
Widgets/Widget.cpp
View file

@ -49,6 +49,10 @@ void Widget::event(Event& event)
case Event::MouseMove:
return onMouseMove(static_cast<MouseEvent&>(event));
case Event::MouseDown:
if (auto* win = window()) {
// FIXME: if (acceptsFocus())
win->setFocusedWidget(this);
}
return onMouseDown(static_cast<MouseEvent&>(event));
case Event::MouseUp:
return onMouseUp(static_cast<MouseEvent&>(event));
@ -123,13 +127,15 @@ void Widget::setWindow(Window* window)
bool Widget::isFocused() const
{
return m_window && m_window->focusedWidget() == this;
if (auto* win = window())
return win->isActive() && win->focusedWidget() == this;
return false;
}
void Widget::setFocus(bool focus)
{
if (focus == isFocused())
return;
if (m_window)
m_window->setFocusedWidget(this);
if (auto* win = window())
win->setFocusedWidget(this);
}