pencil2d · MrStevns · Aug 4, 2024 · Apr 19, 2024 · Apr 27, 2024 · Apr 27, 2024
diff --git a/app/src/basedockwidget.cpp b/app/src/basedockwidget.cpp
@@ -34,34 +34,8 @@ BaseDockWidget::BaseDockWidget(QWidget* pParent)
                       "border-width: 1px; }");
     }
 #endif
-
 }
 
 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/colorbox.cpp b/app/src/colorbox.cpp
@@ -35,7 +35,7 @@ void ColorBox::initUI()
     mColorWheel = new ColorWheel(this);
 
     QVBoxLayout* layout = new QVBoxLayout;
-    layout->setContentsMargins(5, 5, 5, 5);
+    layout->setContentsMargins(3, 3, 3, 3);
     layout->addWidget(mColorWheel);
     layout->setStretch(0, 1);
     layout->setStretch(1, 0);

diff --git a/app/src/toolbox.cpp b/app/src/toolbox.cpp
@@ -137,8 +137,18 @@ void ToolBoxWidget::initUI()
 
     connect(editor()->layers(), &LayerManager::currentLayerChanged, this, &ToolBoxWidget::onLayerDidChange);
 
-
-    FlowLayout* flowlayout = new FlowLayout;
+    connect(this, &QDockWidget::dockLocationChanged, this, [=](Qt::DockWidgetArea area) {
+        if (area == Qt::DockWidgetArea::TopDockWidgetArea || area == Qt::BottomDockWidgetArea) {
+            const int minimumHeight = ui->scrollAreaWidgetContents_2->layout()->heightForWidth(width());
+            ui->scrollArea->setMinimumHeight(minimumHeight);
+            setMinimumHeight(minimumHeight);
+        } else {
+            ui->scrollArea->setMinimumHeight(0); // Default value
+            // Don't set own minimum height and let Qt come up with a sensible value
+        }
+    });
+
+    FlowLayout* flowlayout = new FlowLayout(3,3,3);
 
     flowlayout->addWidget(ui->pencilButton);
     flowlayout->addWidget(ui->eraserButton);
@@ -154,6 +164,7 @@ void ToolBoxWidget::initUI()
 
     delete ui->scrollAreaWidgetContents_2->layout();
     ui->scrollAreaWidgetContents_2->setLayout(flowlayout);
+    ui->scrollAreaWidgetContents_2->setContentsMargins(0,0,0,0);
 
     QSettings settings(PENCIL2D, PENCIL2D);
     restoreGeometry(settings.value("ToolBoxGeom").toByteArray());
@@ -163,6 +174,15 @@ void ToolBoxWidget::updateUI()
 {
 }
 
+void ToolBoxWidget::resizeEvent(QResizeEvent* event)
+{
+    QDockWidget::resizeEvent(event);
+
+    const int minimumHeight = ui->scrollArea->minimumHeight();
+    if (minimumHeight <= 0) { return; }
+    setMinimumHeight(minimumHeight);
+}
+
 void ToolBoxWidget::onToolSetActive(ToolType toolType)
 {
     deselectAllTools();
@@ -265,11 +285,6 @@ void ToolBoxWidget::smudgeOn()
     toolOn(SMUDGE, ui->smudgeButton);
 }
 
-int ToolBoxWidget::getMinHeightForWidth(int width)
-{
-    return ui->toolGroup->layout()->heightForWidth(width);
-}
-
 void ToolBoxWidget::deselectAllTools()
 {
     ui->pencilButton->setChecked(false);

diff --git a/app/src/toolbox.h b/app/src/toolbox.h
@@ -59,7 +59,7 @@ public slots:
     void smudgeOn();
 
 protected:
-    int getMinHeightForWidth(int width) override;
+    void resizeEvent(QResizeEvent* event) override;
 
 private:
     void deselectAllTools();

diff --git a/app/ui/bucketoptionswidget.ui b/app/ui/bucketoptionswidget.ui
@@ -6,10 +6,16 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
+    <width>140</width>
     <height>221</height>
    </rect>
   </property>
+  <property name="minimumSize">
+   <size>
+    <width>140</width>
+    <height>0</height>
+   </size>
+  </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
@@ -92,8 +98,17 @@
      <property name="sizeConstraint">
       <enum>QLayout::SetDefaultConstraint</enum>
      </property>
+     <property name="leftMargin">
+      <number>3</number>
+     </property>
      <property name="topMargin">
-      <number>0</number>
+      <number>3</number>
+     </property>
+     <property name="rightMargin">
+      <number>3</number>
+     </property>
+     <property name="bottomMargin">
+      <number>3</number>
      </property>
      <property name="verticalSpacing">
       <number>6</number>

diff --git a/app/ui/cameraoptionswidget.ui b/app/ui/cameraoptionswidget.ui
@@ -6,10 +6,16 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>254</width>
+    <width>140</width>
     <height>208</height>
    </rect>
   </property>
+  <property name="minimumSize">
+   <size>
+    <width>140</width>
+    <height>0</height>
+   </size>
+  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="leftMargin">
     <number>0</number>
@@ -30,16 +36,16 @@
      </property>
      <layout class="QGridLayout" name="gridLayout" rowstretch="0,0">
       <property name="leftMargin">
-       <number>0</number>
+       <number>3</number>
       </property>
       <property name="topMargin">
-       <number>0</number>
+       <number>3</number>
       </property>
       <property name="rightMargin">
-       <number>0</number>
+       <number>3</number>
       </property>
       <property name="bottomMargin">
-       <number>0</number>
+       <number>3</number>
       </property>
       <property name="horizontalSpacing">
        <number>2</number>
@@ -122,19 +128,19 @@
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_2">
       <property name="spacing">
-       <number>2</number>
+       <number>0</number>
       </property>
       <property name="leftMargin">
-       <number>4</number>
+       <number>0</number>
       </property>
       <property name="topMargin">
-       <number>4</number>
+       <number>0</number>
       </property>
       <property name="rightMargin">
-       <number>4</number>
+       <number>0</number>
       </property>
       <property name="bottomMargin">
-       <number>4</number>
+       <number>0</number>
       </property>
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout_5">