highlight tabs only on unviewed messages

src/widgets/Notebook.hpp

@@ -2,6 +2,7 @@
 
 #include "widgets/BaseWidget.hpp"
 
+#include <ForwardDecl.hpp>
 #include <pajlada/signals/signal.hpp>
 #include <pajlada/signals/signalholder.hpp>
 #include <QList>

src/widgets/helper/ChannelView.cpp

@@ -1190,11 +1190,13 @@ void ChannelView::messageAppended(MessagePtr &message,
             (this->channel_->getType() == Channel::Type::TwitchAutomod &&
              getSettings()->enableAutomodHighlight))
         {
-            this->tabHighlightRequested.invoke(HighlightState::Highlighted);
+            this->tabHighlightRequested.invoke(HighlightState::Highlighted,
+                                               message);
         }
         else
         {
-            this->tabHighlightRequested.invoke(HighlightState::NewMessage);
+            this->tabHighlightRequested.invoke(HighlightState::NewMessage,
+                                               message);
         }
     }
 

src/widgets/helper/ChannelView.hpp

@@ -179,6 +179,9 @@ class ChannelView final : public BaseWidget
 
     LimitedQueueSnapshot<MessageLayoutPtr> &getMessagesSnapshot();
 
+    // Returns true if message should be included
+    bool shouldIncludeMessage(const MessagePtr &m) const;
+
     void queueLayout();
     void invalidateBuffers();
 
@@ -214,7 +217,8 @@ class ChannelView final : public BaseWidget
 
     pajlada::Signals::Signal<QMouseEvent *> mouseDown;
     pajlada::Signals::NoArgSignal selectionChanged;
-    pajlada::Signals::Signal<HighlightState> tabHighlightRequested;
+    pajlada::Signals::Signal<HighlightState, const MessagePtr &>
+        tabHighlightRequested;
     pajlada::Signals::NoArgSignal liveStatusChanged;
     pajlada::Signals::Signal<const Link &> linkClicked;
     pajlada::Signals::Signal<QString, FromTwitchLinkOpenChannelIn>
@@ -374,9 +378,6 @@ class ChannelView final : public BaseWidget
 
     FilterSetPtr channelFilters_;
 
-    // Returns true if message should be included
-    bool shouldIncludeMessage(const MessagePtr &m) const;
-
     // Returns whether the scrollbar should have highlights
     bool showScrollbarHighlights() const;
 

src/widgets/helper/NotebookTab.cpp

@@ -10,8 +10,10 @@
 #include "singletons/WindowManager.hpp"
 #include "util/Helpers.hpp"
 #include "widgets/dialogs/SettingsDialog.hpp"
+#include "widgets/helper/ChannelView.hpp"
 #include "widgets/Notebook.hpp"
 #include "widgets/splits/DraggedSplit.hpp"
+#include "widgets/splits/Split.hpp"
 #include "widgets/splits/SplitContainer.hpp"
 
 #include <boost/bind/bind.hpp>
@@ -302,10 +304,49 @@ bool NotebookTab::isSelected() const
     return this->selected_;
 }
 
+void NotebookTab::updateHighlightSources(
+    const QHash<ChannelPtr, HighlightEvent> &removedHighlightSources)
+{
+    for (const auto &[otherChannel, otherEvent] :
+         removedHighlightSources.asKeyValueRange())
+    {
+        this->highlightSources_.remove(otherChannel);
+    }
+
+    if (this->highlightSources_.empty())
+    {
+        this->highlightState_ = HighlightState::None;
+        this->update();
+    }
+}
+
 void NotebookTab::setSelected(bool value)
 {
     this->selected_ = value;
 
+    if (value == true)
+    {
+        auto *splitNotebook = dynamic_cast<SplitNotebook *>(this->notebook_);
+        if (splitNotebook)
+        {
+            for (int i = 0; i < splitNotebook->getPageCount(); ++i)
+            {
+                auto *splitContainer =
+                    dynamic_cast<SplitContainer *>(splitNotebook->getPageAt(i));
+                if (splitContainer)
+                {
+                    auto *tab = splitContainer->getTab();
+                    if (tab && tab != this)
+                    {
+                        tab->updateHighlightSources(this->highlightSources_);
+                    }
+                }
+            }
+        }
+    }
+
+    this->highlightSources_.clear();
+
     this->highlightState_ = HighlightState::None;
 
     this->update();
@@ -359,12 +400,46 @@ bool NotebookTab::isLive() const
 }
 
 void NotebookTab::setHighlightState(HighlightState newHighlightStyle)
