refined SplitHeader

src/widgets/splits/SplitHeader.hpp

@@ -1,37 +1,29 @@
 #pragma once
 
 #include "widgets/BaseWidget.hpp"
-#include "widgets/helper/RippleEffectLabel.hpp"
-#include "widgets/helper/SignalLabel.hpp"
 
-#include <QAction>
-#include <QHBoxLayout>
-#include <QLabel>
 #include <QMenu>
-#include <QMouseEvent>
-#include <QPaintEvent>
 #include <QPoint>
-#include <QWidget>
+#include <memory>
 #include <pajlada/settings/setting.hpp>
 #include <pajlada/signals/connection.hpp>
 #include <pajlada/signals/signalholder.hpp>
-
 #include <vector>
 
 namespace chatterino {
 
-class Split;
+class Button;
+class EffectLabel;
 class Label;
+class Split;
 
-class SplitHeader : public BaseWidget, pajlada::Signals::SignalHolder
+class SplitHeader final : public BaseWidget, pajlada::Signals::SignalHolder
 {
     Q_OBJECT
 
 public:
     explicit SplitHeader(Split *_chatWidget);
-    virtual ~SplitHeader() override;
 
-    // Update channel text from chat widget
     void updateChannelText();
     void updateModerationModeIcon();
     void updateRoomModes();
@@ -49,41 +41,38 @@ protected:
     virtual void mouseDoubleClickEvent(QMouseEvent *event) override;
 
 private:
-    void rightButtonClicked();
-    void initializeChannelSignals();
-    void setupModeLabel(RippleEffectLabel &label);
+    void initializeLayout();
+    void initializeModeSignals(EffectLabel &label);
     std::unique_ptr<QMenu> createMainMenu();
     std::unique_ptr<QMenu> createChatModeMenu();
+    void handleChannelChanged();
 
-    Split *split_;
+    Split *const split_{};
+    QString tooltipText_{};
+    bool isLive_{false};
 
-    QPoint dragStart_;
-    bool dragging_ = false;
-    bool doubleClicked_ = false;
-    bool showingHelpTooltip_ = false;
-
-    pajlada::Signals::Connection onlineStatusChangedConnection_;
-
-    RippleEffectButton *dropdownButton_{};
-    //    Label *titleLabel{};
+    // ui
+    Button *dropdownButton_{};
     Label *titleLabel{};
-    RippleEffectLabel *modeButton_{};
-    RippleEffectButton *moderationButton_{};
+    EffectLabel *modeButton_{};
+    Button *moderationButton_{};
 
-    bool menuVisible_{};
+    // states
+    QPoint dragStart_{};
+    bool dragging_{false};
+    bool doubleClicked_{false};
+    bool showingHelpTooltip_{false};
+    bool menuVisible_{false};
 
+    // signals
     pajlada::Signals::NoArgSignal modeUpdateRequested_;
-
-    QString tooltip_;
-    bool isLive_;
-
     std::vector<pajlada::Signals::ScopedConnection> managedConnections_;
+    std::vector<pajlada::Signals::ScopedConnection> channelConnections_;
 
 public slots:
-    void menuMoveSplit();
-    void menuReloadChannelEmotes();
-    void menuManualReconnect();
-    void menuShowChangelog();
+    void moveSplit();
+    void reloadChannelEmotes();
+    void reconnect();
 };
 
 }  // namespace chatterino