From 0f0b37d137207fa838d26045cf275d89d5a8af5e Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Mon, 24 Aug 2020 21:10:00 +0200 Subject: [PATCH] LibGUI: Return focus to view when stopping editing If the editing widget (as provided by the editing delegate) was focused when editing stops, have the view take back focus. --- Libraries/LibGUI/AbstractView.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Libraries/LibGUI/AbstractView.cpp b/Libraries/LibGUI/AbstractView.cpp index a86e222fd0..5fc9425e3b 100644 --- a/Libraries/LibGUI/AbstractView.cpp +++ b/Libraries/LibGUI/AbstractView.cpp @@ -151,11 +151,15 @@ void AbstractView::begin_editing(const ModelIndex& index) void AbstractView::stop_editing() { + bool take_back_focus = false; m_edit_index = {}; if (m_edit_widget) { + take_back_focus = m_edit_widget->is_focused(); remove_child(*m_edit_widget); m_edit_widget = nullptr; } + if (take_back_focus) + set_focus(true); } void AbstractView::activate(const ModelIndex& index)