RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 01:27:42 +00:00
Code Issues Activity Actions

LibGUI: Add Widget focus policies

Browse source 
Every widget now has a GUI::FocusPolicy that determines how it can
receive focus:

- NoFocus: The widget is not focusable (default)
- TabFocus: The widget can be focused using the tab key.
- ClickFocus: The widget can be focused by clicking on it.
- StrongFocus: Both of the above.

For widgets that have a focus proxy, getting/setting the focus policy
will affect the proxy instead.
This commit is contained in:
Andreas Kling 2020-10-30 10:58:27 +01:00
parent 34014fa838
commit aef56159a8
32 changed files with 64 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Libraries/LibGUI/Widget.cpp
View file

@ -326,7 +326,7 @@ void Widget::handle_mouseup_event(MouseEvent& event)
void Widget::handle_mousedown_event(MouseEvent& event)
{
if (accepts_focus())
if (((unsigned)focus_policy() & (unsigned)FocusPolicy::ClickFocus))
set_focus(true, FocusSource::Mouse);
mousedown_event(event);
if (event.button() == MouseButton::Right) {
@ -539,6 +539,20 @@ void Widget::set_focus_proxy(Widget* proxy)
m_focus_proxy = nullptr;
}
FocusPolicy Widget::focus_policy() const
{
if (m_focus_proxy)
return m_focus_proxy->focus_policy();
return m_focus_policy;
}
void Widget::set_focus_policy(FocusPolicy policy)
{
if (m_focus_proxy)
return m_focus_proxy->set_focus_policy(policy);
m_focus_policy = policy;
}
bool Widget::is_focused() const
{
if (m_focus_proxy)
@ -750,7 +764,7 @@ void Widget::set_updates_enabled(bool enabled)
void Widget::focus_previous_widget(FocusSource source)
{
auto focusable_widgets = window()->focusable_widgets();
auto focusable_widgets = window()->focusable_widgets(source);
for (int i = focusable_widgets.size() - 1; i >= 0; --i) {
if (focusable_widgets[i] != this)
continue;
@ -763,7 +777,7 @@ void Widget::focus_previous_widget(FocusSource source)
void Widget::focus_next_widget(FocusSource source)
{
auto focusable_widgets = window()->focusable_widgets();
auto focusable_widgets = window()->focusable_widgets(source);
for (size_t i = 0; i < focusable_widgets.size(); ++i) {
if (focusable_widgets[i] != this)
continue;