Merge remote-tracking branch 'origin/master' into chatterino7

Now we're on commit b4b7450; Changes from upstream we've pulled: - Minor: Clean up chat messages of special line characters prior to sending. (Chatterino#3312) - Bugfix: Fixed `First Message` scrollbar highlights not being disabled. (Chatterino#3325) - Dev: Add GitHub action to test builds without precompiled headers enabled. (Chatterino#3327)
D3XX3R · Oct 30, 2021 · 8786c24 · 8786c24
2 parents a509654 + b4b7450
commit 8786c24
Show file tree

Hide file tree

Showing 8 changed files with 68 additions and 29 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,14 +15,21 @@ jobs:
         os: [windows-latest, ubuntu-latest, macos-latest]
         qt-version: [5.15.2, 5.12.10]
         build-system: [qmake, cmake]
+        pch: [true]
         exclude:
           - os: windows-latest
             qt-version: 5.12.10
             build-system: cmake
+            pch: true
         include:
           - os: windows-2016
             qt-version: 5.12.10
             build-system: cmake
+            pch: true
+          - os: ubuntu-latest
+            qt-version: 5.15.2
+            build-system: cmake
+            pch: false
       fail-fast: false
 
     steps:
@@ -158,7 +165,12 @@ jobs:
         run: |
             mkdir build
             cd build
-            cmake -DCMAKE_INSTALL_PREFIX=appdir/usr/ -DCMAKE_BUILD_TYPE=Release -DPAJLADA_SETTINGS_USE_BOOST_FILESYSTEM=On ..
+            cmake \
+              -DCMAKE_INSTALL_PREFIX=appdir/usr/ \
+              -DCMAKE_BUILD_TYPE=Release \
+              -DPAJLADA_SETTINGS_USE_BOOST_FILESYSTEM=On \
+              -DUSE_PRECOMPILED_HEADERS=${{ matrix.pch }} \
+              ..
             make -j8
         shell: bash
 
@@ -214,6 +226,7 @@ jobs:
             cmake \
                 -DCMAKE_BUILD_TYPE=Release \
                 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl \
+                -DUSE_PRECOMPILED_HEADERS=${{ matrix.pch }} \
                 ..
             make -j8
         shell: bash

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,6 +26,7 @@
 - Minor: Ignore out of bounds check for tiling wms (#3270)
 - Minor: Added `flags.first_message` filter variable (#3292)
 - Minor: Removed duplicate setting for toggling `Channel Point Redeemed Message` highlights (#3296)
+- Minor: Clean up chat messages of special line characters prior to sending. (#3312)
 - Bugfix: Fixed colored usernames sometimes not working. (#3170)
 - Bugfix: Restored ability to send duplicate `/me` messages. (#3166)
 - Bugfix: Notifications for moderators about other moderators deleting messages can now be disabled. (#3121)
@@ -42,6 +43,8 @@
 - Bugfix: Fixed `QCharRef with an index pointing outside the valid range of a QString` warning that was emitted on every Tab press. (#3234)
 - Bugfix: Fixed being unable to disable `First Message` highlights (#3293)
 - Bugfix: Fixed `First Message` custom sound not persisting through restart. (#3303)
+- Bugfix: Fixed `First Message` scrollbar highlights not being disabled. (#3325)
+- Dev: Add GitHub action to test builds without precompiled headers enabled. (#3327)
 - Dev: Renamed CMake's build option `USE_SYSTEM_QT5KEYCHAIN` to `USE_SYSTEM_QTKEYCHAIN`. (#3103)
 - Dev: Add benchmarks that can be compiled with the `BUILD_BENCHMARKS` CMake flag. Off by default. (#3038)
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -561,7 +561,10 @@ if (BUILD_APP)
 endif ()
 
 if (USE_PRECOMPILED_HEADERS)
+    message(STATUS "Building with precompiled headers")
     target_precompile_headers(${LIBRARY_PROJECT} PRIVATE PrecompiledHeader.hpp)
+else ()
+    message(STATUS "Building without precompiled headers")
 endif ()
 
 # Enable autogeneration of Qts MOC/RCC/UIC

diff --git a/src/messages/Message.cpp b/src/messages/Message.cpp
@@ -46,7 +46,7 @@ SBHighlight Message::getScrollBarHighlight() const
     {
         return SBHighlight(
             ColorProvider::instance().color(ColorType::FirstMessageHighlight),
-            SBHighlight::Default, true);
+            SBHighlight::Default, false, true);
     }
     return SBHighlight();
 }

diff --git a/src/providers/twitch/TwitchChannel.cpp b/src/providers/twitch/TwitchChannel.cpp
@@ -378,7 +378,7 @@ void TwitchChannel::sendMessage(const QString &message)
     // Do last message processing
     QString parsedMessage = app->emotes->emojis.replaceShortCodes(message);
 
-    parsedMessage = parsedMessage.trimmed();
+    parsedMessage = parsedMessage.simplified();
 
     if (parsedMessage.isEmpty())
     {

diff --git a/src/widgets/Scrollbar.cpp b/src/widgets/Scrollbar.cpp
@@ -251,6 +251,8 @@ void Scrollbar::paintEvent(QPaintEvent *)
     painter.fillRect(rect(), this->theme->scrollbars.background);
 
     bool enableRedeemedHighlights = getSettings()->enableRedeemedHighlight;
+    bool enableFirstMessageHighlights =
+        getSettings()->enableFirstMessageHighlight;
 
     //    painter.fillRect(QRect(xOffset, 0, width(), this->buttonHeight),
     //                     this->themeManager->ScrollbarArrow);
@@ -287,36 +289,44 @@ void Scrollbar::paintEvent(QPaintEvent *)
     int highlightHeight =
         int(std::ceil(std::max<float>(this->scale() * 2, dY)));
 
-    for (size_t i = 0; i < snapshotLength; i++)
+    for (size_t i = 0; i < snapshotLength; i++, y += dY)
     {
         ScrollbarHighlight const &highlight = snapshot[i];
 
-        if (!highlight.isNull())
+        if (highlight.isNull())
         {
-            if (!highlight.isRedeemedHighlight() || enableRedeemedHighlights)
-            {
-                QColor color = highlight.getColor();
-                color.setAlpha(255);
-
-                switch (highlight.getStyle())
-                {
-                    case ScrollbarHighlight::Default: {
-                        painter.fillRect(w / 8 * 3, int(y), w / 4,
-                                         highlightHeight, color);
-                    }
-                    break;
-
-                    case ScrollbarHighlight::Line: {
-                        painter.fillRect(0, int(y), w, 1, color);
-                    }
-                    break;
-
-                    case ScrollbarHighlight::None:;
-                }
-            }
+            continue;
+        }
+
+        if (highlight.isRedeemedHighlight() && !enableRedeemedHighlights)
+        {
+            continue;
+        }
+
+        if (highlight.isFirstMessageHighlight() &&
+            !enableFirstMessageHighlights)
+        {
+            continue;
         }
 
-        y += dY;
+        QColor color = highlight.getColor();
+        color.setAlpha(255);
+
+        switch (highlight.getStyle())
+        {
+            case ScrollbarHighlight::Default: {
+                painter.fillRect(w / 8 * 3, int(y), w / 4, highlightHeight,
+                                 color);
+            }
+            break;
+
+            case ScrollbarHighlight::Line: {
+                painter.fillRect(0, int(y), w, 1, color);
+            }
+            break;
+
+            case ScrollbarHighlight::None:;
+        }
     }
 }
 

diff --git a/src/widgets/helper/ScrollbarHighlight.cpp b/src/widgets/helper/ScrollbarHighlight.cpp
@@ -13,10 +13,12 @@ ScrollbarHighlight::ScrollbarHighlight()
 }
 
 ScrollbarHighlight::ScrollbarHighlight(const std::shared_ptr<QColor> color,
-                                       Style style, bool isRedeemedHighlight)
+                                       Style style, bool isRedeemedHighlight,
+                                       bool isFirstMessageHighlight)
     : color_(color)
     , style_(style)
     , isRedeemedHighlight_(isRedeemedHighlight)
+    , isFirstMessageHighlight_(isFirstMessageHighlight)
 {
 }
 
@@ -35,6 +37,11 @@ bool ScrollbarHighlight::isRedeemedHighlight() const
     return this->isRedeemedHighlight_;
 }
 
+bool ScrollbarHighlight::isFirstMessageHighlight() const
+{
+    return this->isFirstMessageHighlight_;
+}
+
 bool ScrollbarHighlight::isNull() const
 {
     return this->style_ == None;

diff --git a/src/widgets/helper/ScrollbarHighlight.hpp b/src/widgets/helper/ScrollbarHighlight.hpp
@@ -21,17 +21,20 @@ class ScrollbarHighlight
     ScrollbarHighlight();
 
     ScrollbarHighlight(const std::shared_ptr<QColor> color,
-                       Style style = Default, bool isRedeemedHighlight = false);
+                       Style style = Default, bool isRedeemedHighlight = false,
+                       bool isFirstMessageHighlight = false);
 
     QColor getColor() const;
     Style getStyle() const;
     bool isRedeemedHighlight() const;
+    bool isFirstMessageHighlight() const;
     bool isNull() const;
 
 private:
     std::shared_ptr<QColor> color_;
     Style style_;
     bool isRedeemedHighlight_;
+    bool isFirstMessageHighlight_;
 };
 
 }  // namespace chatterino