jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-11 08:34:52 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Refactor TabGame: inline some QLayout and QWidget class fields (#5942)

Browse source 
* inline layouts

* inline widgets
This commit is contained in:
RickyRister 2025-05-17 19:23:30 -07:00 • committed by GitHub
parent 5dd027ad63
commit 8cc64bf44e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 19 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

33
cockatrice/src/client/tabs/tab_game.cpp
View file

@ -1538,7 +1538,7 @@ void TabGame::createPlayAreaWidget(bool bReplay)
scene = new GameScene(phasesToolbar, this); scene = new GameScene(phasesToolbar, this);
gameView = new GameView(scene); gameView = new GameView(scene);
gamePlayAreaVBox = new QVBoxLayout; auto gamePlayAreaVBox = new QVBoxLayout;
gamePlayAreaVBox->setContentsMargins(0, 0, 0, 0); gamePlayAreaVBox->setContentsMargins(0, 0, 0, 0);
gamePlayAreaVBox->addWidget(gameView); gamePlayAreaVBox->addWidget(gameView);
@ -1594,12 +1594,12 @@ void TabGame::createReplayDock()
connect(replayFastForwardButton, &QToolButton::toggled, this, &TabGame::replayFastForwardButtonToggled); connect(replayFastForwardButton, &QToolButton::toggled, this, &TabGame::replayFastForwardButtonToggled);
// putting everything together // putting everything together
replayControlLayout = new QHBoxLayout; auto replayControlLayout = new QHBoxLayout;
replayControlLayout->addWidget(timelineWidget, 10); replayControlLayout->addWidget(timelineWidget, 10);
replayControlLayout->addWidget(replayPlayButton); replayControlLayout->addWidget(replayPlayButton);
replayControlLayout->addWidget(replayFastForwardButton); replayControlLayout->addWidget(replayFastForwardButton);
replayControlWidget = new QWidget(); auto replayControlWidget = new QWidget();
replayControlWidget->setObjectName("replayControlWidget"); replayControlWidget->setObjectName("replayControlWidget");
replayControlWidget->setLayout(replayControlLayout); replayControlWidget->setLayout(replayControlLayout);
@ -1635,13 +1635,13 @@ void TabGame::createCardInfoDock(bool bReplay)
Q_UNUSED(bReplay); Q_UNUSED(bReplay);
cardInfoFrameWidget = new CardInfoFrameWidget(); cardInfoFrameWidget = new CardInfoFrameWidget();
cardHInfoLayout = new QHBoxLayout; auto cardHInfoLayout = new QHBoxLayout;
cardVInfoLayout = new QVBoxLayout; auto cardVInfoLayout = new QVBoxLayout;
cardVInfoLayout->setContentsMargins(0, 0, 0, 0); cardVInfoLayout->setContentsMargins(0, 0, 0, 0);
cardVInfoLayout->addWidget(cardInfoFrameWidget); cardVInfoLayout->addWidget(cardInfoFrameWidget);
cardVInfoLayout->addLayout(cardHInfoLayout); cardVInfoLayout->addLayout(cardHInfoLayout);
cardBoxLayoutWidget = new QWidget; auto cardBoxLayoutWidget = new QWidget;
cardBoxLayoutWidget->setLayout(cardVInfoLayout); cardBoxLayoutWidget->setLayout(cardVInfoLayout);
cardInfoDock = new QDockWidget(this); cardInfoDock = new QDockWidget(this);
@ -1679,12 +1679,17 @@ void TabGame::createPlayerListDock(bool bReplay)
void TabGame::createMessageDock(bool bReplay) void TabGame::createMessageDock(bool bReplay)
{ {
auto messageLogLayout = new QVBoxLayout;
messageLogLayout->setContentsMargins(0, 0, 0, 0);
messageLog = new MessageLogWidget(tabSupervisor, this); messageLog = new MessageLogWidget(tabSupervisor, this);
connect(messageLog, &MessageLogWidget::cardNameHovered, cardInfoFrameWidget, connect(messageLog, &MessageLogWidget::cardNameHovered, cardInfoFrameWidget,
qOverload<const QString &>(&CardInfoFrameWidget::setCard)); qOverload<const QString &>(&CardInfoFrameWidget::setCard));
connect(messageLog, &MessageLogWidget::showCardInfoPopup, this, &TabGame::showCardInfoPopup); connect(messageLog, &MessageLogWidget::showCardInfoPopup, this, &TabGame::showCardInfoPopup);
connect(messageLog, &MessageLogWidget::deleteCardInfoPopup, this, &TabGame::deleteCardInfoPopup); connect(messageLog, &MessageLogWidget::deleteCardInfoPopup, this, &TabGame::deleteCardInfoPopup);
messageLogLayout->addWidget(messageLog);
if (!bReplay) { if (!bReplay) {
connect(messageLog, &MessageLogWidget::openMessageDialog, this, &TabGame::openMessageDialog); connect(messageLog, &MessageLogWidget::openMessageDialog, this, &TabGame::openMessageDialog);
connect(messageLog, &MessageLogWidget::addMentionTag, this, &TabGame::addMentionTag); connect(messageLog, &MessageLogWidget::addMentionTag, this, &TabGame::addMentionTag);
@ -1698,6 +1703,8 @@ void TabGame::createMessageDock(bool bReplay)
connect(gameTimer, &QTimer::timeout, this, &TabGame::incrementGameTime); connect(gameTimer, &QTimer::timeout, this, &TabGame::incrementGameTime);
gameTimer->start(); gameTimer->start();
messageLogLayout->addWidget(timeElapsedLabel);
sayLabel = new QLabel; sayLabel = new QLabel;
sayEdit = new LineEditCompleter; sayEdit = new LineEditCompleter;
sayEdit->setMaxLength(MAX_TEXT_LENGTH); sayEdit->setMaxLength(MAX_TEXT_LENGTH);
@ -1726,20 +1733,14 @@ void TabGame::createMessageDock(bool bReplay)
connect(tabSupervisor, &TabSupervisor::adminLockChanged, this, &TabGame::adminLockChanged); connect(tabSupervisor, &TabSupervisor::adminLockChanged, this, &TabGame::adminLockChanged);
connect(sayEdit, &LineEditCompleter::returnPressed, this, &TabGame::actSay); connect(sayEdit, &LineEditCompleter::returnPressed, this, &TabGame::actSay);
sayHLayout = new QHBoxLayout; auto sayHLayout = new QHBoxLayout;
sayHLayout->addWidget(sayLabel); sayHLayout->addWidget(sayLabel);
sayHLayout->addWidget(sayEdit); sayHLayout->addWidget(sayEdit);
messageLogLayout->addLayout(sayHLayout);
} }
messageLogLayout = new QVBoxLayout; auto messageLogLayoutWidget = new QWidget;
messageLogLayout->setContentsMargins(0, 0, 0, 0);
if (!bReplay)
messageLogLayout->addWidget(timeElapsedLabel);
messageLogLayout->addWidget(messageLog);
if (!bReplay)
messageLogLayout->addLayout(sayHLayout);
messageLogLayoutWidget = new QWidget;
messageLogLayoutWidget->setLayout(messageLogLayout); messageLogLayoutWidget->setLayout(messageLogLayout);
messageLayoutDock = new QDockWidget(this); messageLayoutDock = new QDockWidget(this);

6
cockatrice/src/client/tabs/tab_game.h
View file

@ -111,10 +111,8 @@ private:
GameScene *scene; GameScene *scene;
GameView *gameView; GameView *gameView;
QMap<int, DeckViewContainer *> deckViewContainers; QMap<int, DeckViewContainer *> deckViewContainers;
QVBoxLayout *cardVInfoLayout, *messageLogLayout, *gamePlayAreaVBox, *deckViewContainerLayout; QVBoxLayout *deckViewContainerLayout;
QHBoxLayout *cardHInfoLayout, *sayHLayout, *mainHLayout, *replayControlLayout; QWidget *gamePlayAreaWidget, *deckViewContainerWidget;
QWidget *cardBoxLayoutWidget, *messageLogLayoutWidget, *gamePlayAreaWidget, *deckViewContainerWidget,
*replayControlWidget;
QDockWidget *cardInfoDock, *messageLayoutDock, *playerListDock, *replayDock; QDockWidget *cardInfoDock, *messageLayoutDock, *playerListDock, *replayDock;
QAction *playersSeparator; QAction *playersSeparator;
QMenu *gameMenu, *viewMenu, *cardInfoDockMenu, *messageLayoutDockMenu, *playerListDockMenu, *replayDockMenu; QMenu *gameMenu, *viewMenu, *cardInfoDockMenu, *messageLayoutDockMenu, *playerListDockMenu, *replayDockMenu;