mirrors/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity.git synced 2025-01-23 18:02:05 -05:00
Code Issues Projects Releases Packages Wiki Activity

HackStudio: Make wrapping modes consistent

Browse source 
We were only setting the wrapping mode when triggering the action. So:
- Any editors open without triggering a wrapping-mode action would have
  the default (WrapAtWords) instead of the selected item (NoWrap).
- Any editors opened after triggering an action would have the default
  too.

This fixes both situations, by:
- Storing the current wrapping mode in `m_wrapping_mode`. Later this
  could be loaded from the config.
- Changing that value any time a wrapping-mode action is triggered.
- Setting the wrapping mode on newly-created editors.
This commit is contained in:
Sam Atkins 2023-02-19 16:47:18 +00:00 • committed by Andreas Kling
parent bb8c8a67dc
commit 307cd4a1da
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Userland/DevTools/HackStudio/HackStudioWidget.cpp
View file

@ -788,6 +788,7 @@ void HackStudioWidget::add_new_editor(GUI::TabWidget& parent)
m_all_editor_wrappers.append(wrapper);
wrapper.editor().set_focus(true);
wrapper.editor().set_font(*m_editor_font);
wrapper.editor().set_wrapping_mode(m_wrapping_mode);
wrapper.set_project_root(m_project->root_path());
wrapper.editor().on_cursor_change = [this] { on_cursor_change(); };
wrapper.on_change = [this] { update_gml_preview(); };
@ -1499,14 +1500,17 @@ ErrorOr<void> HackStudioWidget::create_view_menu(GUI::Window& window)
m_wrapping_mode_actions.set_exclusive(true);
auto& wrapping_mode_menu = view_menu.add_submenu("&Wrapping Mode");
m_no_wrapping_action = GUI::Action::create_checkable("&No Wrapping", [&](auto&) {
m_wrapping_mode = GUI::TextEditor::WrappingMode::NoWrap;
for (auto& wrapper : m_all_editor_wrappers)
wrapper.editor().set_wrapping_mode(GUI::TextEditor::WrappingMode::NoWrap);
});
m_wrap_anywhere_action = GUI::Action::create_checkable("Wrap &Anywhere", [&](auto&) {
m_wrapping_mode = GUI::TextEditor::WrappingMode::WrapAnywhere;
for (auto& wrapper : m_all_editor_wrappers)
wrapper.editor().set_wrapping_mode(GUI::TextEditor::WrappingMode::WrapAnywhere);
});
m_wrap_at_words_action = GUI::Action::create_checkable("Wrap at &Words", [&](auto&) {
m_wrapping_mode = GUI::TextEditor::WrappingMode::WrapAtWords;
for (auto& wrapper : m_all_editor_wrappers)
wrapper.editor().set_wrapping_mode(GUI::TextEditor::WrappingMode::WrapAtWords);
});
@ -1519,7 +1523,17 @@ ErrorOr<void> HackStudioWidget::create_view_menu(GUI::Window& window)
wrapping_mode_menu.add_action(*m_wrap_anywhere_action);
wrapping_mode_menu.add_action(*m_wrap_at_words_action);
m_no_wrapping_action->set_checked(true);
switch (m_wrapping_mode) {
case GUI::TextEditor::NoWrap:
m_no_wrapping_action->set_checked(true);
break;
case GUI::TextEditor::WrapAtWords:
m_wrap_at_words_action->set_checked(true);
break;
case GUI::TextEditor::WrapAnywhere:
m_wrap_anywhere_action->set_checked(true);
break;
}
auto icon = TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/app-font-editor.png"sv));
m_editor_font_action = GUI::Action::create("Editor &Font...", icon,

1
Userland/DevTools/HackStudio/HackStudioWidget.h
View file

@ -253,6 +253,7 @@ private:
RefPtr<Gfx::Font> m_editor_font;
RefPtr<GUI::Action> m_editor_font_action;
GUI::TextEditor::WrappingMode m_wrapping_mode { GUI::TextEditor::NoWrap };
GUI::ActionGroup m_wrapping_mode_actions;
RefPtr<GUI::Action> m_no_wrapping_action;
RefPtr<GUI::Action> m_wrap_anywhere_action;