Merge 439d21d009 into 867e3f3ab0

This makes the color look almost identical in highlights, but completely identical in tab highlights

CHANGELOG.md

@@ -4,7 +4,7 @@
 
 - Major: Add option to show pronouns in user card. (#5442, #5583)
 - Major: Release plugins alpha. (#5288)
-- Major: Improve high-DPI support on Windows. (#4868, #5391, #5664)
+- Major: Improve high-DPI support on Windows. (#4868, #5391, #5664, #5666)
 - Major: Added transparent overlay window (default keybind: <kbd>CTRL</kbd> + <kbd>ALT</kbd> + <kbd>N</kbd>). (#4746, #5643, #5659)
 - Minor: Removed the Ctrl+Shift+L hotkey for toggling the "live only" tab visibility state. (#5530)
 - Minor: Add support for Shared Chat messages. Shared chat messages can be filtered with the `flags.shared` filter variable, or with search using `is:shared`. Some messages like subscriptions are filtered on purpose to avoid confusion for the broadcaster. If you have both channels participating in Shared Chat open, only one of the message triggering your highlight will trigger. (#5606, #5625)

src/controllers/highlights/HighlightPhrase.cpp

@@ -9,6 +9,8 @@ namespace {
 
 }  // namespace
 
+// change made but removed in merge conflict
+// QColor HighlightPhrase::FALLBACK_HIGHLIGHT_COLOR = QColor(238, 97, 102, 65);
 QColor HighlightPhrase::FALLBACK_HIGHLIGHT_COLOR = QColor(127, 63, 73, 127);
 QColor HighlightPhrase::FALLBACK_SELF_MESSAGE_HIGHLIGHT_COLOR =
     QColor(0, 118, 221, 115);

src/widgets/BaseWindow.cpp

@@ -877,10 +877,13 @@ bool BaseWindow::nativeEvent(const QByteArray &eventType, void *message,
         break;
 
         case WM_DPICHANGED: {
-            // wait for Qt to process this message
+            if (this->flags_.has(ClearBuffersOnDpiChange))
-            postToThread([] {
+            {
-                getApp()->getWindows()->invalidateChannelViewBuffers();
+                // wait for Qt to process this message
-            });
+                postToThread([] {
+                    getApp()->getWindows()->invalidateChannelViewBuffers();
+                });
+            }
         }
         break;
 

src/widgets/BaseWindow.hpp

@@ -37,6 +37,7 @@ public:
         Dialog = 1 << 6,
         DisableLayoutSave = 1 << 7,
         BoundsCheckOnShow = 1 << 8,
+        ClearBuffersOnDpiChange = 1 << 9,
     };
 
     enum ActionOnFocusLoss { Nothing, Delete, Close, Hide };

src/widgets/DraggablePopup.cpp

@@ -36,9 +36,9 @@ namespace {
 
 DraggablePopup::DraggablePopup(bool closeAutomatically, QWidget *parent)
     : BaseWindow(
-          closeAutomatically
+          (closeAutomatically ? popupFlagsCloseAutomatically : popupFlags) |
-              ? popupFlagsCloseAutomatically | BaseWindow::DisableLayoutSave
+              BaseWindow::DisableLayoutSave |
-              : popupFlags | BaseWindow::DisableLayoutSave,
+              BaseWindow::ClearBuffersOnDpiChange,
           parent)
     , lifetimeHack_(std::make_shared<bool>(false))
     , dragTimer_(this)

src/widgets/OverlayWindow.cpp

@@ -7,6 +7,7 @@
 #include "singletons/Emotes.hpp"
 #include "singletons/Settings.hpp"
 #include "singletons/WindowManager.hpp"
+#include "util/PostToThread.hpp"
 #include "widgets/BaseWidget.hpp"
 #include "widgets/helper/ChannelView.hpp"
 #include "widgets/helper/InvisibleSizeGrip.hpp"
@@ -312,6 +313,13 @@ bool OverlayWindow::nativeEvent(const QByteArray &eventType, void *message,
         }
         break;
 #    endif
+        case WM_DPICHANGED: {
+            // wait for Qt to process this message, same as in BaseWindow
+            postToThread([] {
+                getApp()->getWindows()->invalidateChannelViewBuffers();
+            });
+        }
+        break;
 
         default:
             return QWidget::nativeEvent(eventType, message, result);

src/widgets/Window.cpp

@@ -52,7 +52,9 @@
 namespace chatterino {
 
 Window::Window(WindowType type, QWidget *parent)
-    : BaseWindow(BaseWindow::EnableCustomFrame, parent)
+    : BaseWindow(
+          {BaseWindow::EnableCustomFrame, BaseWindow::ClearBuffersOnDpiChange},
+          parent)
     , type_(type)
     , notebook_(new SplitNotebook(this))
 {

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->highlightColor);
         }
         else
         {
-            this->tabHighlightRequested.invoke(HighlightState::NewMessage);
+            this->tabHighlightRequested.invoke(HighlightState::NewMessage,
+                                               nullptr);
         }
     }
 

src/widgets/helper/ChannelView.hpp

@@ -11,6 +11,7 @@
 #include "widgets/TooltipWidget.hpp"
 
 #include <pajlada/signals/signal.hpp>
+#include <QColor>
 #include <QGestureEvent>
 #include <QMenu>
 #include <QPaintEvent>
@@ -21,6 +22,7 @@
 #include <QWheelEvent>
 #include <QWidget>
 
+#include <memory>
 #include <unordered_map>
 #include <unordered_set>
 
@@ -214,7 +216,8 @@ public:
 
     pajlada::Signals::Signal<QMouseEvent *> mouseDown;
     pajlada::Signals::NoArgSignal selectionChanged;
-    pajlada::Signals::Signal<HighlightState> tabHighlightRequested;
+    pajlada::Signals::Signal<HighlightState, std::shared_ptr<QColor>>
+        tabHighlightRequested;
     pajlada::Signals::NoArgSignal liveStatusChanged;
     pajlada::Signals::Signal<const Link &> linkClicked;
     pajlada::Signals::Signal<QString, FromTwitchLinkOpenChannelIn>

src/widgets/helper/NotebookTab.cpp

@@ -307,6 +307,7 @@ void NotebookTab::setSelected(bool value)
     this->selected_ = value;
 
     this->highlightState_ = HighlightState::None;
+    this->highlightColor_ = nullptr;
 
     this->update();
 }
@@ -397,6 +398,15 @@ bool NotebookTab::hasHighlightsEnabled() const
     return this->highlightEnabled_;
 }
 
+void NotebookTab::setHighlightColor(std::shared_ptr<QColor> color)
+{
+    if (this->highlightColor_ != color)
+    {
+        this->highlightColor_ = color;
+        this->update();
+    }
+}
+
 QRect NotebookTab::getDesiredRect() const
 {
     return QRect(this->positionAnimationDesiredPoint_, size());
@@ -499,6 +509,14 @@ void NotebookTab::paintEvent(QPaintEvent *)
                                       : (windowFocused ? colors.line.regular
                                                        : colors.line.unfocused);
 
+    if (this->highlightState_ == HighlightState::Highlighted &&
+        this->highlightColor_ != nullptr)
+    {
+        QColor col = *this->highlightColor_;
+        col.setAlpha(255);
+        lineColor = col;
+    }
+
     QRect lineRect;
     switch (this->tabLocation_)
     {

src/widgets/helper/NotebookTab.hpp

@@ -6,6 +6,7 @@
 
 #include <pajlada/settings/setting.hpp>
 #include <pajlada/signals/signalholder.hpp>
+#include <QColor>
 #include <QMenu>
 #include <QPropertyAnimation>
 
@@ -64,6 +65,7 @@ public:
 
     void setHighlightsEnabled(const bool &newVal);
     bool hasHighlightsEnabled() const;
+    void setHighlightColor(std::shared_ptr<QColor> color);
 
     void moveAnimated(QPoint targetPos, bool animated = true);
 
@@ -127,6 +129,7 @@ private:
     HighlightState highlightState_ = HighlightState::None;
     bool highlightEnabled_ = true;
     QAction *highlightNewMessagesAction_;
+    std::shared_ptr<QColor> highlightColor_;
 
     bool isLive_{};
     bool isRerun_{};

src/widgets/splits/SplitContainer.cpp

@@ -213,13 +213,19 @@ void SplitContainer::addSplit(Split *split)
 
     auto &&conns = this->connectionsPerSplit_[split];
 
-    conns.managedConnect(split->getChannelView().tabHighlightRequested,
+    conns.managedConnect(
-                         [this](HighlightState state) {
+        split->getChannelView().tabHighlightRequested,
-                             if (this->tab_ != nullptr)
+        [this](HighlightState state, std::shared_ptr<QColor> color) {
-                             {
+            if (this->tab_ != nullptr)
-                                 this->tab_->setHighlightState(state);
+            {
-                             }
+                this->tab_->setHighlightState(state);
-                         });
+
+                if (color != nullptr)
+                {
+                    this->tab_->setHighlightColor(color);
+                }
+            }
+        });
 
     conns.managedConnect(split->getChannelView().liveStatusChanged, [this]() {
         this->refreshTabLiveStatus();