From 7c31197b78534d7eb9e4751cb2ff5fbcad48b4d5 Mon Sep 17 00:00:00 2001 From: BruebachL <44814898+BruebachL@users.noreply.github.com> Date: Fri, 3 Oct 2025 14:56:19 +0200 Subject: [PATCH] Correctly add filterWidget as a dock widget for VDE, make printingSelector visible in the default layout for DE. (#6217) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Took 18 minutes Took 24 seconds Co-authored-by: Lukas Brübach --- cockatrice/src/tabs/tab_deck_editor.cpp | 30 +++++++++---------- .../tab_deck_editor_visual.cpp | 29 ++++++++++-------- 2 files changed, 31 insertions(+), 28 deletions(-) diff --git a/cockatrice/src/tabs/tab_deck_editor.cpp b/cockatrice/src/tabs/tab_deck_editor.cpp index b17eb5ff1..1f56f7b7b 100644 --- a/cockatrice/src/tabs/tab_deck_editor.cpp +++ b/cockatrice/src/tabs/tab_deck_editor.cpp @@ -203,20 +203,10 @@ void TabDeckEditor::loadLayout() 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); aDeckDockVisible->setChecked(true); aFilterDockVisible->setChecked(true); - aPrintingSelectorDockVisible->setChecked(false); + aPrintingSelectorDockVisible->setChecked(true); aCardInfoDockFloating->setChecked(false); aDeckDockFloating->setChecked(false); @@ -224,10 +214,20 @@ void TabDeckEditor::restartLayout() aPrintingSelectorDockFloating->setChecked(false); setCentralWidget(databaseDisplayDockWidget); - addDockWidget(static_cast(2), deckDockWidget); - addDockWidget(static_cast(2), cardInfoDockWidget); - addDockWidget(static_cast(2), filterDockWidget); - addDockWidget(static_cast(2), printingSelectorDockWidget); + addDockWidget(Qt::RightDockWidgetArea, deckDockWidget); + 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(true); + printingSelectorDockWidget->setVisible(true); splitDockWidget(cardInfoDockWidget, printingSelectorDockWidget, Qt::Horizontal); splitDockWidget(printingSelectorDockWidget, deckDockWidget, Qt::Horizontal); diff --git a/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp b/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp index d8584433d..f3ae2e293 100644 --- a/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp +++ b/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp @@ -268,16 +268,6 @@ void TabDeckEditorVisual::loadLayout() 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); aDeckDockVisible->setChecked(true); aFilterDockVisible->setChecked(false); @@ -289,12 +279,25 @@ void TabDeckEditorVisual::restartLayout() aPrintingSelectorDockFloating->setChecked(false); setCentralWidget(centralWidget); - addDockWidget(static_cast(2), deckDockWidget); - addDockWidget(static_cast(2), cardInfoDockWidget); - addDockWidget(static_cast(2), printingSelectorDockWidget); + + addDockWidget(Qt::RightDockWidgetArea, deckDockWidget); + 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, deckDockWidget, Qt::Horizontal); + splitDockWidget(cardInfoDockWidget, filterDockWidget, Qt::Horizontal); QTimer::singleShot(100, this, SLOT(freeDocksSize())); }