From 5daa19fdabe86ff76c1814abef3f6261a828c9d8 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Fri, 28 Aug 2020 20:47:02 +0200 Subject: [PATCH] LibGUI: Implement a basic "any key pressed" edit trigger for TableView This trigger allows you to initiate cell editing by simply starting to type something into the cell. :^) --- Libraries/LibGUI/AbstractView.h | 2 +- Libraries/LibGUI/TableView.cpp | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Libraries/LibGUI/AbstractView.h b/Libraries/LibGUI/AbstractView.h index 70850fdb62..b98724b3aa 100644 --- a/Libraries/LibGUI/AbstractView.h +++ b/Libraries/LibGUI/AbstractView.h @@ -144,6 +144,7 @@ protected: ModelIndex m_edit_index; RefPtr m_edit_widget; Gfx::IntRect m_edit_widget_content_rect; + OwnPtr m_editing_delegate; Gfx::IntPoint m_left_mousedown_position; bool m_might_drag { false }; @@ -156,7 +157,6 @@ protected: private: RefPtr m_model; - OwnPtr m_editing_delegate; ModelSelection m_selection; ModelIndex m_cursor_index; unsigned m_edit_triggers { EditTrigger::DoubleClicked | EditTrigger::EditKeyPressed }; diff --git a/Libraries/LibGUI/TableView.cpp b/Libraries/LibGUI/TableView.cpp index 4309d307bf..d6b12c0f3d 100644 --- a/Libraries/LibGUI/TableView.cpp +++ b/Libraries/LibGUI/TableView.cpp @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -171,7 +172,17 @@ void TableView::keydown_event(KeyEvent& event) activate(cursor_index()); return; } - return AbstractTableView::keydown_event(event); + + AbstractTableView::keydown_event(event); + + if (event.is_accepted()) + return; + + if (is_editable() && edit_triggers() & EditTrigger::AnyKeyPressed && !event.text().is_empty()) { + begin_editing(cursor_index()); + if (m_editing_delegate) + m_editing_delegate->set_value(event.text()); + } } void TableView::move_cursor(CursorMovement movement, SelectionUpdate selection_update)