jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-09-25 11:56:11 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge 14f60ea309 into 12299abcc8

Browse source
This commit is contained in:
DawnFire42 2026-09-20 15:39:03 -07:00 • committed by GitHub
commit c9bb40951b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cockatrice/src/game_graphics/player/menu/card_menu.cpp
View file

@ -203,7 +203,7 @@ void CardMenu::createTableMenu(bool canModifyCard)
} }
addSeparator(); addSeparator();
addAction(aClone); addAction(aClone);
addMenu(new MoveMenu(player)); addMenu(new MoveMenu(player, this));
addSeparator(); addSeparator();
addAction(aAttach); addAction(aAttach);
if (card->getAttachedTo()) { if (card->getAttachedTo()) {
@ -253,7 +253,7 @@ void CardMenu::createStackMenu(bool canModifyCard)
addAction(aPlayFacedown); addAction(aPlayFacedown);
addSeparator(); addSeparator();
addAction(aClone); addAction(aClone);
addMenu(new MoveMenu(player)); addMenu(new MoveMenu(player, this));
addSeparator(); addSeparator();
addAction(aAttach); addAction(aAttach);
addAction(aDrawArrow); addAction(aDrawArrow);
@ -282,7 +282,7 @@ void CardMenu::createGraveyardOrExileMenu(bool canModifyCard)
addAction(aPlayFacedown); addAction(aPlayFacedown);
addSeparator(); addSeparator();
addAction(aClone); addAction(aClone);
addMenu(new MoveMenu(player)); addMenu(new MoveMenu(player, this));
addSeparator(); addSeparator();
addAction(aAttach); addAction(aAttach);
addAction(aDrawArrow); addAction(aDrawArrow);
@ -320,7 +320,7 @@ void CardMenu::createHandOrCustomZoneMenu(bool canModifyCard)
addSeparator(); addSeparator();
addAction(aClone); addAction(aClone);
addMenu(new MoveMenu(player)); addMenu(new MoveMenu(player, this));
// actions that are really wonky when done from deck or sideboard // actions that are really wonky when done from deck or sideboard
if (card->getZone()->getName() == ZoneNames::HAND) { if (card->getZone()->getName() == ZoneNames::HAND) {
@ -344,7 +344,7 @@ void CardMenu::createHandOrCustomZoneMenu(bool canModifyCard)
void CardMenu::createZonelessMenu(bool canModifyCard) void CardMenu::createZonelessMenu(bool canModifyCard)
{ {
if (canModifyCard) { if (canModifyCard) {
addMenu(new MoveMenu(player)); addMenu(new MoveMenu(player, this));
} }
} }

2
cockatrice/src/game_graphics/player/menu/move_menu.cpp
View file

@ -6,7 +6,7 @@
#include "../card_menu_action_type.h" #include "../card_menu_action_type.h"
#include "../player_graphics_item.h" #include "../player_graphics_item.h"
MoveMenu::MoveMenu(PlayerGraphicsItem *player) : QMenu(tr("Move to")) MoveMenu::MoveMenu(PlayerGraphicsItem *player, QWidget *parent) : QMenu(tr("Move to"), parent)
{ {
aMoveToTopLibrary = new QAction(this); aMoveToTopLibrary = new QAction(this);
aMoveToTopLibrary->setData(cmMoveToTopLibrary); aMoveToTopLibrary->setData(cmMoveToTopLibrary);

2
cockatrice/src/game_graphics/player/menu/move_menu.h
View file

@ -14,7 +14,7 @@ class MoveMenu : public QMenu
Q_OBJECT Q_OBJECT
public: public:
explicit MoveMenu(PlayerGraphicsItem *player); explicit MoveMenu(PlayerGraphicsItem *player, QWidget *parent);
void setShortcutsActive(); void setShortcutsActive();
void retranslateUi(); void retranslateUi();

13
cockatrice/src/game_graphics/player/menu/player_menu.cpp
View file

@ -74,6 +74,11 @@ void PlayerMenu::setMenusForGraphicItems()
QMenu *PlayerMenu::updateCardMenu(const CardItem *card) QMenu *PlayerMenu::updateCardMenu(const CardItem *card)
{ {
if (cardMenu) {
cardMenu->deleteLater();
cardMenu = nullptr;
}
if (!card) { if (!card) {
emit cardMenuUpdated(nullptr); emit cardMenuUpdated(nullptr);
return nullptr; return nullptr;
@ -87,11 +92,11 @@ QMenu *PlayerMenu::updateCardMenu(const CardItem *card)
return nullptr; return nullptr;
} }
CardMenu *menu = new CardMenu(player, card, shortcutsActive); cardMenu = new CardMenu(player, card, shortcutsActive);
connect(menu, &CardMenu::cardInfoRequested, this, &PlayerMenu::cardInfoRequested); connect(cardMenu, &CardMenu::cardInfoRequested, this, &PlayerMenu::cardInfoRequested);
emit cardMenuUpdated(menu); emit cardMenuUpdated(cardMenu);
return menu; return cardMenu;
} }
void PlayerMenu::retranslateUi() void PlayerMenu::retranslateUi()

1
cockatrice/src/game_graphics/player/menu/player_menu.h
View file

@ -97,6 +97,7 @@ private:
* player->getCounters(). * player->getCounters().
*/ */
QList<AbstractPlayerComponent *> managedComponents; QList<AbstractPlayerComponent *> managedComponents;
CardMenu *cardMenu = nullptr;
bool shortcutsActive = false; bool shortcutsActive = false;
/** @brief Creates component, adds it as a submenu of playerMenu, and registers in managedComponents. */ /** @brief Creates component, adds it as a submenu of playerMenu, and registers in managedComponents. */

4
cockatrice/src/interface/widgets/tabs/tab_game.cpp
View file

@ -1031,8 +1031,8 @@ void TabGame::setCardMenu(CardMenu *menu)
if (menu) { if (menu) {
aCardMenu->setMenu(menu); aCardMenu->setMenu(menu);
} else { } else if (aCardMenu->menu()) {
aCardMenu->setMenu(new QMenu); aCardMenu->menu()->clear();
} }
} }