Remove setMinimumHeight because dockLocationChanged is called afterwards

Initially we'll also set a default dock value but as soon as the dock is added, it will be updated with the new dock location.
MrStevns · Jul 29, 2024 · ed25a46 · ed25a46
1 parent e81ef60
commit ed25a46
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/app/src/toolbox.cpp b/app/src/toolbox.cpp
@@ -169,8 +169,6 @@ void ToolBoxWidget::initUI()
 
     QSettings settings(PENCIL2D, PENCIL2D);
     restoreGeometry(settings.value("ToolBoxGeom").toByteArray());
-
-    ui->scrollArea->setMinimumHeight(getMinHeightForWidth(width()));
 }
 
 void ToolBoxWidget::updateUI()
@@ -191,7 +189,7 @@ int ToolBoxWidget::getMinHeightForWidth(int width)
     if (mDockArea != Qt::LeftDockWidgetArea && mDockArea != Qt::RightDockWidgetArea) {
         return ui->scrollAreaWidgetContents_2->layout()->heightForWidth(width);
     }
-    return BaseDockWidget::getMinHeightForWidth(width);
+    return 1;
 }
 
 void ToolBoxWidget::onToolSetActive(ToolType toolType)

diff --git a/app/src/toolbox.h b/app/src/toolbox.h
@@ -68,7 +68,7 @@ public slots:
 
     Ui::ToolBoxWidget* ui = nullptr;
 
-    Qt::DockWidgetArea mDockArea;
+    Qt::DockWidgetArea mDockArea = Qt::DockWidgetArea::LeftDockWidgetArea;
 };
 
 #endif