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

GameOfLife: Allow ctrl+click to place multiple patterns

Browse source
This commit is contained in:
Tim Ledbetter 2023-09-19 21:39:41 +01:00 • committed by Andreas Kling
parent 15629e8925
commit 4b48757586
2 changed files with 27 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Userland/Games/GameOfLife/BoardWidget.cpp
View file

@ -195,10 +195,20 @@ void BoardWidget::mousedown_event(GUI::MouseEvent& event)
if (!row_and_column.has_value()) if (!row_and_column.has_value())
return; return;
auto [row, column] = row_and_column.value(); auto [row, column] = row_and_column.value();
if (m_selected_pattern == nullptr)
toggle_cell(row, column); if (m_selected_pattern) {
else
place_pattern(row, column); place_pattern(row, column);
if (!event.ctrl()) {
m_selected_pattern = nullptr;
if (on_pattern_selection_state_change)
on_pattern_selection_state_change();
if (m_pattern_preview_timer->is_active())
m_pattern_preview_timer->stop();
}
} else {
toggle_cell(row, column);
}
} }
} }
@ -267,11 +277,6 @@ void BoardWidget::place_pattern(size_t row, size_t column)
} }
y_offset++; y_offset++;
} }
m_selected_pattern = nullptr;
if (on_pattern_selection_state_change)
on_pattern_selection_state_change();
if (m_pattern_preview_timer->is_active())
m_pattern_preview_timer->stop();
} }
void BoardWidget::setup_patterns() void BoardWidget::setup_patterns()

21
Userland/Games/GameOfLife/main.cpp
View file

@ -39,7 +39,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
TRY(Core::System::unveil("/res", "r")); TRY(Core::System::unveil("/res", "r"));
TRY(Core::System::unveil(nullptr, nullptr)); TRY(Core::System::unveil(nullptr, nullptr));
auto click_tip = "Tip: click the board to toggle individual cells, or click+drag to toggle multiple cells"_string; auto toggle_cells_tip = "Tip: click the board to toggle individual cells, or click+drag to toggle multiple cells"_string;
auto pattern_place_tip = "Tip: hold Ctrl to place multiple patterns"_string;
auto app_icon = TRY(GUI::Icon::try_create_default_icon("app-gameoflife"sv)); auto app_icon = TRY(GUI::Icon::try_create_default_icon("app-gameoflife"sv));
@ -68,7 +69,12 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto& statusbar = *main_widget->find_descendant_of_type_named<GUI::Statusbar>("statusbar"); auto& statusbar = *main_widget->find_descendant_of_type_named<GUI::Statusbar>("statusbar");
auto width = board_widget.font().width("Ticks: 000,000,000"sv) + board_widget.font().max_glyph_width(); auto width = board_widget.font().width("Ticks: 000,000,000"sv) + board_widget.font().max_glyph_width();
statusbar.segment(1).set_fixed_width(ceil(width)); statusbar.segment(1).set_fixed_width(ceil(width));
statusbar.segment(0).set_text(click_tip);
auto show_statusbar_hint = [&]() {
auto tip = board_widget->selected_pattern() ? pattern_place_tip : toggle_cells_tip;
statusbar.segment(0).set_text(tip);
};
show_statusbar_hint();
auto& columns_spinbox = *main_widget->find_descendant_of_type_named<GUI::SpinBox>("columns_spinbox"); auto& columns_spinbox = *main_widget->find_descendant_of_type_named<GUI::SpinBox>("columns_spinbox");
auto& rows_spinbox = *main_widget->find_descendant_of_type_named<GUI::SpinBox>("rows_spinbox"); auto& rows_spinbox = *main_widget->find_descendant_of_type_named<GUI::SpinBox>("rows_spinbox");
@ -77,7 +83,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
rows_spinbox.set_value(board_rows); rows_spinbox.set_value(board_rows);
auto size_changed_function = [&] { auto size_changed_function = [&] {
statusbar.segment(0).set_text(click_tip); show_statusbar_hint();
board_widget.resize_board(rows_spinbox.value(), columns_spinbox.value()); board_widget.resize_board(rows_spinbox.value(), columns_spinbox.value());
board_widget.update(); board_widget.update();
}; };
@ -103,13 +109,13 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
main_toolbar.add_action(play_pause_action); main_toolbar.add_action(play_pause_action);
auto run_one_generation_action = GUI::Action::create("Run &Next Generation", { Mod_Ctrl, Key_Equal }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/go-forward.png"sv)), [&](const GUI::Action&) { auto run_one_generation_action = GUI::Action::create("Run &Next Generation", { Mod_Ctrl, Key_Equal }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/go-forward.png"sv)), [&](const GUI::Action&) {
statusbar.segment(0).set_text(click_tip); show_statusbar_hint();
board_widget.run_generation(); board_widget.run_generation();
}); });
main_toolbar.add_action(run_one_generation_action); main_toolbar.add_action(run_one_generation_action);
auto clear_board_action = GUI::Action::create("&Clear board", { Mod_Ctrl, Key_N }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/delete.png"sv)), [&](auto&) { auto clear_board_action = GUI::Action::create("&Clear board", { Mod_Ctrl, Key_N }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/delete.png"sv)), [&](auto&) {
statusbar.segment(0).set_text(click_tip); show_statusbar_hint();
statusbar.segment(1).set_text({}); statusbar.segment(1).set_text({});
board_widget.clear_cells(); board_widget.clear_cells();
board_widget.update(); board_widget.update();
@ -117,7 +123,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
main_toolbar.add_action(clear_board_action); main_toolbar.add_action(clear_board_action);
auto randomize_cells_action = GUI::Action::create("&Randomize board", { Mod_Ctrl, Key_R }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/reload.png"sv)), [&](auto&) { auto randomize_cells_action = GUI::Action::create("&Randomize board", { Mod_Ctrl, Key_R }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/reload.png"sv)), [&](auto&) {
statusbar.segment(0).set_text(click_tip); show_statusbar_hint();
statusbar.segment(1).set_text({}); statusbar.segment(1).set_text({});
board_widget.randomize_cells(); board_widget.randomize_cells();
board_widget.update(); board_widget.update();
@ -185,11 +191,12 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
}; };
board_widget.on_cell_toggled = [&](auto, auto, auto) { board_widget.on_cell_toggled = [&](auto, auto, auto) {
statusbar.segment(0).set_text(click_tip); show_statusbar_hint();
statusbar.segment(1).set_text({}); statusbar.segment(1).set_text({});
}; };
board_widget.on_pattern_selection_state_change = [&] { board_widget.on_pattern_selection_state_change = [&] {
show_statusbar_hint();
rotate_pattern_action->set_enabled(board_widget.selected_pattern() != nullptr); rotate_pattern_action->set_enabled(board_widget.selected_pattern() != nullptr);
}; };