jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-26 16:43:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Correctly add filterWidget as a dock widget for VDE, make printingSelector visible in the default layout for DE. (#6217)

Browse source 
Took 18 minutes


Took 24 seconds

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
This commit is contained in:
BruebachL 2025-10-03 14:56:19 +02:00 • committed by GitHub
parent a69bfb8cb8
commit 7c31197b78
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 31 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

30
cockatrice/src/tabs/tab_deck_editor.cpp
View file

@ -203,20 +203,10 @@ void TabDeckEditor::loadLayout()
void TabDeckEditor::restartLayout() void TabDeckEditor::restartLayout()
{ {
deckDockWidget->setVisible(true);
cardInfoDockWidget->setVisible(true);
filterDockWidget->setVisible(true);
printingSelectorDockWidget->setVisible(false);
deckDockWidget->setFloating(false);
cardInfoDockWidget->setFloating(false);
filterDockWidget->setFloating(false);
printingSelectorDockWidget->setFloating(false);
aCardInfoDockVisible->setChecked(true); aCardInfoDockVisible->setChecked(true);
aDeckDockVisible->setChecked(true); aDeckDockVisible->setChecked(true);
aFilterDockVisible->setChecked(true); aFilterDockVisible->setChecked(true);
aPrintingSelectorDockVisible->setChecked(false); aPrintingSelectorDockVisible->setChecked(true);
aCardInfoDockFloating->setChecked(false); aCardInfoDockFloating->setChecked(false);
aDeckDockFloating->setChecked(false); aDeckDockFloating->setChecked(false);
@ -224,10 +214,20 @@ void TabDeckEditor::restartLayout()
aPrintingSelectorDockFloating->setChecked(false); aPrintingSelectorDockFloating->setChecked(false);
setCentralWidget(databaseDisplayDockWidget); setCentralWidget(databaseDisplayDockWidget);
addDockWidget(static_cast<Qt::DockWidgetArea>(2), deckDockWidget); addDockWidget(Qt::RightDockWidgetArea, deckDockWidget);
addDockWidget(static_cast<Qt::DockWidgetArea>(2), cardInfoDockWidget); addDockWidget(Qt::RightDockWidgetArea, cardInfoDockWidget);
addDockWidget(static_cast<Qt::DockWidgetArea>(2), filterDockWidget); addDockWidget(Qt::RightDockWidgetArea, filterDockWidget);
addDockWidget(static_cast<Qt::DockWidgetArea>(2), printingSelectorDockWidget); addDockWidget(Qt::RightDockWidgetArea, printingSelectorDockWidget);
deckDockWidget->setFloating(false);
cardInfoDockWidget->setFloating(false);
filterDockWidget->setFloating(false);
printingSelectorDockWidget->setFloating(false);
deckDockWidget->setVisible(true);
cardInfoDockWidget->setVisible(true);
filterDockWidget->setVisible(true);
printingSelectorDockWidget->setVisible(true);
splitDockWidget(cardInfoDockWidget, printingSelectorDockWidget, Qt::Horizontal); splitDockWidget(cardInfoDockWidget, printingSelectorDockWidget, Qt::Horizontal);
splitDockWidget(printingSelectorDockWidget, deckDockWidget, Qt::Horizontal); splitDockWidget(printingSelectorDockWidget, deckDockWidget, Qt::Horizontal);

29
cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
View file

@ -268,16 +268,6 @@ void TabDeckEditorVisual::loadLayout()
void TabDeckEditorVisual::restartLayout() void TabDeckEditorVisual::restartLayout()
{ {
deckDockWidget->setVisible(true);
cardInfoDockWidget->setVisible(true);
filterDockWidget->setVisible(false);
printingSelectorDockWidget->setVisible(true);
deckDockWidget->setFloating(false);
cardInfoDockWidget->setFloating(false);
filterDockWidget->setFloating(false);
printingSelectorDockWidget->setFloating(false);
aCardInfoDockVisible->setChecked(true); aCardInfoDockVisible->setChecked(true);
aDeckDockVisible->setChecked(true); aDeckDockVisible->setChecked(true);
aFilterDockVisible->setChecked(false); aFilterDockVisible->setChecked(false);
@ -289,12 +279,25 @@ void TabDeckEditorVisual::restartLayout()
aPrintingSelectorDockFloating->setChecked(false); aPrintingSelectorDockFloating->setChecked(false);
setCentralWidget(centralWidget); setCentralWidget(centralWidget);
addDockWidget(static_cast<Qt::DockWidgetArea>(2), deckDockWidget);
addDockWidget(static_cast<Qt::DockWidgetArea>(2), cardInfoDockWidget); addDockWidget(Qt::RightDockWidgetArea, deckDockWidget);
addDockWidget(static_cast<Qt::DockWidgetArea>(2), printingSelectorDockWidget); addDockWidget(Qt::RightDockWidgetArea, cardInfoDockWidget);
addDockWidget(Qt::RightDockWidgetArea, filterDockWidget);
addDockWidget(Qt::RightDockWidgetArea, printingSelectorDockWidget);
deckDockWidget->setFloating(false);
cardInfoDockWidget->setFloating(false);
filterDockWidget->setFloating(false);
printingSelectorDockWidget->setFloating(false);
deckDockWidget->setVisible(true);
cardInfoDockWidget->setVisible(true);
filterDockWidget->setVisible(false);
printingSelectorDockWidget->setVisible(true);
splitDockWidget(cardInfoDockWidget, printingSelectorDockWidget, Qt::Vertical); splitDockWidget(cardInfoDockWidget, printingSelectorDockWidget, Qt::Vertical);
splitDockWidget(cardInfoDockWidget, deckDockWidget, Qt::Horizontal); splitDockWidget(cardInfoDockWidget, deckDockWidget, Qt::Horizontal);
splitDockWidget(cardInfoDockWidget, filterDockWidget, Qt::Horizontal);
QTimer::singleShot(100, this, SLOT(freeDocksSize())); QTimer::singleShot(100, this, SLOT(freeDocksSize()));
} }