added add split button

src/widgets/splits/Split.cpp

@@ -363,6 +363,12 @@ void Split::handleModifiers(Qt::KeyboardModifiers modifiers)
     }
 }
 
+void Split::setIsTopRightSplit(bool value)
+{
+    this->isTopRightSplit_ = value;
+    this->header_->setAddButtonVisible(value);
+}
+
 /// Slots
 void Split::addSibling()
 {

src/widgets/splits/Split.hpp

@@ -65,6 +65,7 @@ public:
     void layoutMessages();
     void updateGifEmotes();
     void updateLastReadMessage();
+    void setIsTopRightSplit(bool value);
 
     void drag();
 
@@ -106,10 +107,11 @@ private:
 
     NullablePtr<SelectChannelDialog> selectChannelDialog_;
 
-    bool moderationMode_ = false;
+    bool moderationMode_{};
+    bool isTopRightSplit_{};
 
-    bool isMouseOver_ = false;
-    bool isDragging_ = false;
+    bool isMouseOver_{};
+    bool isDragging_{};
 
     pajlada::Signals::Connection channelIDChangedConnection_;
     pajlada::Signals::Connection usermodeChangedConnection_;

src/widgets/splits/SplitContainer.cpp

@@ -310,8 +310,33 @@ void SplitContainer::focusSplitRecursive(Node *node, Direction direction)
     }
 }
 
