From 6b24f249f71046c5bc4057fd8d2da7af21e13683 Mon Sep 17 00:00:00 2001
From: fourtf <tf.four@gmail.com>
Date: Sat, 26 May 2018 16:31:43 +0200
Subject: [PATCH] fixed split header tooltips not showing

---
 src/messages/layouts/messagelayout.cpp |  3 +-
 src/providers/twitch/twitchchannel.cpp |  5 +++
 src/providers/twitch/twitchchannel.hpp |  1 +
 src/widgets/basewidget.hpp             |  2 +-
 src/widgets/basewindow.cpp             |  4 +--
 src/widgets/helper/channelview.cpp     |  4 +--
 src/widgets/helper/splitheader.cpp     | 50 ++++++++++++++++----------
 src/widgets/helper/splitheader.hpp     |  5 +--
 8 files changed, 46 insertions(+), 28 deletions(-)

diff --git a/src/messages/layouts/messagelayout.cpp b/src/messages/layouts/messagelayout.cpp
index 323f510e1..7be83b95e 100644
--- a/src/messages/layouts/messagelayout.cpp
+++ b/src/messages/layouts/messagelayout.cpp
@@ -48,7 +48,7 @@ int MessageLayout::getHeight() const
 // return true if redraw is required
 bool MessageLayout::layout(int width, float scale, MessageElement::Flags flags)
 {
-    BenchmarkGuard benchmark("MessageLayout::layout()");
+    //    BenchmarkGuard benchmark("MessageLayout::layout()");
 
     auto app = getApp();
 
@@ -107,7 +107,6 @@ bool MessageLayout::layout(int width, float scale, MessageElement::Flags flags)
     }
 
     // return if no layout is required
