Merge pull request #23 from J5lx/MrStevns/compact-dock-layout

Consolidate BaseDockWidget/Toolbox minimum size handling
MrStevns · Aug 4, 2024 · f5601d5 · f5601d5
2 parents ed25a46 + 80aedf8
commit f5601d5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 51 deletions.
diff --git a/app/src/basedockwidget.cpp b/app/src/basedockwidget.cpp
@@ -39,28 +39,3 @@ BaseDockWidget::BaseDockWidget(QWidget* pParent)
 BaseDockWidget::~BaseDockWidget()
 {
 }
-
-void BaseDockWidget::resizeEvent(QResizeEvent *event)
-{
-    QDockWidget::resizeEvent(event);
-
-    // Not sure where the -2 comes from, but the event width is always 2 more than what is passed to FlowLayout::setGeometry
-    int minHeight = getMinHeightForWidth(event->size().width() - 2);
-
-    if (minHeight < 0) return;
-
-#ifdef __APPLE__
-    // For some reason the behavior of minimumSize and the margin changes on mac when floating, so we need to do this
-#else
-    int top, bottom;
-    layout()->getContentsMargins(nullptr, &top, nullptr, &bottom);
-    minHeight += top + bottom;
-#endif
-    setMinimumSize(QSize(layout()->minimumSize().width(), minHeight));
-}
-
-int BaseDockWidget::getMinHeightForWidth(int width)
-{
-    Q_UNUSED(width)
-    return -1;
-}
diff --git a/app/src/basedockwidget.h b/app/src/basedockwidget.h
@@ -30,18 +30,13 @@ class BaseDockWidget : public QDockWidget
     explicit BaseDockWidget(QWidget* pParent);
     virtual  ~BaseDockWidget();
 
-    void resizeEvent(QResizeEvent *event) override;
-
 public:
     virtual void initUI() = 0;
     virtual void updateUI() = 0;
 
     Editor* editor() const { return mEditor; }
     void setEditor( Editor* e ) { mEditor = e; }
 
-protected:
-    virtual int getMinHeightForWidth(int width);
-
 private:
     Editor* mEditor = nullptr;
 };

diff --git a/app/src/toolbox.cpp b/app/src/toolbox.cpp
@@ -138,12 +138,13 @@ void ToolBoxWidget::initUI()
     connect(editor()->layers(), &LayerManager::currentLayerChanged, this, &ToolBoxWidget::onLayerDidChange);
 
     connect(this, &QDockWidget::dockLocationChanged, this, [=](Qt::DockWidgetArea area) {
-
-        mDockArea = area;
         if (area == Qt::DockWidgetArea::TopDockWidgetArea || area == Qt::BottomDockWidgetArea) {
-            ui->scrollArea->setMinimumHeight(getMinHeightForWidth(width()));
+            const int minimumHeight = ui->scrollAreaWidgetContents_2->layout()->heightForWidth(width());
+            ui->scrollArea->setMinimumHeight(minimumHeight);
+            setMinimumHeight(minimumHeight);
         } else {
-            ui->scrollArea->setMinimumHeight(1);
+            ui->scrollArea->setMinimumHeight(0); // Default value
+            // Don't set own minimum height and let Qt come up with a sensible value
         }
     });
 
@@ -165,8 +166,6 @@ void ToolBoxWidget::initUI()
     ui->scrollAreaWidgetContents_2->setLayout(flowlayout);
     ui->scrollAreaWidgetContents_2->setContentsMargins(0,0,0,0);
 
-    setMinimumHeight(1);
-
     QSettings settings(PENCIL2D, PENCIL2D);
     restoreGeometry(settings.value("ToolBoxGeom").toByteArray());
 }
@@ -177,19 +176,11 @@ void ToolBoxWidget::updateUI()
 
 void ToolBoxWidget::resizeEvent(QResizeEvent* event)
 {
-    BaseDockWidget::resizeEvent(event);
+    QDockWidget::resizeEvent(event);
 
-    if (ui->scrollArea->minimumHeight() <= 0) { return; }
-
-    setMinimumSize(QSize(layout()->minimumSize().width(), ui->scrollArea->minimumHeight()));
-}
-
-int ToolBoxWidget::getMinHeightForWidth(int width)
-{
-    if (mDockArea != Qt::LeftDockWidgetArea && mDockArea != Qt::RightDockWidgetArea) {
-        return ui->scrollAreaWidgetContents_2->layout()->heightForWidth(width);
-    }
-    return 1;
+    const int minimumHeight = ui->scrollArea->minimumHeight();
+    if (minimumHeight <= 0) { return; }
+    setMinimumHeight(minimumHeight);
 }
 
 void ToolBoxWidget::onToolSetActive(ToolType toolType)

diff --git a/app/src/toolbox.h b/app/src/toolbox.h
@@ -59,16 +59,13 @@ public slots:
     void smudgeOn();
 
 protected:
-    int getMinHeightForWidth(int width) override;
     void resizeEvent(QResizeEvent* event) override;
 
 private:
     void deselectAllTools();
     void toolOn(ToolType toolType, QToolButton* toolButton);
 
     Ui::ToolBoxWidget* ui = nullptr;
-
-    Qt::DockWidgetArea mDockArea = Qt::DockWidgetArea::LeftDockWidgetArea;
 };
 
 #endif