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

CHANGELOG.md

@@ -3,9 +3,14 @@
 ## Unversioned
 
 - Major: Release plugins alpha. (#5288)
+- Major: Improve high-DPI support on Windows. (#4868, #5391)
+- Minor: Add option to customise Moderation buttons with images. (#5369)
+- Minor: Colored usernames now update on the fly when changing the "Color @usernames" setting. (#5300)
 - Bugfix: If a network request errors with 200 OK, Qt's error code is now reported instead of the HTTP status. (#5378)
+- Dev: Use Qt's high DPI scaling. (#4868)
 - Dev: Add doxygen build target. (#5377)
 - Dev: Make printing of strings in tests easier. (#5379)
+- Dev: Refactor and document `Scrollbar`. (#5334, #5393)
 
 ## 2.5.1
 

resources/qss/settings.qss

@@ -1,11 +1,11 @@
 * {
-    font-size: <font-size>px;
+    font-size: 14px;
     font-family: "Segoe UI";
 }
 
 QCheckBox::indicator {
-    width: <checkbox-size>px;
-    height: <checkbox-size>px;
+    width: 14px;
+    height: 14px;
 }
 
 chatterino--ComboBox {

src/CMakeLists.txt

@@ -519,6 +519,8 @@ set(SOURCE_FILES
         util/IpcQueue.hpp
         util/LayoutHelper.cpp
         util/LayoutHelper.hpp
+        util/LoadPixmap.cpp
+        util/LoadPixmap.hpp
         util/RapidjsonHelpers.cpp
         util/RapidjsonHelpers.hpp
         util/RatelimitBucket.cpp
@@ -650,6 +652,8 @@ set(SOURCE_FILES
         widgets/helper/EditableModelView.hpp
         widgets/helper/EffectLabel.cpp
         widgets/helper/EffectLabel.hpp
+        widgets/helper/IconDelegate.cpp
+        widgets/helper/IconDelegate.hpp
         widgets/helper/InvisibleSizeGrip.cpp
         widgets/helper/InvisibleSizeGrip.hpp
         widgets/helper/NotebookButton.cpp
@@ -658,8 +662,6 @@ set(SOURCE_FILES
         widgets/helper/NotebookTab.hpp
         widgets/helper/RegExpItemDelegate.cpp
         widgets/helper/RegExpItemDelegate.hpp
-        widgets/helper/TrimRegExpValidator.cpp
-        widgets/helper/TrimRegExpValidator.hpp
         widgets/helper/ResizingTextEdit.cpp
         widgets/helper/ResizingTextEdit.hpp
         widgets/helper/ScrollbarHighlight.cpp
@@ -674,6 +676,8 @@ set(SOURCE_FILES
         widgets/helper/TitlebarButton.hpp
         widgets/helper/TitlebarButtons.cpp
         widgets/helper/TitlebarButtons.hpp
+        widgets/helper/TrimRegExpValidator.cpp
+        widgets/helper/TrimRegExpValidator.hpp
 
         widgets/layout/FlowLayout.cpp
         widgets/layout/FlowLayout.hpp

src/RunGui.cpp

@@ -86,10 +86,6 @@ namespace {
         QApplication::setAttribute(Qt::AA_DontCreateNativeWidgetSiblings);
 #endif
 
-#if defined(Q_OS_WIN32) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-        QApplication::setAttribute(Qt::AA_DisableHighDpiScaling, true);
-#endif
-
         QApplication::setStyle(QStyleFactory::create("Fusion"));
 
 #ifndef Q_OS_MAC

src/controllers/moderationactions/ModerationAction.cpp

@@ -6,28 +6,11 @@
 #include "singletons/Resources.hpp"
 
 #include <QRegularExpression>
+#include <QUrl>
 
 namespace chatterino {
 
-// ModerationAction::ModerationAction(Image *_image, const QString &_action)
-//    : _isImage(true)
-//    , image(_image)
-//    , action(_action)
-//{
-//}
-
-// ModerationAction::ModerationAction(const QString &_line1, const QString
-// &_line2,
-//                                   const QString &_action)
-//    : _isImage(false)
-//    , image(nullptr)
-//    , line1(_line1)
-//    , line2(_line2)
-//    , action(_action)
-//{
-//}
-
-ModerationAction::ModerationAction(const QString &action)
+ModerationAction::ModerationAction(const QString &action, const QUrl &iconPath)
     : action_(action)
 {
     static QRegularExpression replaceRegex("[!/.]");
@@ -37,6 +20,8 @@ ModerationAction::ModerationAction(const QString &action)
 
     if (timeoutMatch.hasMatch())
     {
+        this->type_ = Type::Timeout;
+
         // if (multipleTimeouts > 1) {
         // QString line1;
         // QString line2;
@@ -99,31 +84,31 @@ ModerationAction::ModerationAction(const QString &action)
             }
             this->line2_ = "w";
         }
-
-        // line1 = this->line1_;
-        // line2 = this->line2_;
-        // } else {
-        //     this->_moderationActions.emplace_back(getResources().buttonTimeout,
-        //     str);
-        // }
     }
     else if (action.startsWith("/ban "))
     {
-        this->imageToLoad_ = 1;
+        this->type_ = Type::Ban;
     }
     else if (action.startsWith("/delete "))
     {
-        this->imageToLoad_ = 2;
+        this->type_ = Type::Delete;
     }
     else
     {
+        this->type_ = Type::Custom;
+
         QString xD = action;
 
         xD.replace(replaceRegex, "");
 
         this->line1_ = xD.mid(0, 2);
         this->line2_ = xD.mid(2, 2);
     }
+
+    if (iconPath.isValid())
+    {
+        this->iconPath_ = iconPath;
+    }
 }
 
 bool ModerationAction::operator==(const ModerationAction &other) const
@@ -139,19 +124,23 @@ bool ModerationAction::isImage() const
 const std::optional<ImagePtr> &ModerationAction::getImage() const
 {
     assertInGuiThread();
+    if (this->image_.has_value())
+    {
+        return this->image_;
+    }
 
-    if (this->imageToLoad_ != 0)
+    if (this->iconPath_.isValid())
     {
-        if (this->imageToLoad_ == 1)
-        {
-            this->image_ =
-                Image::fromResourcePixmap(getResources().buttons.ban);
-        }
-        else if (this->imageToLoad_ == 2)
-        {
-            this->image_ =
-                Image::fromResourcePixmap(getResources().buttons.trashCan);
-        }
+        this->image_ = Image::fromUrl({this->iconPath_.toString()});
+    }
+    else if (this->type_ == Type::Ban)
+    {
+        this->image_ = Image::fromResourcePixmap(getResources().buttons.ban);
+    }
+    else if (this->type_ == Type::Delete)
+    {
+        this->image_ =
+            Image::fromResourcePixmap(getResources().buttons.trashCan);
     }
 
     return this->image_;
@@ -172,4 +161,14 @@ const QString &ModerationAction::getAction() const
     return this->action_;
 }
 
+const QUrl &ModerationAction::iconPath() const
+{
+    return this->iconPath_;
+}
+
+ModerationAction::Type ModerationAction::getType() const
+{
+    return this->type_;
+}
+
 }  // namespace chatterino

src/controllers/moderationactions/ModerationAction.hpp

@@ -4,6 +4,7 @@
 
 #include <pajlada/serialize.hpp>
 #include <QString>
+#include <QUrl>
 
 #include <memory>
 #include <optional>
@@ -16,7 +17,32 @@ using ImagePtr = std::shared_ptr<Image>;
 class ModerationAction
 {
 public:
-    ModerationAction(const QString &action);
+    /**
+     * Type of the action, parsed from the input `action`
+     */
+    enum class Type {
+        /**
+         * /ban <user>
+         */
+        Ban,
+
+        /**
+         * /delete <msg-id>
+         */
+        Delete,
+
+        /**
+         * /timeout <user> <duration>
+         */
+        Timeout,
+
+        /**
+         * Anything not matching the action types above
+         */
+        Custom,
+    };
+
+    ModerationAction(const QString &action, const QUrl &iconPath = {});
 
     bool operator==(const ModerationAction &other) const;
 
@@ -25,13 +51,18 @@ class ModerationAction
     const QString &getLine1() const;
     const QString &getLine2() const;
     const QString &getAction() const;
+    const QUrl &iconPath() const;
+    Type getType() const;
 
 private:
     mutable std::optional<ImagePtr> image_;
     QString line1_;
     QString line2_;
     QString action_;
-    int imageToLoad_{};
+
+    Type type_{};
+
+    QUrl iconPath_;
 };
 
 }  // namespace chatterino
@@ -46,6 +77,7 @@ struct Serialize<chatterino::ModerationAction> {
         rapidjson::Value ret(rapidjson::kObjectType);
 
         chatterino::rj::set(ret, "pattern", value.getAction(), a);
+        chatterino::rj::set(ret, "icon", value.iconPath().toString(), a);
 
         return ret;
     }
@@ -63,10 +95,12 @@ struct Deserialize<chatterino::ModerationAction> {
         }
 
         QString pattern;
-
         chatterino::rj::getSafe(value, "pattern", pattern);
 
-        return chatterino::ModerationAction(pattern);
+        QString icon;
+        chatterino::rj::getSafe(value, "icon", icon);
+
+        return chatterino::ModerationAction(pattern, QUrl(icon));
     }
 };
 

src/controllers/moderationactions/ModerationActionModel.cpp

@@ -1,28 +1,51 @@
 #include "controllers/moderationactions/ModerationActionModel.hpp"
 
 #include "controllers/moderationactions/ModerationAction.hpp"
+#include "messages/Image.hpp"
+#include "util/LoadPixmap.hpp"
+#include "util/PostToThread.hpp"
 #include "util/StandardItemHelper.hpp"
 
+#include <QIcon>
+#include <QPixmap>
+
 namespace chatterino {
 
 // commandmodel
 ModerationActionModel ::ModerationActionModel(QObject *parent)
-    : SignalVectorModel<ModerationAction>(1, parent)
+    : SignalVectorModel<ModerationAction>(2, parent)
 {
 }
 
 // turn a vector item into a model row
 ModerationAction ModerationActionModel::getItemFromRow(
     std::vector<QStandardItem *> &row, const ModerationAction &original)
 {
-    return ModerationAction(row[0]->data(Qt::DisplayRole).toString());
+    return ModerationAction(
+        row[Column::Command]->data(Qt::DisplayRole).toString(),
+        row[Column::Icon]->data(Qt::UserRole).toString());
 }
 
 // turns a row in the model into a vector item
 void ModerationActionModel::getRowFromItem(const ModerationAction &item,
                                            std::vector<QStandardItem *> &row)
 {
-    setStringItem(row[0], item.getAction());
+    setStringItem(row[Column::Command], item.getAction());
+    setFilePathItem(row[Column::Icon], item.iconPath());
+    if (!item.iconPath().isEmpty())
+    {
+        auto oImage = item.getImage();
+        assert(oImage.has_value());
+        if (oImage.has_value())
+        {
+            auto url = oImage->get()->url();
+            loadPixmapFromUrl(url, [row](const QPixmap &pixmap) {
+                postToThread([row, pixmap]() {
+                    row[Column::Icon]->setData(pixmap, Qt::DecorationRole);
+                });
+            });
+        }
+    }
 }
 
 }  // namespace chatterino

src/controllers/moderationactions/ModerationActionModel.hpp

@@ -13,6 +13,11 @@ class ModerationActionModel : public SignalVectorModel<ModerationAction>
 public:
     explicit ModerationActionModel(QObject *parent);
 
+    enum Column {
+        Command = 0,
+        Icon = 1,
+    };
+
 protected:
     // turn a vector item into a model row
     ModerationAction getItemFromRow(std::vector<QStandardItem *> &row,

src/main.cpp

@@ -31,11 +31,6 @@ using namespace chatterino;
 
 int main(int argc, char **argv)
 {
-    // TODO: This is a temporary fix (see #4552).
-#if defined(Q_OS_WINDOWS) && QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-    qputenv("QT_ENABLE_HIGHDPI_SCALING", "0");
-#endif
-
     QApplication a(argc, argv);
 
     QCoreApplication::setApplicationName("chatterino");

src/messages/MessageBuilder.cpp

@@ -763,10 +763,7 @@ void MessageBuilder::addTextOrEmoji(const QString &string_)
     auto &&textColor = this->textColor_;
     if (string.startsWith('@'))
     {
-        this->emplace<TextElement>(string, MessageElementFlag::BoldUsername,
-                                   textColor, FontStyle::ChatMediumBold);
-        this->emplace<TextElement>(string, MessageElementFlag::NonBoldUsername,
-                                   textColor);
+        this->emplace<MentionElement>(string, textColor, textColor);
     }
     else
     {