system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-23 02:55:15 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Chess+GamesSettings: Use the correct term for chess squares

Browse source 
"Square" is the technical term, so let's use it. :^)

Also, stop using size_t for pixel sizes, that's not what that means.
This commit is contained in:
Sam Atkins 2023-02-02 17:36:49 +00:00 committed by Andreas Kling
parent f9742d53c5
commit 7e4186de63
2 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Userland/Applications/GamesSettings/ChessSettingsWidget.cpp
View file

@ -162,27 +162,27 @@ private:
// To show all the piece graphics, we need at least 12 squares visible.
// With the same preview size as we use for card games, a nice fit is 2 ranks of 6.
// There are definitely better ways of doing this, but it'll do. ;^)
size_t tile_size = 61;
auto square_size = 61;
auto rect_for_square = [&](Chess::Square const& square) {
return Gfx::IntRect {
frame_inner_rect().left() + square.file * tile_size,
frame_inner_rect().bottom() + 1 - (square.rank + 1) * tile_size,
tile_size,
tile_size
frame_inner_rect().left() + square.file * square_size,
frame_inner_rect().bottom() + 1 - (square.rank + 1) * square_size,
square_size,
square_size
};
};
for (int rank = 0; rank < 3; ++rank) {
for (int file = 0; file < 8; ++file) {
Chess::Square square { rank, file };
auto tile_rect = rect_for_square(square);
painter.fill_rect(tile_rect, square.is_light() ? m_light_square_color : m_dark_square_color);
auto square_rect = rect_for_square(square);
painter.fill_rect(square_rect, square.is_light() ? m_light_square_color : m_dark_square_color);
if (m_show_coordinates) {
auto coord = square.to_algebraic();
auto text_color = square.is_light() ? m_dark_square_color : m_light_square_color;
auto shrunken_rect = tile_rect.shrunken(4, 4);
auto shrunken_rect = square_rect.shrunken(4, 4);
if (square.rank == 0)
painter.draw_text(shrunken_rect, coord.substring_view(0, 1), coordinate_font, Gfx::TextAlignment::BottomRight, text_color);

42
Userland/Games/Chess/ChessWidget.cpp
View file

@ -39,8 +39,8 @@ void ChessWidget::paint_event(GUI::PaintEvent& event)
painter.translate(frame_thickness() + widget_offset_x, frame_thickness() + widget_offset_y);
size_t tile_width = min_size / 8;
size_t tile_height = min_size / 8;
auto square_width = min_size / 8;
auto square_height = min_size / 8;
int coord_rank_file = (side() == Chess::Color::White) ? 0 : 7;
Chess::Board& active_board = (m_playback ? board_playback() : board());
@ -50,9 +50,9 @@ void ChessWidget::paint_event(GUI::PaintEvent& event)
Chess::Square::for_each([&](Chess::Square sq) {
Gfx::IntRect tile_rect;
if (side() == Chess::Color::White) {
tile_rect = { sq.file * tile_width, (7 - sq.rank) * tile_height, tile_width, tile_height };
tile_rect = { sq.file * square_width, (7 - sq.rank) * square_height, square_width, square_height };
} else {
tile_rect = { (7 - sq.file) * tile_width, sq.rank * tile_height, tile_width, tile_height };
tile_rect = { (7 - sq.file) * square_width, sq.rank * square_height, square_width, square_height };
}
painter.fill_rect(tile_rect, (sq.is_light()) ? board_theme().light_square_color : board_theme().dark_square_color);
@ -129,28 +129,28 @@ void ChessWidget::paint_event(GUI::PaintEvent& event)
Gfx::FloatPoint arrow_end;
if (side() == Chess::Color::White) {
arrow_start = { m.from.file * tile_width + tile_width / 2.0f, (7 - m.from.rank) * tile_height + tile_height / 2.0f };
arrow_end = { m.to.file * tile_width + tile_width / 2.0f, (7 - m.to.rank) * tile_height + tile_height / 2.0f };
arrow_start = { m.from.file * square_width + square_width / 2.0f, (7 - m.from.rank) * square_height + square_height / 2.0f };
arrow_end = { m.to.file * square_width + square_width / 2.0f, (7 - m.to.rank) * square_height + square_height / 2.0f };
} else {
arrow_start = { (7 - m.from.file) * tile_width + tile_width / 2.0f, m.from.rank * tile_height + tile_height / 2.0f };
arrow_end = { (7 - m.to.file) * tile_width + tile_width / 2.0f, m.to.rank * tile_height + tile_height / 2.0f };
arrow_start = { (7 - m.from.file) * square_width + square_width / 2.0f, m.from.rank * square_height + square_height / 2.0f };
arrow_end = { (7 - m.to.file) * square_width + square_width / 2.0f, m.to.rank * square_height + square_height / 2.0f };
}
Gfx::Color color = m.secondary_color ? m_marking_secondary_color : (m.alternate_color ? m_marking_primary_color : m_marking_alternate_color);
draw_arrow(arrow_start, arrow_end, tile_width / 8.0f, tile_width / 10.0f, tile_height / 2.5f, color);
draw_arrow(arrow_start, arrow_end, square_width / 8.0f, square_width / 10.0f, square_height / 2.5f, color);
}
}
if (m_dragging_piece) {
if (m_show_available_moves) {
Gfx::IntPoint move_point;
Gfx::IntPoint point_offset = { tile_width / 3, tile_height / 3 };
Gfx::IntSize rect_size = { tile_width / 3, tile_height / 3 };
Gfx::IntPoint point_offset = { square_width / 3, square_height / 3 };
Gfx::IntSize rect_size = { square_width / 3, square_height / 3 };
for (auto const& square : m_available_moves) {
if (side() == Chess::Color::White) {
move_point = { square.file * tile_width, (7 - square.rank) * tile_height };
move_point = { square.file * square_width, (7 - square.rank) * square_height };
} else {
move_point = { (7 - square.file) * tile_width, square.rank * tile_height };
move_point = { (7 - square.file) * square_width, square.rank * square_height };
}
Gfx::AntiAliasingPainter aa_painter { painter };
@ -160,16 +160,16 @@ void ChessWidget::paint_event(GUI::PaintEvent& event)
Gfx::IntRect origin_square;
if (side() == Chess::Color::White) {
origin_square = { m_moving_square.file * tile_width, (7 - m_moving_square.rank) * tile_height, tile_width, tile_height };
origin_square = { m_moving_square.file * square_width, (7 - m_moving_square.rank) * square_height, square_width, square_height };
} else {
origin_square = { (7 - m_moving_square.file) * tile_width, m_moving_square.rank * tile_height, tile_width, tile_height };
origin_square = { (7 - m_moving_square.file) * square_width, m_moving_square.rank * square_height, square_width, square_height };
}
painter.fill_rect(origin_square, m_move_highlight_color);
auto bmp = m_pieces.get(active_board.get_piece(m_moving_square));
if (bmp.has_value()) {
auto center = m_drag_point - Gfx::IntPoint(tile_width / 2, tile_height / 2);
painter.draw_scaled_bitmap({ center, { tile_width, tile_height } }, *bmp.value(), bmp.value()->rect(), 1.0f, Gfx::Painter::ScalingMode::BilinearBlend);
auto center = m_drag_point - Gfx::IntPoint(square_width / 2, square_height / 2);
painter.draw_scaled_bitmap({ center, { square_width, square_height } }, *bmp.value(), bmp.value()->rect(), 1.0f, Gfx::Painter::ScalingMode::BilinearBlend);
}
}
}
@ -407,13 +407,13 @@ Chess::Square ChessWidget::mouse_to_square(GUI::MouseEvent& event) const
int const widget_offset_x = (window()->width() - min_size) / 2;
int const widget_offset_y = (window()->height() - min_size) / 2;
int tile_width = min_size / 8;
int tile_height = min_size / 8;
int square_width = min_size / 8;
int square_height = min_size / 8;
if (side() == Chess::Color::White) {
return { 7 - ((event.y() - widget_offset_y) / tile_height), (event.x() - widget_offset_x) / tile_width };
return { 7 - ((event.y() - widget_offset_y) / square_height), (event.x() - widget_offset_x) / square_width };
} else {
return { (event.y() - widget_offset_y) / tile_height, 7 - ((event.x() - widget_offset_x) / tile_width) };
return { (event.y() - widget_offset_y) / square_height, 7 - ((event.x() - widget_offset_x) / square_width) };
}
}