system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-09 05:40:46 +00:00
Code Issues Projects Releases Wiki Activity

GameOfLife: Allow pressing escape to clear the selected pattern

Browse Source
This commit is contained in:
Tim Ledbetter 2023-09-28 01:03:32 +01:00 committed by Andreas Kling
parent f25f2ba047
commit 881581820f
2 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Userland/Games/GameOfLife/BoardWidget.cpp
View File

@ -78,11 +78,7 @@ void BoardWidget::set_running(bool running)
if (running == m_running)
return;
if (m_selected_pattern) {
m_selected_pattern = nullptr;
if (on_pattern_selection_state_change)
on_pattern_selection_state_change();
}
clear_selected_pattern();
m_running = running;
@ -206,12 +202,7 @@ void BoardWidget::mousedown_event(GUI::MouseEvent& event)
if (m_selected_pattern) {
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();
clear_selected_pattern();
}
} else {
toggle_cell(row, column);
@ -219,6 +210,17 @@ void BoardWidget::mousedown_event(GUI::MouseEvent& event)
}
}
void BoardWidget::keydown_event(GUI::KeyEvent& event)
{
if (event.key() == Key_Escape) {
clear_selected_pattern();
update();
return;
}
event.ignore();
}
void BoardWidget::context_menu_event(GUI::ContextMenuEvent& event)
{
if (!m_context_menu) {
@ -287,6 +289,19 @@ void BoardWidget::place_pattern(size_t row, size_t column)
}
}
void BoardWidget::clear_selected_pattern()
{
if (!m_selected_pattern)
return;
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()
{
auto add_pattern = [&](auto name, NonnullOwnPtr<Pattern> pattern) {

2
Userland/Games/GameOfLife/BoardWidget.h
View File

@ -26,6 +26,7 @@ public:
virtual void mousemove_event(GUI::MouseEvent&) override;
virtual void mouseup_event(GUI::MouseEvent&) override;
virtual void mousedown_event(GUI::MouseEvent&) override;
virtual void keydown_event(GUI::KeyEvent&) override;
virtual void context_menu_event(GUI::ContextMenuEvent&) override;
void set_toggling_cells(bool toggling)
@ -74,6 +75,7 @@ private:
BoardWidget(size_t rows, size_t columns);
void setup_patterns();
void place_pattern(size_t row, size_t column);
void clear_selected_pattern();
bool m_toggling_cells { false };
Board::RowAndColumn m_last_cell_toggled {};