mirror of
https://github.com/SerenityOS/serenity
synced 2024-07-23 19:15:55 +00:00
GameOfLife: Allow pressing escape to clear the selected pattern
This commit is contained in:
parent
f25f2ba047
commit
881581820f
|
@ -78,11 +78,7 @@ void BoardWidget::set_running(bool running)
|
||||||
if (running == m_running)
|
if (running == m_running)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (m_selected_pattern) {
|
clear_selected_pattern();
|
||||||
m_selected_pattern = nullptr;
|
|
||||||
if (on_pattern_selection_state_change)
|
|
||||||
on_pattern_selection_state_change();
|
|
||||||
}
|
|
||||||
|
|
||||||
m_running = running;
|
m_running = running;
|
||||||
|
|
||||||
|
@ -206,12 +202,7 @@ void BoardWidget::mousedown_event(GUI::MouseEvent& event)
|
||||||
if (m_selected_pattern) {
|
if (m_selected_pattern) {
|
||||||
place_pattern(row, column);
|
place_pattern(row, column);
|
||||||
if (!event.ctrl()) {
|
if (!event.ctrl()) {
|
||||||
m_selected_pattern = nullptr;
|
clear_selected_pattern();
|
||||||
if (on_pattern_selection_state_change)
|
|
||||||
on_pattern_selection_state_change();
|
|
||||||
|
|
||||||
if (m_pattern_preview_timer->is_active())
|
|
||||||
m_pattern_preview_timer->stop();
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
toggle_cell(row, column);
|
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)
|
void BoardWidget::context_menu_event(GUI::ContextMenuEvent& event)
|
||||||
{
|
{
|
||||||
if (!m_context_menu) {
|
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()
|
void BoardWidget::setup_patterns()
|
||||||
{
|
{
|
||||||
auto add_pattern = [&](auto name, NonnullOwnPtr<Pattern> pattern) {
|
auto add_pattern = [&](auto name, NonnullOwnPtr<Pattern> pattern) {
|
||||||
|
|
|
@ -26,6 +26,7 @@ public:
|
||||||
virtual void mousemove_event(GUI::MouseEvent&) override;
|
virtual void mousemove_event(GUI::MouseEvent&) override;
|
||||||
virtual void mouseup_event(GUI::MouseEvent&) override;
|
virtual void mouseup_event(GUI::MouseEvent&) override;
|
||||||
virtual void mousedown_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;
|
virtual void context_menu_event(GUI::ContextMenuEvent&) override;
|
||||||
|
|
||||||
void set_toggling_cells(bool toggling)
|
void set_toggling_cells(bool toggling)
|
||||||
|
@ -74,6 +75,7 @@ private:
|
||||||
BoardWidget(size_t rows, size_t columns);
|
BoardWidget(size_t rows, size_t columns);
|
||||||
void setup_patterns();
|
void setup_patterns();
|
||||||
void place_pattern(size_t row, size_t column);
|
void place_pattern(size_t row, size_t column);
|
||||||
|
void clear_selected_pattern();
|
||||||
|
|
||||||
bool m_toggling_cells { false };
|
bool m_toggling_cells { false };
|
||||||
Board::RowAndColumn m_last_cell_toggled {};
|
Board::RowAndColumn m_last_cell_toggled {};
|
||||||
|
|
Loading…
Reference in a new issue