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

LibGfx: Unify Rect, Point, and Size

Browse source 
This commit unifies methods and method/param names between the above
classes, as well as adds [[nodiscard]] and ALWAYS_INLINE where
appropriate. It also renamed the various move_by methods to
translate_by, as that more closely matches the transformation
terminology.
This commit is contained in:
Matthew Olsson 2021-04-12 11:47:09 -07:00 • committed by Andreas Kling
parent ac238b3bd6
commit 88cfaf7bf0
48 changed files with 282 additions and 187 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Userland/Games/Solitaire/CardStack.cpp
View file

@ -164,9 +164,9 @@ void CardStack::push(NonnullRefPtr<Card> card)
if (size && size % m_rules.step == 0) {
if (peek().is_upside_down())
top_most_position.move_by(m_rules.shift_x, m_rules.shift_y_upside_down);
top_most_position.translate_by(m_rules.shift_x, m_rules.shift_y_upside_down);
else
top_most_position.move_by(m_rules.shift_x, m_rules.shift_y);
top_most_position.translate_by(m_rules.shift_x, m_rules.shift_y);
}
if (m_type == Stock)

2
Userland/Games/Solitaire/SolitaireWidget.cpp
View file

@ -256,7 +256,7 @@ void SolitaireWidget::mousemove_event(GUI::MouseEvent& event)
for (auto& to_intersect : m_focused_cards) {
mark_intersecting_stacks_dirty(to_intersect);
to_intersect.rect().move_by(dx, dy);
to_intersect.rect().translate_by(dx, dy);
}
m_mouse_down_location = click_location;

4
Userland/Games/Solitaire/SolitaireWidget.h
View file

@ -46,9 +46,9 @@ private:
if (m_animation_card->position().y() + Card::height + m_y_velocity > SolitaireWidget::height + 1 && m_y_velocity > 0) {
m_y_velocity = min((m_y_velocity * -m_bouncyness), -8.f);
m_animation_card->rect().set_y(SolitaireWidget::height - Card::height);
m_animation_card->rect().move_by(m_x_velocity, 0);
m_animation_card->rect().translate_by(m_x_velocity, 0);
} else {
m_animation_card->rect().move_by(m_x_velocity, m_y_velocity);
m_animation_card->rect().translate_by(m_x_velocity, m_y_velocity);
}
}