1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 18:17:44 +00:00

TableView: Do not select input on keydown

In the Spreadsheet app, selecting a cell and typing something (like
"1") would create an empty editing delegate, set "1" as its value and
immediately select the entire contents of the text box. If your goal
was to type "123", that "1" was selected and will be replaced by "23".

This changes the behavior of TableView to not select the editing
delegate's contents if its creation was a result of a keydown event.
This commit is contained in:
Jelle Raaijmakers 2021-07-11 21:46:34 +02:00 committed by Andreas Kling
parent bc5d50e78b
commit 0f35912bd7
4 changed files with 23 additions and 13 deletions

View file

@ -25,23 +25,23 @@ SpreadsheetView::~SpreadsheetView()
{
}
void SpreadsheetView::EditingDelegate::set_value(const GUI::Variant& value)
void SpreadsheetView::EditingDelegate::set_value(GUI::Variant const& value, GUI::ModelEditingDelegate::SelectionBehavior selection_behavior)
{
if (value.as_string().is_null()) {
StringModelEditingDelegate::set_value("");
StringModelEditingDelegate::set_value("", selection_behavior);
commit();
return;
}
if (m_has_set_initial_value)
return StringModelEditingDelegate::set_value(value);
return StringModelEditingDelegate::set_value(value, selection_behavior);
m_has_set_initial_value = true;
const auto option = m_sheet.at({ (size_t)index().column(), (size_t)index().row() });
if (option)
return StringModelEditingDelegate::set_value(option->source());
return StringModelEditingDelegate::set_value(option->source(), selection_behavior);
StringModelEditingDelegate::set_value("");
StringModelEditingDelegate::set_value("", selection_behavior);
}
void InfinitelyScrollableTableView::did_scroll()

View file

@ -116,7 +116,7 @@ private:
: m_sheet(sheet)
{
}
virtual void set_value(const GUI::Variant& value) override;
virtual void set_value(GUI::Variant const&, GUI::ModelEditingDelegate::SelectionBehavior) override;
virtual RefPtr<Widget> create_widget() override
{

View file

@ -14,6 +14,11 @@ namespace GUI {
class ModelEditingDelegate {
public:
enum SelectionBehavior {
DoNotSelect,
SelectAll,
};
virtual ~ModelEditingDelegate() { }
void bind(Model& model, const ModelIndex& index)
@ -32,7 +37,7 @@ public:
Function<void()> on_rollback;
virtual Variant value() const = 0;
virtual void set_value(const Variant&) = 0;
virtual void set_value(Variant const&, SelectionBehavior selection_behavior = SelectionBehavior::SelectAll) = 0;
virtual void will_begin_editing() { }
@ -76,10 +81,11 @@ public:
return textbox;
}
virtual Variant value() const override { return static_cast<const TextBox*>(widget())->text(); }
virtual void set_value(const Variant& value) override
virtual void set_value(Variant const& value, SelectionBehavior selection_behavior) override
{
auto& textbox = static_cast<TextBox&>(*widget());
textbox.set_text(value.to_string());
if (selection_behavior == SelectionBehavior::SelectAll)
textbox.select_all();
}
};

View file

@ -173,14 +173,18 @@ void TableView::keydown_event(KeyEvent& event)
if (event.is_accepted())
return;
auto is_delete = event.key() == Key_Delete || event.key() == Key_Backspace;
if (is_editable() && edit_triggers() & EditTrigger::AnyKeyPressed && (event.code_point() != 0 || is_delete)) {
auto is_delete = event.key() == Key_Delete;
auto is_backspace = event.key() == Key_Backspace;
auto is_clear = is_delete || is_backspace;
if (is_editable() && edit_triggers() & EditTrigger::AnyKeyPressed && (event.code_point() != 0 || is_clear)) {
begin_editing(cursor_index());
if (m_editing_delegate) {
if (is_delete)
m_editing_delegate->set_value(event.key() == Key_Delete ? String {} : String::empty());
m_editing_delegate->set_value(String {});
else if (is_backspace)
m_editing_delegate->set_value(String::empty());
else
m_editing_delegate->set_value(event.text());
m_editing_delegate->set_value(event.text(), ModelEditingDelegate::SelectionBehavior::DoNotSelect);
}
}
}