RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-22 18:45:08 +00:00
Code Issues Activity Actions

Minesweeper: Fix lag when changing the field size.

Browse source 
Use a number of techniques to avoid freezing the UI for too long.

- Keep reusing the same widgets for the squares once they've been created.
- Temporarily disable widget updates.
- Avoid some redundant work on each run of reset().
This commit is contained in:
Andreas Kling 2019-05-02 04:21:21 +02:00
parent 49d0cdabac
commit 13b8c7eab8
2 changed files with 43 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

67
Games/Minesweeper/Field.cpp
View file

@ -167,6 +167,7 @@ void Square::for_each_neighbor(Callback callback)
void Field::reset() void Field::reset()
{ {
set_updates_enabled(false);
m_time_elapsed = 0; m_time_elapsed = 0;
m_time_label.set_text("0"); m_time_label.set_text("0");
m_flags_left = m_mine_count; m_flags_left = m_mine_count;
@ -175,8 +176,14 @@ void Field::reset()
set_greedy_for_hits(false); set_greedy_for_hits(false);
set_face(Face::Default); set_face(Face::Default);
srand(time(nullptr)); srand(time(nullptr));
m_squares.clear();
m_squares.resize(rows() * columns()); m_squares.resize(max(m_squares.size(), rows() * columns()));
for (int i = rows() * columns(); i < m_squares.size(); ++i) {
auto& square = m_squares[i];
square->button->set_visible(false);
square->label->set_visible(false);
}
HashTable<int> mines; HashTable<int> mines;
while (mines.size() != m_mine_count) { while (mines.size() != m_mine_count) {
@ -188,7 +195,8 @@ void Field::reset()
int i = 0; int i = 0;
for (int r = 0; r < rows(); ++r) { for (int r = 0; r < rows(); ++r) {
for (int c = 0; c < columns(); ++c) { for (int c = 0; c < columns(); ++c) {
m_squares[i] = make<Square>(); if (!m_squares[i])
m_squares[i] = make<Square>();
Rect rect = { frame_thickness() + c * square_size(), frame_thickness() + r * square_size(), square_size(), square_size() }; Rect rect = { frame_thickness() + c * square_size(), frame_thickness() + r * square_size(), square_size(), square_size() };
auto& square = this->square(r, c); auto& square = this->square(r, c);
square.field = this; square.field = this;
@ -198,35 +206,39 @@ void Field::reset()
square.has_flag = false; square.has_flag = false;
square.is_considering = false; square.is_considering = false;
square.is_swept = false; square.is_swept = false;
if (!square.label) if (!square.label) {
square.label = new SquareLabel(square, this); square.label = new SquareLabel(square, this);
square.label->set_background_color(Color::from_rgb(0xff4040));
}
square.label->set_fill_with_background_color(false);
square.label->set_relative_rect(rect); square.label->set_relative_rect(rect);
square.label->set_visible(false); square.label->set_visible(false);
square.label->set_icon(square.has_mine ? m_mine_bitmap : nullptr); square.label->set_icon(square.has_mine ? m_mine_bitmap : nullptr);
square.label->set_background_color(Color::from_rgb(0xff4040)); if (!square.button) {
square.label->set_fill_with_background_color(false);
if (!square.button)
square.button = new SquareButton(this); square.button = new SquareButton(this);
square.button->set_checkable(true); square.button->set_checkable(true);
square.button->on_click = [this, &square] (GButton&) {
on_square_clicked(square);
};
square.button->on_right_click = [this, &square] {
on_square_right_clicked(square);
};
square.button->on_middle_click = [this, &square] {
on_square_middle_clicked(square);
};
square.label->on_chord_click = [this, &square] {
on_square_chorded(square);
};
}
square.button->set_checked(false); square.button->set_checked(false);
square.button->set_icon(nullptr); square.button->set_icon(nullptr);
square.button->set_relative_rect(rect); square.button->set_relative_rect(rect);
square.button->set_visible(true); square.button->set_visible(true);
square.button->on_click = [this, &square] (GButton&) {
on_square_clicked(square);
};
square.button->on_right_click = [this, &square] {
on_square_right_clicked(square);
};
square.button->on_middle_click = [this, &square] {
on_square_middle_clicked(square);
};
square.label->on_chord_click = [this, &square] {
on_square_chorded(square);
};
++i; ++i;
} }
} }
for (int r = 0; r < rows(); ++r) { for (int r = 0; r < rows(); ++r) {
for (int c = 0; c < columns(); ++c) { for (int c = 0; c < columns(); ++c) {
auto& square = this->square(r, c); auto& square = this->square(r, c);
@ -243,8 +255,7 @@ void Field::reset()
} }
m_unswept_empties = rows() * columns() - m_mine_count; m_unswept_empties = rows() * columns() - m_mine_count;
set_updates_enabled(true);
update();
} }
void Field::flood_fill(Square& square) void Field::flood_fill(Square& square)
@ -413,15 +424,17 @@ void Field::set_field_size(int rows, int columns, int mine_count)
{ {
if (m_rows == rows && m_columns == columns && m_mine_count == mine_count) if (m_rows == rows && m_columns == columns && m_mine_count == mine_count)
return; return;
auto config = CConfigFile::get_for_app("Minesweeper"); {
config->write_num_entry("Game", "MineCount", mine_count); auto config = CConfigFile::get_for_app("Minesweeper");
config->write_num_entry("Game", "Rows", rows); config->write_num_entry("Game", "MineCount", mine_count);
config->write_num_entry("Game", "Columns", columns); config->write_num_entry("Game", "Rows", rows);
config->write_num_entry("Game", "Columns", columns);
}
m_rows = rows; m_rows = rows;
m_columns = columns; m_columns = columns;
m_mine_count = mine_count; m_mine_count = mine_count;
reset();
set_preferred_size({ frame_thickness() * 2 + m_columns * square_size(), frame_thickness() * 2 + m_rows * square_size() }); set_preferred_size({ frame_thickness() * 2 + m_columns * square_size(), frame_thickness() * 2 + m_rows * square_size() });
reset();
if (on_size_changed) if (on_size_changed)
on_size_changed(); on_size_changed();
} }

3
Games/Minesweeper/main.cpp
View file

@ -77,6 +77,9 @@ int main(int argc, char** argv)
game_menu->add_action(GAction::create("Expert", { Mod_Ctrl, Key_E }, [field] (const GAction&) { game_menu->add_action(GAction::create("Expert", { Mod_Ctrl, Key_E }, [field] (const GAction&) {
field->set_field_size(16, 30, 99); field->set_field_size(16, 30, 99);
})); }));
game_menu->add_action(GAction::create("Madwoman", { Mod_Ctrl, Key_M }, [field] (const GAction&) {
field->set_field_size(32, 60, 350);
}));
menubar->add_menu(move(game_menu)); menubar->add_menu(move(game_menu));
auto help_menu = make<GMenu>("Help"); auto help_menu = make<GMenu>("Help");