From 9b893037670e16bd0b51b8cb7f4e0d30bb710413 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Fri, 18 Sep 2020 18:02:06 +0200 Subject: [PATCH] LibGUI: StackWidget should not steal focus when switching active child Only focus the new active child if the old one had focus previously. --- Libraries/LibGUI/StackWidget.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Libraries/LibGUI/StackWidget.cpp b/Libraries/LibGUI/StackWidget.cpp index eaaf05dfa1..c7baf99d69 100644 --- a/Libraries/LibGUI/StackWidget.cpp +++ b/Libraries/LibGUI/StackWidget.cpp @@ -42,12 +42,15 @@ void StackWidget::set_active_widget(Widget* widget) if (widget == m_active_widget) return; + bool had_focus = is_focused() || (m_active_widget && m_active_widget->is_focused()); + if (m_active_widget) m_active_widget->set_visible(false); m_active_widget = widget; if (m_active_widget) { m_active_widget->set_relative_rect(rect()); - m_active_widget->set_focus(true); + if (had_focus) + m_active_widget->set_focus(true); m_active_widget->set_visible(true); } if (on_active_widget_change)