+Split *SplitContainer::getTopRightSplit(Node &node)
+{
+    switch (node.getType()) {
+        case Node::_Split:
+            return node.getSplit();
+        case Node::VerticalContainer:
+            if (!node.getChildren().empty())
+                return getTopRightSplit(*node.getChildren().front());
+            break;
+        case Node::HorizontalContainer:
+            if (!node.getChildren().empty())
+                return getTopRightSplit(*node.getChildren().back());
+            break;
+        default:;
+    }
+    return nullptr;
+}
+
 void SplitContainer::layout()
 {
+    // update top right split
+    auto topRight = this->getTopRightSplit(this->baseNode_);
+    if (this->topRight_) this->topRight_->setIsTopRightSplit(false);
+    this->topRight_ = topRight;
+    if (topRight) this->topRight_->setIsTopRightSplit(true);
+
+    // layout
     this->baseNode_.geometry_ = this->rect().adjusted(-1, -1, 0, 0);
 
     std::vector<DropRect> _dropRects;

src/widgets/splits/SplitContainer.hpp

@@ -219,6 +219,7 @@ private:
     void addSplit(Split *split);
 
     void decodeNodeRecusively(QJsonObject &obj, Node *node);
+    Split *getTopRightSplit(Node &node);
 
     struct DropRegion {
         QRect rect;
@@ -239,6 +240,7 @@ private:
 
     Node baseNode_;
     Split *selected_;
+    Split *topRight_{};
 
     NotebookTab *tab_;
     std::vector<Split *> splits_;

src/widgets/splits/SplitHeader.cpp

@@ -92,11 +92,11 @@ namespace {
             title += " (live)";
 
         // description
+        if (settings.showUptime) title += " - " + s.uptime;
         if (settings.showViewerCount)
             title += " - " + QString::number(s.viewerCount);
-        if (settings.showTitle) title += " - " + s.title;
         if (settings.showGame) title += " - " + s.game;
-        if (settings.showUptime) title += " - " + s.uptime;
+        if (settings.showTitle) title += " - " + s.title;
 
         return title;
     }
@@ -137,33 +137,42 @@ SplitHeader::SplitHeader(Split *_split)
 
 void SplitHeader::initializeLayout()
 {
-    auto layout = makeLayout<QHBoxLayout>(
-        {// title
-         this->titleLabel = makeWidget<Label>([](auto w) {
-             w->setSizePolicy(QSizePolicy::MinimumExpanding,
-                              QSizePolicy::Preferred);
-             w->setCentered(true);
-             w->setHasOffset(false);
-         }),
-         // mode
-         this->modeButton_ = makeWidget<EffectLabel>([&](auto w) {
-             w->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
-             w->hide();
-             this->initializeModeSignals(*w);
-             w->setMenu(this->createChatModeMenu());
-         }),
-         // moderator
-         this->moderationButton_ = makeWidget<Button>([&](auto w) {
-             QObject::connect(w, &Button::clicked, this, [this, w]() mutable {
-                 this->split_->setModerationMode(
-                     !this->split_->getModerationMode());
+    auto layout = makeLayout<QHBoxLayout>({
+        // title
+        this->titleLabel_ = makeWidget<Label>([](auto w) {
+            w->setSizePolicy(QSizePolicy::MinimumExpanding,
+                             QSizePolicy::Preferred);
+            w->setCentered(true);
+            w->setHasOffset(false);
+        }),
+        // mode
+        this->modeButton_ = makeWidget<EffectLabel>([&](auto w) {
+            w->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
+            w->hide();
+            this->initializeModeSignals(*w);
+            w->setMenu(this->createChatModeMenu());
+        }),
+        // moderator
+        this->moderationButton_ = makeWidget<Button>([&](auto w) {
+            QObject::connect(w, &Button::clicked, this, [this, w]() mutable {
+                this->split_->setModerationMode(
+                    !this->split_->getModerationMode());
 
-                 w->setDim(!this->split_->getModerationMode());
-             });
-         }),
-         // dropdown
-         this->dropdownButton_ = makeWidget<Button>(
-             [&](auto w) { w->setMenu(this->createMainMenu()); })});
+                w->setDim(!this->split_->getModerationMode());
+            });
+        }),
+        // dropdown
+        this->dropdownButton_ = makeWidget<Button>(
+            [&](auto w) { w->setMenu(this->createMainMenu()); }),
+        // add split
+        this->addButton_ = makeWidget<Button>([&](auto w) {
+            w->setPixmap(getApp()->resources->buttons.addSplitDark);
+            w->setEnableMargin(false);
+
+            QObject::connect(w, &Button::clicked, this,
+                             [this]() { this->split_->addSibling(); });
+        }),
+    });
 
     layout->setMargin(0);
     layout->setSpacing(0);
@@ -173,18 +182,16 @@ void SplitHeader::initializeLayout()
 std::unique_ptr<QMenu> SplitHeader::createMainMenu()
 {
     auto menu = std::make_unique<QMenu>();
-    menu->addAction("Add new", this->split_, &Split::addSibling,
-                    QKeySequence("Ctrl+T"));
-    menu->addAction("Close", this->split_, &Split::deleteFromContainer,
+    menu->addAction("Close channel", this->split_, &Split::deleteFromContainer,
                     QKeySequence("Ctrl+W"));
     menu->addAction("Change channel", this->split_, &Split::changeChannel,
                     QKeySequence("Ctrl+R"));
     menu->addSeparator();
+    menu->addAction("Popup", this->split_, &Split::popup);
     menu->addAction("Viewer list", this->split_, &Split::showViewerList);
     menu->addAction("Search", this->split_, &Split::showSearch,
                     QKeySequence("Ctrl+F"));
     menu->addSeparator();
-    menu->addAction("Popup", this->split_, &Split::popup);
 #ifdef USEWEBENGINE
     this->dropdownMenu.addAction("Start watching", this, [this] {
         ChannelPtr _channel = this->split->getChannel();
@@ -334,6 +341,12 @@ void SplitHeader::scaleChangedEvent(float scale)
     this->setFixedHeight(w);
     this->dropdownButton_->setFixedWidth(w);
     this->moderationButton_->setFixedWidth(w);
+    this->addButton_->setFixedWidth(w * 5 / 8);
+}
+
+void SplitHeader::setAddButtonVisible(bool value)
+{
+    this->addButton_->setVisible(value);
 }
 
 void SplitHeader::updateChannelText()
@@ -358,7 +371,7 @@ void SplitHeader::updateChannelText()
         }
     }
 
-    this->titleLabel->setText(title.isEmpty() ? "<empty>" : title);
+    this->titleLabel_->setText(title.isEmpty() ? "<empty>" : title);
 }
 
 void SplitHeader::updateModerationModeIcon()
@@ -484,7 +497,7 @@ void SplitHeader::themeChangedEvent()
     } else {
         palette.setColor(QPalette::Foreground, this->theme->splits.header.text);
     }
-    this->titleLabel->setPalette(palette);
+    this->titleLabel_->setPalette(palette);
 
     // --
     if (this->theme->isLightTheme()) {

src/widgets/splits/SplitHeader.hpp

@@ -24,6 +24,8 @@ class SplitHeader final : public BaseWidget, pajlada::Signals::SignalHolder
 public:
     explicit SplitHeader(Split *_chatWidget);
 
+    void setAddButtonVisible(bool value);
+
     void updateChannelText();
     void updateModerationModeIcon();
     void updateRoomModes();
@@ -53,9 +55,10 @@ private:
 
     // ui
     Button *dropdownButton_{};
-    Label *titleLabel{};
+    Label *titleLabel_{};
     EffectLabel *modeButton_{};
     Button *moderationButton_{};
+    Button *addButton_{};
 
     // states
     QPoint dragStart_{};