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

LibCards+Games: Rename "draw" methods to "paint" for clarity

Browse source 
"Draw" is already a card-game term so using it for graphics was
 confusing me a lot!
This commit is contained in:
Sam Atkins 2022-09-28 12:27:19 +01:00 • committed by Sam Atkins
parent 6ef0504a42
commit bfa9ae809f
8 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Userland/Libraries/LibCards/Card.cpp
View file

@ -20,7 +20,7 @@ Card::Card(Suit suit, Rank rank)
VERIFY(to_underlying(rank) < card_count);
}
void Card::draw(GUI::Painter& painter) const
void Card::paint(GUI::Painter& painter) const
{
auto& card_painter = CardPainter::the();
auto bitmap = [&]() {
@ -43,12 +43,12 @@ void Card::save_old_position()
m_old_position_valid = true;
}
void Card::clear_and_draw(GUI::Painter& painter, Color const& background_color)
void Card::clear_and_paint(GUI::Painter& painter, Color const& background_color)
{
if (is_old_position_valid())
clear(painter, background_color);
draw(painter);
paint(painter);
save_old_position();
}

4
Userland/Libraries/LibCards/Card.h
View file

@ -106,9 +106,9 @@ public:
void save_old_position();
void draw(GUI::Painter&) const;
void paint(GUI::Painter&) const;
void clear(GUI::Painter&, Color const& background_color) const;
void clear_and_draw(GUI::Painter&, Color const& background_color);
void clear_and_paint(GUI::Painter& painter, Color const& background_color);
private:
Card(Suit, Rank);

6
Userland/Libraries/LibCards/CardStack.cpp
View file

@ -42,7 +42,7 @@ void CardStack::clear()
m_stack_positions.clear();
}
void CardStack::draw(GUI::Painter& painter, Gfx::Color const& background_color)
void CardStack::paint(GUI::Painter& painter, Gfx::Color const& background_color)
{
auto draw_background_if_empty = [&]() {
size_t number_of_moving_cards = 0;
@ -89,13 +89,13 @@ void CardStack::draw(GUI::Painter& painter, Gfx::Color const& background_color)
if (m_rules.shift_x == 0 && m_rules.shift_y == 0) {
auto& card = peek();
card.draw(painter);
card.paint(painter);
return;
}
for (auto& card : m_stack) {
if (!card.is_moving())
card.clear_and_draw(painter, Gfx::Color::Transparent);
card.clear_and_paint(painter, Gfx::Color::Transparent);
}
}

2
Userland/Libraries/LibCards/CardStack.h
View file

@ -52,7 +52,7 @@ public:
bool is_allowed_to_push(Card const&, size_t stack_size = 1, MovementRule movement_rule = MovementRule::Alternating) const;
void add_all_grabbed_cards(Gfx::IntPoint const& click_location, NonnullRefPtrVector<Card>& grabbed, MovementRule movement_rule = MovementRule::Alternating);
void draw(GUI::Painter&, Gfx::Color const& background_color);
void paint(GUI::Painter&, Gfx::Color const& background_color);
void clear();
private: