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

LibGfx: Unpublish Gfx::Rect from global namespace

Browse source
This commit is contained in:
Andreas Kling 2020-02-06 13:02:38 +01:00
parent c39d44fc2e
commit 20cfd2a6bf
78 changed files with 262 additions and 260 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Games/Minesweeper/Field.cpp
View file

@ -237,7 +237,7 @@ void Field::reset()
for (int c = 0; c < columns(); ++c) {
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() };
Gfx::Rect rect = { frame_thickness() + c * square_size(), frame_thickness() + r * square_size(), square_size(), square_size() };
auto& square = this->square(r, c);
square.field = this;
square.row = r;

14
Games/Snake/SnakeGame.cpp
View file

@ -90,13 +90,13 @@ void SnakeGame::spawn_fruit()
m_fruit_type = rand() % m_fruit_bitmaps.size();
}
Rect SnakeGame::score_rect() const
Gfx::Rect SnakeGame::score_rect() const
{
int score_width = font().width(m_score_text);
return { width() - score_width - 2, height() - font().glyph_height() - 2, score_width, font().glyph_height() };
}
Rect SnakeGame::high_score_rect() const
Gfx::Rect SnakeGame::high_score_rect() const
{
int high_score_width = font().width(m_high_score_text);
return { 2, height() - font().glyph_height() - 2, high_score_width, font().glyph_height() };
@ -193,7 +193,7 @@ void SnakeGame::keydown_event(GUI::KeyEvent& event)
}
}
Rect SnakeGame::cell_rect(const Coordinate& coord) const
Gfx::Rect SnakeGame::cell_rect(const Coordinate& coord) const
{
auto game_rect = rect();
auto cell_size = Size(game_rect.width() / m_columns, game_rect.height() / m_rows);
@ -216,10 +216,10 @@ void SnakeGame::paint_event(GUI::PaintEvent& event)
auto rect = cell_rect(part);
painter.fill_rect(rect, Color::from_rgb(0xaaaa00));
Rect left_side(rect.x(), rect.y(), 2, rect.height());
Rect top_side(rect.x(), rect.y(), rect.width(), 2);
Rect right_side(rect.right() - 1, rect.y(), 2, rect.height());
Rect bottom_side(rect.x(), rect.bottom() - 1, rect.width(), 2);
Gfx::Rect left_side(rect.x(), rect.y(), 2, rect.height());
Gfx::Rect top_side(rect.x(), rect.y(), rect.width(), 2);
Gfx::Rect right_side(rect.right() - 1, rect.y(), 2, rect.height());
Gfx::Rect bottom_side(rect.x(), rect.bottom() - 1, rect.width(), 2);
painter.fill_rect(left_side, Color::from_rgb(0xcccc00));
painter.fill_rect(right_side, Color::from_rgb(0x888800));
painter.fill_rect(top_side, Color::from_rgb(0xcccc00));

6
Games/Snake/SnakeGame.h
View file

@ -63,9 +63,9 @@ private:
bool is_available(const Coordinate&);
void queue_velocity(int v, int h);
const Velocity& last_velocity() const;
Rect cell_rect(const Coordinate&) const;
Rect score_rect() const;
Rect high_score_rect() const;
Gfx::Rect cell_rect(const Coordinate&) const;
Gfx::Rect score_rect() const;
Gfx::Rect high_score_rect() const;
int m_rows { 20 };
int m_columns { 20 };