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

Parent MoveMenu to CardMenu to fix memory leak on menu rebuild

Browse source
This commit is contained in:
DawnFire42 2026-08-10 12:46:25 -04:00
parent 919b9d92ac
commit 3e90748f73
No known key found for this signature in database
GPG key ID: 24BB855EE2911B33
3 changed files with 7 additions and 7 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();