+{
+    // change this to "copy" highlight state, its used by duplicating a tab
+    if (this->isSelected())
+    {
+        return;
+    }
+
+    if (!this->highlightEnabled_ &&
+        newHighlightStyle == HighlightState::NewMessage)
+    {
+        return;
+    }
+
+    if (this->highlightState_ == newHighlightStyle ||
+        this->highlightState_ == HighlightState::Highlighted)
+    {
+        return;
+    }
+
+    this->highlightState_ = newHighlightStyle;
+    this->update();
+}
+
+void NotebookTab::setHighlightState(HighlightState newHighlightStyle,
+                                    const ChannelView &channelViewSource,
+                                    const MessagePtr &message)
 {
     if (this->isSelected())
     {
         return;
     }
 
+    if (!this->shouldMessageHighlight(channelViewSource, message))
+    {
+        return;
+    }
+
+    this->highlightSources_.insert(channelViewSource.underlyingChannel(),
+                                   HighlightEvent{});
+
     if (!this->highlightEnabled_ &&
         newHighlightStyle == HighlightState::NewMessage)
     {
@@ -381,6 +456,39 @@ void NotebookTab::setHighlightState(HighlightState newHighlightStyle)
     this->update();
 }
 
+bool NotebookTab::shouldMessageHighlight(const ChannelView &channelViewSource,
+                                         const MessagePtr &message) const
+{
+    auto *visibleSplitContainer =
+        dynamic_cast<SplitContainer *>(this->notebook_->getSelectedPage());
+    if (visibleSplitContainer != nullptr)
+    {
+        const auto &visibleSplits = visibleSplitContainer->getSplits();
+        for (const auto &visibleSplit : visibleSplits)
+        {
+            auto filterIdsSource = channelViewSource.getFilterIds();
+            auto filterIdsSplit = visibleSplit->getChannelView().getFilterIds();
+
+            auto isSubset = []<typename T>(const QList<T> &sub,
+                                           const QList<T> &super) {
+                return std::ranges::all_of(sub, [&super](const auto &subItem) {
+                    return super.contains(subItem);
+                });
+            };
+
+            if (channelViewSource.underlyingChannel() ==
+                    visibleSplit->getChannel() &&
+                visibleSplit->getChannelView().shouldIncludeMessage(message) &&
+                isSubset(filterIdsSource, filterIdsSplit))
+            {
+                return false;
+            }
+        }
+    }
+
+    return true;
+}
+
 HighlightState NotebookTab::highlightState() const
 {
     return this->highlightState_;

src/widgets/helper/NotebookTab.hpp

@@ -14,6 +14,7 @@ namespace chatterino {
 inline constexpr int NOTEBOOK_TAB_HEIGHT = 28;
 
 class SplitContainer;
+class ChannelView;
 
 class NotebookTab : public Button
 {
@@ -60,6 +61,9 @@ class NotebookTab : public Button
     bool isLive() const;
 
     void setHighlightState(HighlightState style);
+    void setHighlightState(HighlightState style,
+                           const ChannelView &channelViewSource,
+                           const MessagePtr &message);
     HighlightState highlightState() const;
 
     void setHighlightsEnabled(const bool &newVal);
@@ -107,6 +111,15 @@ class NotebookTab : public Button
 
     int normalTabWidthForHeight(int height) const;
 
+    bool shouldMessageHighlight(const ChannelView &channelViewSource,
+                                const MessagePtr &message) const;
+
+    struct HighlightEvent {
+    };
+
+    void updateHighlightSources(
+        const QHash<ChannelPtr, HighlightEvent> &removedHighlightSources);
+
     QPropertyAnimation positionChangedAnimation_;
     QPoint positionAnimationDesiredPoint_;
 
@@ -135,6 +148,8 @@ class NotebookTab : public Button
 
     QMenu menu_;
 
+    QHash<ChannelPtr, HighlightEvent> highlightSources_;
+
     pajlada::Signals::SignalHolder managedConnections_;
 };
 

src/widgets/splits/SplitContainer.cpp

@@ -214,10 +214,12 @@ void SplitContainer::addSplit(Split *split)
     auto &&conns = this->connectionsPerSplit_[split];
 
     conns.managedConnect(split->getChannelView().tabHighlightRequested,
-                         [this](HighlightState state) {
+                         [this, &channelView = split->getChannelView()](
+                             HighlightState state, const MessagePtr &message) {
                              if (this->tab_ != nullptr)
                              {
-                                 this->tab_->setHighlightState(state);
+                                 this->tab_->setHighlightState(
+                                     state, channelView, message);
                              }
                          });