jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-09-28 00:42:19 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fix command zone tax counter position after counter re-sync

Browse source
This commit is contained in:
DawnFire42 2026-07-09 15:54:57 -04:00
parent aed13a242d
commit d42b7c8003
No known key found for this signature in database
GPG key ID: 24BB855EE2911B33
3 changed files with 19 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cockatrice/src/game_graphics/player/player_graphics_item.cpp
View file

@ -242,6 +242,9 @@ void PlayerGraphicsItem::onCounterRemoved(int counterId)
if (playerMenu->getCountersMenu() && widget->getMenu()) { if (playerMenu->getCountersMenu() && widget->getMenu()) {
playerMenu->getCountersMenu()->removeAction(widget->getMenu()->menuAction()); playerMenu->getCountersMenu()->removeAction(widget->getMenu()->menuAction());
} }
if (commandZoneGraphicsItem && CounterNames::isTaxCounter(widget->getName())) {
commandZoneGraphicsItem->unregisterTaxCounter(widget);
}
widget->delCounter(); widget->delCounter();
rearrangeCounters(); rearrangeCounters();
} }

9
cockatrice/src/game_graphics/zones/command_zone.cpp
View file

@ -160,6 +160,15 @@ void CommandZone::registerTaxCounter(AbstractCounter *counter)
connect(counter, &QObject::destroyed, this, [this, counter]() { taxCounters.removeOne(counter); }); connect(counter, &QObject::destroyed, this, [this, counter]() { taxCounters.removeOne(counter); });
} }
void CommandZone::unregisterTaxCounter(AbstractCounter *counter)
{
if (!counter) {
return;
}
disconnect(counter, &QObject::destroyed, this, nullptr);
taxCounters.removeOne(counter);
}
void CommandZone::rearrangeTaxCounters() void CommandZone::rearrangeTaxCounters()
{ {
int activeTaxCounterCount = 0; int activeTaxCounterCount = 0;

7
cockatrice/src/game_graphics/zones/command_zone.h
View file

@ -89,6 +89,13 @@ public:
void setMinimumHeight(int height); void setMinimumHeight(int height);
/** @brief Registers a tax counter widget for layout management. */ /** @brief Registers a tax counter widget for layout management. */
void registerTaxCounter(AbstractCounter *counter); void registerTaxCounter(AbstractCounter *counter);
/**
* @brief Unregisters a tax counter widget from layout management.
*
* Call on removal: the widget outlives it via deleteLater(), so unregister synchronously
* to keep it out of the next layout pass.
*/
void unregisterTaxCounter(AbstractCounter *counter);
/** @brief Lays out visible tax counters vertically in the top-left corner of the command zone. */ /** @brief Lays out visible tax counters vertically in the top-left corner of the command zone. */
void rearrangeTaxCounters(); void rearrangeTaxCounters();