From b77f9a5042fcddf9fa18d2fb9c047f3e272ccce6 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Tue, 16 Apr 2019 23:18:26 +0200 Subject: [PATCH] VisualBuilder: Pressing the Tab key when there are no widgets is a no-op. --- Applications/VisualBuilder/VBForm.cpp | 28 +++++++++++++-------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/Applications/VisualBuilder/VBForm.cpp b/Applications/VisualBuilder/VBForm.cpp index 49b6bb99ac..2666901775 100644 --- a/Applications/VisualBuilder/VBForm.cpp +++ b/Applications/VisualBuilder/VBForm.cpp @@ -108,25 +108,23 @@ void VBForm::grabber_mousedown_event(GMouseEvent& event, VBWidget& widget, Direc void VBForm::keydown_event(GKeyEvent& event) { if (event.key() == KeyCode::Key_Tab) { - if (!m_selected_widget) { - if (!m_widgets.is_empty()) { - set_selected_widget(m_widgets.first()); - update(); - } + if (m_widgets.is_empty()) return; - } else { - int selected_widget_index = 0; - for (; selected_widget_index < m_widgets.size(); ++selected_widget_index) { - if (m_widgets[selected_widget_index] == m_selected_widget) - break; - } - ++selected_widget_index; - if (selected_widget_index == m_widgets.size()) - selected_widget_index = 0; - set_selected_widget(m_widgets[selected_widget_index]); + if (!m_selected_widget) { + set_selected_widget(m_widgets.first()); update(); return; } + int selected_widget_index = 0; + for (; selected_widget_index < m_widgets.size(); ++selected_widget_index) { + if (m_widgets[selected_widget_index] == m_selected_widget) + break; + } + ++selected_widget_index; + if (selected_widget_index == m_widgets.size()) + selected_widget_index = 0; + set_selected_widget(m_widgets[selected_widget_index]); + update(); } if (m_selected_widget) { switch (event.key()) {