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

add a bunch of parents to dialogs (#3658)

Browse source 
* add a bunch of parents to dialogs

works on #3651

* use game as parent instead

* add more parents

* fix create token dialog modality

* add parent to game information window

* replace a bunch of nullptrs with the magic of sed

* add parent to tip of the day and counters

* reorder game ptr

* set parent for life counter

* clangify
This commit is contained in:
ebbit1q 2019-03-26 19:54:47 +01:00 • committed by Zach H
parent 7072f24103
commit c874f201c3
66 changed files with 144 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cockatrice/src/tab_game.cpp
View file

@ -264,7 +264,7 @@ void DeckViewContainer::loadLocalDeck()
void DeckViewContainer::loadRemoteDeck()
{
DlgLoadRemoteDeck dlg(parentGame->getClientForPlayer(playerId));
DlgLoadRemoteDeck dlg(parentGame->getClientForPlayer(playerId), this);
if (dlg.exec()) {
Command_DeckSelect cmd;
cmd.set_deck_id(dlg.getDeckId());
@ -621,7 +621,7 @@ bool TabGame::isSpectator()
void TabGame::actGameInfo()
{
DlgCreateGame dlg(gameInfo, roomGameTypes);
DlgCreateGame dlg(gameInfo, roomGameTypes, this);
dlg.exec();
}