uilayout: support add widget (back) to dock

friction2d · Jan 25, 2024 · 2dc24a9 · 2dc24a9
1 parent 6a8dc2b
commit 2dc24a9
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 10 deletions.
diff --git a/src/app/GUI/uilayout.cpp b/src/app/GUI/uilayout.cpp
@@ -26,7 +26,6 @@
 
 #include <QLabel>
 #include <QPushButton>
-#include <QVBoxLayout>
 #include <QHBoxLayout>
 #include <QSettings>
 #include <QDebug>
@@ -49,18 +48,17 @@ UIDock::UIDock(QWidget *parent,
                const bool &showHeader,
                const bool &darkHeader)
     : QWidget{parent}
-    , mWidget(widget)
+    , mLayout(nullptr)
     , mLabel(label)
     , mPos(pos)
     , mIndex(-1)
 {
     setObjectName(mLabel);
-
     setContentsMargins(0, 0, 0, 0);
-    const auto mainLayout = new QVBoxLayout(this);
-    mainLayout->setContentsMargins(0, 0, 0, 0);
-    mainLayout->setMargin(0);
-    mainLayout->setSpacing(0);
+    mLayout = new QVBoxLayout(this);
+    mLayout->setContentsMargins(0, 0, 0, 0);
+    mLayout->setMargin(0);
+    mLayout->setSpacing(0);
 
     if (showHeader) {
         const auto headerWidget = new QWidget(this);
@@ -126,7 +124,7 @@ UIDock::UIDock(QWidget *parent,
         headerLayout->addWidget(upButton);
         headerLayout->addWidget(downButton);
 
-        mainLayout->addWidget(headerWidget);
+        mLayout->addWidget(headerWidget);
 
         connect(leftButton, &QPushButton::clicked,
                 this, [this]() { emit changePosition(mPos, Position::Left); });
@@ -137,7 +135,7 @@ UIDock::UIDock(QWidget *parent,
         connect(downButton, &QPushButton::clicked,
                 this, [this]() { emit changePosition(mPos, Position::Down); });
     }
-    mainLayout->addWidget(mWidget);
+    mLayout->addWidget(widget);
 }
 
 UIDock::~UIDock()
@@ -175,6 +173,11 @@ const QString UIDock::getId()
     return AppSupport::filterTextAZW(mLabel);
 }
 
+void UIDock::addWidget(QWidget *widget)
+{
+    mLayout->addWidget(widget);
+}
+
 void UIDock::writeSettings()
 {
     qDebug() << "==> write dock conf" << mLabel << mPos << mIndex;
@@ -313,6 +316,12 @@ void UILayout::setDockVisible(const QString &label,
     emit updateDockVisibility(label, visible);
 }
 
+void UILayout::addDockWidget(const QString &label, QWidget *widget)
+{
+    if (!widget) { return; }
+    emit updateDockWidget(label, widget);
+}
+
 void UILayout::addDock(const Item &item)
 {
     if (!item.widget) { return; }
@@ -351,6 +360,16 @@ void UILayout::connectDock(UIDock *dock)
                    bool visible) {
                 if (dock->getLabel() == label) { dock->setVisible(visible); }
             });
+    connect(this,
+            &UILayout::updateDockWidget,
+            this,
+            [dock](const QString &label,
+                   QWidget *widget) {
+                if (dock->getLabel() == label) {
+                    dock->addWidget(widget);
+                    dock->setVisible(true);
+                }
+            });
     connect(dock,
             &UIDock::changePosition,
             this,

diff --git a/src/app/GUI/uilayout.h b/src/app/GUI/uilayout.h
@@ -26,6 +26,7 @@
 
 #include <QWidget>
 #include <QSplitter>
+#include <QVBoxLayout>
 #include <vector>
 
 class UIDock : public QWidget
@@ -54,13 +55,14 @@ class UIDock : public QWidget
     int getIndex();
     const QString getLabel();
     const QString getId();
+    void addWidget(QWidget *widget);
 
 signals:
     void changePosition(const Position &pos,
                         const Position &trigger);
 
 private:
-    QWidget *mWidget;
+    QVBoxLayout *mLayout;
     QString mLabel;
     Position mPos;
     int mIndex;
@@ -93,10 +95,14 @@ class UILayout : public QSplitter
     void addDocks(std::vector<Item> items);
     void setDockVisible(const QString &label,
                         bool visible);
+    void addDockWidget(const QString &label,
+                       QWidget *widget);
 
 signals:
     void updateDockVisibility(const QString &label,
                               bool visible);
+    void updateDockWidget(const QString &label,
+                          QWidget *widget);
 
 private:
     QSplitter *mLeft;