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

LibGUI: Switch focus if the currently focused widget is disabled

Browse source
This commit is contained in:
Andreas Kling 2020-12-28 00:33:46 +01:00
parent df6106854e
commit 644d5c5404
3 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Libraries/LibGUI/Widget.cpp
View file

@ -728,6 +728,10 @@ void Widget::set_enabled(bool enabled)
return IterationDecision::Continue; return IterationDecision::Continue;
}); });
if (!m_enabled && window() && window()->focused_widget() == this) {
window()->did_disable_focused_widget({});
}
Event e(Event::EnabledChange); Event e(Event::EnabledChange);
event(e); event(e);
update(); update();

5
Libraries/LibGUI/Window.cpp
View file

@ -927,4 +927,9 @@ void Window::focus_a_widget_if_possible(FocusSource source)
set_focused_widget(focusable_widgets[0], source); set_focused_widget(focusable_widgets[0], source);
} }
void Window::did_disable_focused_widget(Badge<Widget>)
{
focus_a_widget_if_possible(FocusSource::Mouse);
}
} }

2
Libraries/LibGUI/Window.h
View file

@ -196,6 +196,8 @@ public:
void update_cursor(Badge<Widget>) { update_cursor(); } void update_cursor(Badge<Widget>) { update_cursor(); }
void did_disable_focused_widget(Badge<Widget>);
protected: protected:
Window(Core::Object* parent = nullptr); Window(Core::Object* parent = nullptr);
virtual void wm_event(WMEvent&); virtual void wm_event(WMEvent&);