RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 00:57:45 +00:00
Code Issues Activity Actions

LibGUI+GMLPlayground: Set correct undo text for ReplaceAllTextCommand

Browse source 
- Make the text a parameter instead of forcing it to be about GML.
- Change the wording to be imperative, and match the action text.
This commit is contained in:
Sam Atkins 2023-07-26 17:37:55 +01:00 • committed by Tim Flynn
parent 1d7d194062
commit 988130a935
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/DevTools/GMLPlayground/MainWidget.cpp
View file

@ -221,7 +221,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
auto format_gml_action = GUI::Action::create("&Format GML", { Mod_Ctrl | Mod_Shift, Key_I }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/reformat.png"sv)), [&](auto&) { auto format_gml_action = GUI::Action::create("&Format GML", { Mod_Ctrl | Mod_Shift, Key_I }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/reformat.png"sv)), [&](auto&) {
auto formatted_gml_or_error = GUI::GML::format_gml(m_editor->text()); auto formatted_gml_or_error = GUI::GML::format_gml(m_editor->text());
if (!formatted_gml_or_error.is_error()) { if (!formatted_gml_or_error.is_error()) {
m_editor->replace_all_text_without_resetting_undo_stack(formatted_gml_or_error.release_value()); m_editor->replace_all_text_without_resetting_undo_stack(formatted_gml_or_error.release_value(), "Format GML"sv);
} else { } else {
GUI::MessageBox::show( GUI::MessageBox::show(
&window, &window,

4
Userland/Libraries/LibGUI/TextEditor.cpp
View file

@ -1798,9 +1798,9 @@ void TextEditor::insert_at_cursor_or_replace_selection(StringView text)
} }
} }
void TextEditor::replace_all_text_without_resetting_undo_stack(StringView text) void TextEditor::replace_all_text_without_resetting_undo_stack(StringView text, StringView action_text)
{ {
execute<ReplaceAllTextCommand>(text, "GML Playground Format Text"); execute<ReplaceAllTextCommand>(text, action_text);
did_change(); did_change();
update(); update();
} }

2
Userland/Libraries/LibGUI/TextEditor.h
View file

@ -138,7 +138,7 @@ public:
TextRange normalized_selection() const { return m_selection.normalized(); } TextRange normalized_selection() const { return m_selection.normalized(); }
void insert_at_cursor_or_replace_selection(StringView); void insert_at_cursor_or_replace_selection(StringView);
void replace_all_text_without_resetting_undo_stack(StringView text); void replace_all_text_without_resetting_undo_stack(StringView text, StringView action_text);
ErrorOr<void> write_to_file(StringView path); ErrorOr<void> write_to_file(StringView path);
ErrorOr<void> write_to_file(Core::File&); ErrorOr<void> write_to_file(Core::File&);
bool has_selection() const { return m_selection.is_valid(); } bool has_selection() const { return m_selection.is_valid(); }