Layout tweaks

app/src/displayoptionwidget.cpp

@@ -25,6 +25,7 @@ GNU General Public License for more details.
 #include "scribblearea.h"
 #include "editor.h"
 #include "util.h"
+#include "flowlayout.h"
 
 
 DisplayOptionWidget::DisplayOptionWidget(QWidget *parent) :
@@ -39,11 +40,33 @@ DisplayOptionWidget::~DisplayOptionWidget()
     delete ui;
 }
 
+void DisplayOptionWidget::resizeEvent(QResizeEvent *event)
+{
+    BaseDockWidget::resizeEvent(event);
+    int minHeight = ui->innerWidget->layout()->heightForWidth(event->size().width()) + layout()->margin()*2;
+    setMinimumSize(QSize(layout()->minimumSize().width(), minHeight));
+}
+
 void DisplayOptionWidget::initUI()
 {
     updateUI();
     makeConnections();
 
+    delete ui->innerWidget->layout();
+
+    FlowLayout *layout = new FlowLayout;
+    layout->setAlignment(Qt::AlignHCenter);
+    layout->addWidget(ui->mirrorButton);
+    layout->addWidget(ui->mirrorVButton);
+    layout->addWidget(ui->thinLinesButton);
+    layout->addWidget(ui->outLinesButton);
+    layout->addWidget(ui->overlayCenterButton);
+    layout->addWidget(ui->overlayThirdsButton);
+    layout->addWidget(ui->overlayGoldenRatioButton);
+    layout->addWidget(ui->overlaySafeAreaButton);
+
+    ui->innerWidget->setLayout(layout);
+
 #ifdef __APPLE__
     // Mac only style. ToolButtons are naturally borderless on Win/Linux.
     QString stylesheet =

app/src/displayoptionwidget.h

@@ -34,6 +34,8 @@ class DisplayOptionWidget : public BaseDockWidget
     explicit DisplayOptionWidget(QWidget* parent);
     virtual ~DisplayOptionWidget() override;
 
+    void resizeEvent(QResizeEvent *event) override;
+
     void initUI() override;
     void updateUI() override;
 

app/src/toolbox.cpp

@@ -52,6 +52,13 @@ ToolBoxWidget::~ToolBoxWidget()
     delete ui;
 }
 
+void ToolBoxWidget::resizeEvent(QResizeEvent *event)
+{
+    BaseDockWidget::resizeEvent(event);
+    int minHeight = ui->toolGroup->layout()->heightForWidth(event->size().width()) + layout()->margin()*2;
+    setMinimumSize(QSize(layout()->minimumSize().width(), minHeight));
+}
+
 void ToolBoxWidget::initUI()
 {
 #ifdef __APPLE__

app/src/toolbox.h

@@ -40,6 +40,8 @@ class ToolBoxWidget : public BaseDockWidget
     ToolBoxWidget(QWidget* parent);
     ~ToolBoxWidget() override;
 
+    void resizeEvent(QResizeEvent *event) override;
+
     void initUI() override;
     void updateUI() override;