-    qDebug() << layoutRequired;
 
     if (!layoutRequired) {
         return false;
diff --git a/src/providers/twitch/twitchchannel.cpp b/src/providers/twitch/twitchchannel.cpp
index ab663ad36..0243bae4a 100644
--- a/src/providers/twitch/twitchchannel.cpp
+++ b/src/providers/twitch/twitchchannel.cpp
@@ -325,6 +325,11 @@ void TwitchChannel::refreshLiveStatus()
                 QString::number(diff / 3600) + "h " + QString::number(diff % 3600 / 60) + "m";
 
             channel->streamStatus.rerun = false;
+            if (stream.HasMember("stream_type")) {
+                channel->streamStatus.streamType = stream["stream_type"].GetString();
+            } else {
+                channel->streamStatus.streamType = QString();
+            }
 
             if (stream.HasMember("broadcast_platform")) {
                 const auto &broadcastPlatformValue = stream["broadcast_platform"];
diff --git a/src/providers/twitch/twitchchannel.hpp b/src/providers/twitch/twitchchannel.hpp
index 8a8e5727a..52a3e1729 100644
--- a/src/providers/twitch/twitchchannel.hpp
+++ b/src/providers/twitch/twitchchannel.hpp
@@ -32,6 +32,7 @@ public:
         QString title;
         QString game;
         QString uptime;
+        QString streamType;
     };
 
     struct UserState {
diff --git a/src/widgets/basewidget.hpp b/src/widgets/basewidget.hpp
index 6e6702a01..f69676002 100644
--- a/src/widgets/basewidget.hpp
+++ b/src/widgets/basewidget.hpp
@@ -18,7 +18,7 @@ class BaseWidget : public QWidget
 
 public:
     explicit BaseWidget(QWidget *parent, Qt::WindowFlags f = Qt::WindowFlags());
-    virtual ~BaseWidget();
+    virtual ~BaseWidget() override;
 
     float getScale() const;
     pajlada::Signals::Signal<float> scaleChanged;
diff --git a/src/widgets/basewindow.cpp b/src/widgets/basewindow.cpp
index 139a42e92..2e8abe3be 100644
--- a/src/widgets/basewindow.cpp
+++ b/src/widgets/basewindow.cpp
@@ -253,8 +253,8 @@ void BaseWindow::leaveEvent(QEvent *)
 
 void BaseWindow::moveTo(QWidget *parent, QPoint point)
 {
-    point.rx() += 16;
-    point.ry() += 16;
+    //    point.rx() += 16;
+    //    point.ry() += 16;
 
     this->move(point);
     this->moveIntoDesktopRect(parent);
diff --git a/src/widgets/helper/channelview.cpp b/src/widgets/helper/channelview.cpp
index 38c1e9631..3172fc1ce 100644
--- a/src/widgets/helper/channelview.cpp
+++ b/src/widgets/helper/channelview.cpp
@@ -175,7 +175,7 @@ void ChannelView::layoutMessages()
 
 void ChannelView::actuallyLayoutMessages(bool causedByScrollbar)
 {
-    BenchmarkGuard benchmark("layout messages");
+    //    BenchmarkGuard benchmark("layout messages");
 
     auto app = getApp();
 
@@ -579,7 +579,7 @@ bool ChannelView::isPaused()
 
 void ChannelView::paintEvent(QPaintEvent * /*event*/)
 {
-    BenchmarkGuard benchmark("paint event");
+    //    BenchmarkGuard benchmark("paint event");
 
     QPainter painter(this);
 
diff --git a/src/widgets/helper/splitheader.cpp b/src/widgets/helper/splitheader.cpp
index 904d2af23..f7fb6af19 100644
--- a/src/widgets/helper/splitheader.cpp
+++ b/src/widgets/helper/splitheader.cpp
@@ -31,7 +31,6 @@ SplitHeader::SplitHeader(Split *_split)
     , split(_split)
 {
     auto app = getApp();
-    this->setMouseTracking(true);
 
     util::LayoutCreator<SplitHeader> layoutCreator(this);
     auto layout = layoutCreator.emplace<QHBoxLayout>().withoutMargin();
@@ -53,13 +52,13 @@ SplitHeader::SplitHeader(Split *_split)
 
         // channel name label
         //        auto title = layout.emplace<Label>(this).assign(&this->titleLabel);
-        auto title = layout.emplace<SignalLabel>().assign(&this->titleLabel);
+        auto title = layout.emplace<QLabel>().assign(&this->titleLabel);
         title->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
-        title->setMouseTracking(true);
-        QObject::connect(this->titleLabel, &SignalLabel::mouseDoubleClick, this,
-                         &SplitHeader::mouseDoubleClickEvent);
-        QObject::connect(this->titleLabel, &SignalLabel::mouseMove, this,
-                         &SplitHeader::mouseMoveEvent);
+        //        title->setMouseTracking(true);
+        //        QObject::connect(this->titleLabel, &SignalLabel::mouseDoubleClick, this,
+        //                         &SplitHeader::mouseDoubleClickEvent);
+        //        QObject::connect(this->titleLabel, &SignalLabel::mouseMove, this,
+        //                         &SplitHeader::mouseMoveEvent);
 
         layout->addStretch(1);
 
@@ -94,6 +93,8 @@ SplitHeader::SplitHeader(Split *_split)
     this->split->channelChanged.connect([this]() {
         this->initializeChannelSignals();  //
     });
+
+    this->setMouseTracking(true);
 }
 
 SplitHeader::~SplitHeader()
@@ -101,7 +102,7 @@ SplitHeader::~SplitHeader()
     this->onlineStatusChangedConnection.disconnect();
 }
 
-void SplitHeader::addDropdownItems(RippleEffectButton *label)
+void SplitHeader::addDropdownItems(RippleEffectButton *)
 {
     // clang-format off
     this->dropdownMenu.addAction("Add new split", this->split, &Split::doAddSplit, QKeySequence(tr("Ctrl+T")));
@@ -178,7 +179,7 @@ void SplitHeader::updateChannelText()
     TwitchChannel *twitchChannel = dynamic_cast<TwitchChannel *>(channel.get());
 
     if (twitchChannel != nullptr) {
-        const auto &streamStatus = twitchChannel->getStreamStatus();
+        const auto streamStatus = twitchChannel->getStreamStatus();
 
         if (streamStatus.live) {
             this->isLive = true;
@@ -192,9 +193,13 @@ void SplitHeader::updateChannelText()
                             "</p>";
             if (streamStatus.rerun) {
                 title += " (rerun)";
+            } else if (streamStatus.streamType.isEmpty()) {
+                title += " (" + streamStatus.streamType + ")";
             } else {
                 title += " (live)";
             }
+        } else {
+            this->tooltip = QString();
         }
     }
 
@@ -327,17 +332,9 @@ void SplitHeader::mouseReleaseEvent(QMouseEvent *event)
 
 void SplitHeader::mouseMoveEvent(QMouseEvent *event)
 {
-    if (!this->dragging && this->isLive) {
-        auto tooltipWidget = TooltipWidget::getInstance();
-        tooltipWidget->moveTo(this, event->globalPos());
-        tooltipWidget->setText(tooltip);
-        tooltipWidget->show();
-        tooltipWidget->raise();
-    }
-
     if (this->dragging) {
-        if (std::abs(this->dragStart.x() - event->pos().x()) > (int)(12 * this->getScale()) ||
-            std::abs(this->dragStart.y() - event->pos().y()) > (int)(12 * this->getScale())) {
+        if (std::abs(this->dragStart.x() - event->pos().x()) > int(12 * this->getScale()) ||
+            std::abs(this->dragStart.y() - event->pos().y()) > int(12 * this->getScale())) {
             this->split->drag();
             this->dragging = false;
         }
@@ -352,11 +349,26 @@ void SplitHeader::mouseDoubleClickEvent(QMouseEvent *event)
     this->doubleClicked = true;
 }
 
+void SplitHeader::enterEvent(QEvent *event)
+{
+    if (!this->tooltip.isEmpty()) {
+        auto tooltipWidget = TooltipWidget::getInstance();
+        tooltipWidget->moveTo(this, this->mapToGlobal(this->rect().bottomLeft()));
+        tooltipWidget->setText(this->tooltip);
+        tooltipWidget->show();
+        tooltipWidget->raise();
+    }
+
+    BaseWidget::enterEvent(event);
+}
+
 void SplitHeader::leaveEvent(QEvent *event)
 {
     TooltipWidget::getInstance()->hide();
+
     BaseWidget::leaveEvent(event);
 }
+
 void SplitHeader::rightButtonClicked()
 {
 }
diff --git a/src/widgets/helper/splitheader.hpp b/src/widgets/helper/splitheader.hpp
index ff6e0047a..9e844316e 100644
--- a/src/widgets/helper/splitheader.hpp
+++ b/src/widgets/helper/splitheader.hpp
@@ -29,7 +29,7 @@ class SplitHeader : public BaseWidget
 
 public:
     explicit SplitHeader(Split *_chatWidget);
-    virtual ~SplitHeader();
+    virtual ~SplitHeader() override;
 
     // Update channel text from chat widget
     void updateChannelText();
@@ -44,6 +44,7 @@ protected:
     virtual void mousePressEvent(QMouseEvent *event) override;
     virtual void mouseReleaseEvent(QMouseEvent *event) override;
     virtual void mouseMoveEvent(QMouseEvent *event) override;
+    virtual void enterEvent(QEvent *) override;
     virtual void leaveEvent(QEvent *event) override;
     virtual void mouseDoubleClickEvent(QMouseEvent *event) override;
 
@@ -59,7 +60,7 @@ private:
 
     RippleEffectButton *dropdownButton;
     //    Label *titleLabel;
-    SignalLabel *titleLabel;
+    QLabel *titleLabel;
     RippleEffectLabel *modeButton;
     RippleEffectButton *moderationButton;