From 5957b8729863cd7db9a4551c4d8ee7af25296e9c Mon Sep 17 00:00:00 2001
From: fourtf <tf.four@gmail.com>
Date: Wed, 8 Aug 2018 15:50:43 +0200
Subject: [PATCH] minor changes

---
 src/widgets/splits/SplitHeader.cpp | 43 +++++++++++-------------------
 1 file changed, 16 insertions(+), 27 deletions(-)

diff --git a/src/widgets/splits/SplitHeader.cpp b/src/widgets/splits/SplitHeader.cpp
index 7c8571303..882f0b9eb 100644
--- a/src/widgets/splits/SplitHeader.cpp
+++ b/src/widgets/splits/SplitHeader.cpp
@@ -28,7 +28,7 @@
 
 namespace chatterino {
 namespace {
-auto formatRoomMode(TwitchChannel &channel)
+auto formatRoomMode(TwitchChannel &channel) -> QString
 {
     QString text;
 
@@ -54,6 +54,8 @@ auto formatRoomMode(TwitchChannel &channel)
             text = match.captured(1) + '\n' + match.captured(2);
     }
 
+    if (text.isEmpty() && channel.hasModRights()) return "none";
+
     return text;
 }
 auto formatTooltip(const TwitchChannel::StreamStatus &s)
@@ -156,11 +158,8 @@ void SplitHeader::initializeLayout()
              });
          }),
          // dropdown
-         this->dropdownButton_ = makeWidget<Button>([&](auto w) {
-             w->setMouseTracking(true);
-             w->setMenu(this->createMainMenu());
-             QObject::connect(w, &Button::leftMousePress, this, [this] {});
-         })});
+         this->dropdownButton_ = makeWidget<Button>(
+             [&](auto w) { w->setMenu(this->createMainMenu()); })});
 
     layout->setMargin(0);
     layout->setSpacing(0);
@@ -293,32 +292,22 @@ void SplitHeader::updateRoomModes()
 void SplitHeader::initializeModeSignals(EffectLabel &label)
 {
     this->modeUpdateRequested_.connect([this, &label] {
-        auto twitchChannel =
-            dynamic_cast<TwitchChannel *>(this->split_->getChannel().get());
+        if (auto twitchChannel = dynamic_cast<TwitchChannel *>(
+                this->split_->getChannel().get()))  //
+        {
+            label.setEnable(twitchChannel->hasModRights());
 
-        // return if the channel is not a twitch channel
-        if (twitchChannel == nullptr) {
-            label.hide();
-            return;
-        }
+            // set the label text
+            auto text = formatRoomMode(*twitchChannel);
 
-        // set lable enabled
-        label.setEnable(twitchChannel->hasModRights());
-
-        // set the label text
-        auto text = formatRoomMode(*twitchChannel);
-
-        if (text.isEmpty()) {
-            if (twitchChannel->hasModRights()) {
-                label.getLabel().setText("none");
+            if (!text.isEmpty()) {
+                label.getLabel().setText(text);
                 label.show();
-            } else {
-                label.hide();
+                return;
             }
-        } else {
-            label.getLabel().setText(text);
-            label.show();
         }
+
+        label.hide();
     });
 }