Merge remote-tracking branch 'main_repo/master' into git_is_pepega

check if works with new changes from master

.github/workflows/build.yml

@@ -24,8 +24,18 @@ jobs:
         with:
           submodules: true
 
+      - name: Cache Qt
+        id: cache-qt
+        uses: actions/cache@v1
+        with:
+          path: ../Qt
+          key: ${{ runner.os }}-QtCache
+
       - name: Install Qt
-        uses: jurplel/install-qt-action@v1
+        uses: jurplel/install-qt-action@v2
+        with:
+          mirror: 'http://mirrors.ocf.berkeley.edu/qt/'
+          cached: ${{ steps.cache-qt.outputs.cache-hit }}
 
       # WINDOWS
       - name: Cache conan

src/controllers/highlights/HighlightModel.cpp

@@ -120,14 +120,16 @@ void HighlightModel::afterInit()
     std::vector<QStandardItem *> redeemedRow = this->createRow();
     setBoolItem(redeemedRow[Column::Pattern],
                 getSettings()->enableRedeemedHighlight.getValue(), true, false);
-    redeemedRow[Column::Pattern]->setData("Highlights redeemed with Bits",
-                                          Qt::DisplayRole);
-    setBoolItem(redeemedRow[Column::FlashTaskbar],
-                getSettings()->enableRedeemedHighlightTaskbar.getValue(), true,
-                false);
-    setBoolItem(redeemedRow[Column::PlaySound],
-                getSettings()->enableRedeemedHighlightSound.getValue(), true,
-                false);
+    redeemedRow[Column::Pattern]->setData(
+        "Highlights redeemed with Channel Points", Qt::DisplayRole);
+    //    setBoolItem(redeemedRow[Column::FlashTaskbar],
+    //                getSettings()->enableRedeemedHighlightTaskbar.getValue(), true,
+    //                false);
+    //    setBoolItem(redeemedRow[Column::PlaySound],
+    //                getSettings()->enableRedeemedHighlightSound.getValue(), true,
+    //                false);
+    redeemedRow[Column::FlashTaskbar]->setFlags(0);
+    redeemedRow[Column::PlaySound]->setFlags(0);
     redeemedRow[Column::UseRegex]->setFlags(0);
     redeemedRow[Column::CaseSensitive]->setFlags(0);
 
@@ -192,8 +194,8 @@ void HighlightModel::customRowSetData(const std::vector<QStandardItem *> &row,
                 }
                 else if (rowIndex == 3)
                 {
-                    getSettings()->enableRedeemedHighlightTaskbar.setValue(
-                        value.toBool());
+                    // getSettings()->enableRedeemedHighlightTaskbar.setValue(
+                    //     value.toBool());
                 }
             }
         }
@@ -218,8 +220,8 @@ void HighlightModel::customRowSetData(const std::vector<QStandardItem *> &row,
                 }
                 else if (rowIndex == 3)
                 {
-                    getSettings()->enableRedeemedHighlightSound.setValue(
-                        value.toBool());
+                    // getSettings()->enableRedeemedHighlightSound.setValue(
+                    //     value.toBool());
                 }
             }
         }

src/messages/Image.cpp

@@ -46,8 +46,16 @@ namespace detail {
             this->items_.begin(), this->items_.end(), 0UL,
             [](auto init, auto &&frame) { return init + frame.duration; });
 
-        this->durationOffset_ = std::min<int>(
-            int(getApp()->emotes->gifTimer.position() % totalLength), 60000);
+        if (totalLength == 0)
+        {
+            this->durationOffset_ = 0;
+        }
+        else
+        {
+            this->durationOffset_ = std::min<int>(
+                int(getApp()->emotes->gifTimer.position() % totalLength),
+                60000);
+        }
         this->processOffset();
     }
 
@@ -72,6 +80,11 @@ namespace detail {
 
     void Frames::processOffset()
     {
+        if (this->items_.isEmpty())
+        {
+            return;
+        }
+
         while (true)
         {
             this->index_ %= this->items_.size();

src/providers/twitch/IrcMessageHandler.cpp

@@ -53,7 +53,10 @@ static float relativeSimilarity(const QString &str1, const QString &str2)
         }
     }
 
-    return z == 0 ? 0.f : float(z) / std::max(str1.size(), str2.size());
+    // ensure that no div by 0
+    return z == 0 ? 0.f
+                  : float(z) /
+                        std::max<int>(1, std::max(str1.size(), str2.size()));
 };
 
 float IrcMessageHandler::similarity(

src/providers/twitch/TwitchMessageBuilder.cpp

@@ -60,6 +60,7 @@ QColor getRandomColor(const QVariant &userId)
         colorSeed = std::rand();
     }
 
+    assert(twitchUsernameColors.size() != 0);
     const auto colorIndex = colorSeed % twitchUsernameColors.size();
     return twitchUsernameColors[colorIndex];
 }

src/singletons/Settings.hpp

@@ -207,10 +207,10 @@ public:
 
     BoolSetting enableRedeemedHighlight = {
         "/highlighting/redeemedHighlight/highlighted", true};
-    BoolSetting enableRedeemedHighlightSound = {
-        "/highlighting/redeemedHighlight/enableSound", false};
-    BoolSetting enableRedeemedHighlightTaskbar = {
-        "/highlighting/redeemedHighlight/enableTaskbarFlashing", false};
+    //    BoolSetting enableRedeemedHighlightSound = {
+    //        "/highlighting/redeemedHighlight/enableSound", false};
+    //    BoolSetting enableRedeemedHighlightTaskbar = {
+    //        "/highlighting/redeemedHighlight/enableTaskbarFlashing", false};
     QStringSetting redeemedHighlightSoundUrl = {
         "/highlighting/redeemedHighlightSoundUrl", ""};
     QStringSetting redeemedHighlightColor = {

src/singletons/WindowManager.cpp

@@ -445,6 +445,8 @@ void WindowManager::initialize(Settings &settings, Paths &paths)
         [this](auto, auto) { this->forceLayoutChannelViews(); });
     settings.collpseMessagesMinLines.connect(
         [this](auto, auto) { this->forceLayoutChannelViews(); });
+    settings.enableRedeemedHighlight.connect(
+        [this](auto, auto) { this->forceLayoutChannelViews(); });
 
     this->initialized_ = true;
 }

src/widgets/BaseWidget.cpp

@@ -9,6 +9,7 @@
 #include <QIcon>
 #include <QLayout>
 #include <QtGlobal>
+#include <algorithm>
 
 namespace chatterino {
 
@@ -113,7 +114,8 @@ float BaseWidget::qtFontScale() const
 {
     if (auto window = dynamic_cast<BaseWindow *>(this->window()))
     {
-        return this->scale() / window->nativeScale_;
+        // ensure no div by 0
+        return this->scale() / std::max<float>(0.01f, window->nativeScale_);
     }
     else
     {

src/widgets/BaseWindow.cpp

@@ -104,12 +104,12 @@ QRect BaseWindow::getBounds()
 
 float BaseWindow::scale() const
 {
-    return this->overrideScale().value_or(this->scale_);
+    return std::max<float>(0.01f, this->overrideScale().value_or(this->scale_));
 }
 
 float BaseWindow::qtFontScale() const
 {
-    return this->scale() / this->nativeScale_;
+    return this->scale() / std::max<float>(0.01, this->nativeScale_);
 }
 
 void BaseWindow::init()

src/widgets/Label.cpp

@@ -93,10 +93,12 @@ void Label::paintEvent(QPaintEvent *)
 
     QFontMetrics metrics = getFonts()->getFontMetrics(
         this->getFontStyle(),
-        this->scale() * 96.f / this->logicalDpiX() * deviceDpi);
+        this->scale() * 96.f /
+            std::max<float>(0.01, this->logicalDpiX() * deviceDpi));
     painter.setFont(getFonts()->getFont(
         this->getFontStyle(),
-        this->scale() * 96.f / this->logicalDpiX() * deviceDpi));
+        this->scale() * 96.f /
+            std::max<float>(0.02, this->logicalDpiX() * deviceDpi)));
 
     int offset = this->getOffset();
 

src/widgets/Scrollbar.cpp

@@ -357,7 +357,9 @@ void Scrollbar::mouseMoveEvent(QMouseEvent *event)
         int delta = event->pos().y() - this->lastMousePosition_.y();
 
         setDesiredValue(this->desiredValue_ +
-                        qreal(delta) / this->trackHeight_ * this->maximum_);
+                        qreal(delta) /
+                            std::max<qreal>(0.00000002, this->trackHeight_ *
+                                                            this->maximum_));
     }
 
     this->lastMousePosition_ = event->pos();
@@ -442,13 +444,14 @@ void Scrollbar::updateScroll()
     this->trackHeight_ = this->height() - this->buttonHeight_ -
                          this->buttonHeight_ - MIN_THUMB_HEIGHT - 1;
 
-    this->thumbRect_ =
-        QRect(0,
-              int(this->currentValue_ / this->maximum_ * this->trackHeight_) +
-                  1 + this->buttonHeight_,
-              this->width(),
-              int(this->largeChange_ / this->maximum_ * this->trackHeight_) +
-                  MIN_THUMB_HEIGHT);
+    auto div = std::max<qreal>(0.0000001, this->maximum_);
+
+    this->thumbRect_ = QRect(
+        0,
+        int(this->currentValue_ / div * this->trackHeight_) + 1 +
+            this->buttonHeight_,
+        this->width(),
+        int(this->largeChange_ / div * this->trackHeight_) + MIN_THUMB_HEIGHT);
 
     this->update();
 }

src/widgets/dialogs/ColorPickerDialog.cpp

@@ -210,6 +210,7 @@ void ColorPickerDialog::initRecentColors(LayoutCreator<QWidget> &creator)
         this->ui_.recent.colors.push_back(new ColorButton(*it, this));
         auto *button = this->ui_.recent.colors[ind];
 
+        static_assert(RECENT_COLORS_PER_ROW != 0);
         const int rowInd = (ind / RECENT_COLORS_PER_ROW) + 1;
         const int columnInd = ind % RECENT_COLORS_PER_ROW;
 

src/widgets/helper/ChannelView.cpp

@@ -319,7 +319,9 @@ void ChannelView::scaleChangedEvent(float scale)
     {
         auto factor = this->qtFontScale();
 #ifdef Q_OS_MACOS
-        factor = scale * 80.f / this->logicalDpiX() * this->devicePixelRatioF();
+        factor = scale * 80.f /
+                 std::max<float>(
+                     0.01, this->logicalDpiX() * this->devicePixelRatioF());
 #endif
         this->goToBottom_->getLabel().setFont(
             getFonts()->getFont(FontStyle::UiMedium, factor));
@@ -426,8 +428,9 @@ void ChannelView::updateScrollbar(
 
         if (h < 0)  // break condition
         {
-            this->scrollBar_->setLargeChange((messages.size() - i) +
-                                             qreal(h) / message->getHeight());
+            this->scrollBar_->setLargeChange(
+                (messages.size() - i) +
+                qreal(h) / std::max<int>(1, message->getHeight()));
 
             showScrollbar = true;
             break;
@@ -964,8 +967,8 @@ void ChannelView::wheelEvent(QWheelEvent *event)
         if (delta > 0)
         {
             qreal scrollFactor = fmod(desired, 1);
-            qreal currentScrollLeft =
-                int(scrollFactor * snapshot[i]->getHeight());
+            qreal currentScrollLeft = std::max<qreal>(
+                0.01, int(scrollFactor * snapshot[i]->getHeight()));
 
             for (; i >= 0; i--)
             {
@@ -997,8 +1000,8 @@ void ChannelView::wheelEvent(QWheelEvent *event)
         {
             delta = -delta;
             qreal scrollFactor = 1 - fmod(desired, 1);
-            qreal currentScrollLeft =
-                int(scrollFactor * snapshot[i]->getHeight());
+            qreal currentScrollLeft = std::max<qreal>(
+                0.01, int(scrollFactor * snapshot[i]->getHeight()));
 
             for (; i < snapshotLength; i++)
             {

src/widgets/helper/NotebookTab.cpp

@@ -282,12 +282,11 @@ void NotebookTab::paintEvent(QPaintEvent *)
     QPainter painter(this);
     float scale = this->scale();
 
-    painter.setFont(getApp()->fonts->getFont(
-        FontStyle::UiTabs,
-        scale * 96.f / this->logicalDpiX() * deviceDpi(this)));
-    QFontMetrics metrics = app->fonts->getFontMetrics(
-        FontStyle::UiTabs,
-        scale * 96.f / this->logicalDpiX() * deviceDpi(this));
+    auto div = std::max<float>(0.01f, this->logicalDpiX() * deviceDpi(this));
+    painter.setFont(
+        getApp()->fonts->getFont(FontStyle::UiTabs, scale * 96.f / div));
+    QFontMetrics metrics =
+        app->fonts->getFontMetrics(FontStyle::UiTabs, scale * 96.f / div);
 
     int height = int(scale * NOTEBOOK_TAB_HEIGHT);
 

src/widgets/settingspages/AboutPage.cpp

@@ -32,8 +32,11 @@ AboutPage::AboutPage()
 
         auto logo = layout.emplace<QLabel>().assign(&this->logo_);
         logo->setPixmap(pixmap);
-        logo->setFixedSize(PIXMAP_WIDTH,
-                           PIXMAP_WIDTH * pixmap.height() / pixmap.width());
+        if (pixmap.width() != 0)
+        {
+            logo->setFixedSize(PIXMAP_WIDTH,
+                               PIXMAP_WIDTH * pixmap.height() / pixmap.width());
+        }
         logo->setScaledContents(true);
 
         // this does nothing

src/widgets/settingspages/GeneralPage.cpp

@@ -359,6 +359,8 @@ void GeneralPage::initLayout(SettingsLayout &layout)
     // layout.addCheckbox("Mark last message you read");
     // layout.addDropdown("Last read message style", {"Default"});
     layout.addCheckbox("Show deleted messages", s.hideModerated, true);
+    layout.addCheckbox("Highlight messages redeemed with Channel Points",
+                       s.enableRedeemedHighlight);
     layout.addDropdown<QString>(
         "Timestamps",
         {"Disable", "h:mm", "hh:mm", "h:mm a", "hh:mm a", "h:mm:ss", "hh:mm:ss",

src/widgets/splits/SplitContainer.cpp

@@ -962,8 +962,10 @@ void SplitContainer::Node::insertNextToThis(Split *_split, Direction _direction)
 {
     auto &siblings = this->parent_->children_;
 
-    qreal width = this->parent_->geometry_.width() / siblings.size();
-    qreal height = this->parent_->geometry_.height() / siblings.size();
+    qreal width = this->parent_->geometry_.width() /
+                  std::max<qreal>(0.0001, siblings.size());
+    qreal height = this->parent_->geometry_.height() /
+                   std::max<qreal>(0.0001, siblings.size());
 
     if (siblings.size() == 1)
     {
@@ -1117,16 +1119,20 @@ void SplitContainer::Node::layout(bool addSpacing, float _scale,
             // vars
             qreal minSize = qreal(48 * _scale);
 
-            qreal totalFlex = this->getChildrensTotalFlex(isVertical);
+            qreal totalFlex = std::max<qreal>(
+                0.0001, this->getChildrensTotalFlex(isVertical));
             qreal totalSize = std::accumulate(
                 this->children_.begin(), this->children_.end(), qreal(0),
                 [=](int val, std::unique_ptr<Node> &node) {
-                    return val + std::max<qreal>(this->getSize(isVertical) /
-                                                     totalFlex *
-                                                     node->getFlex(isVertical),
-                                                 minSize);
+                    return val + std::max<qreal>(
+                                     this->getSize(isVertical) /
+                                         std::max<qreal>(0.0001, totalFlex) *
+                                         node->getFlex(isVertical),
+                                     minSize);
                 });
 
+            totalSize = std::max<qreal>(0.0001, totalSize);
+
             qreal sizeMultiplier = this->getSize(isVertical) / totalSize;
             QRectF childRect = this->geometry_;
 
@@ -1242,7 +1248,7 @@ void SplitContainer::Node::layout(bool addSpacing, float _scale,
             }
         }
         break;
-    };
+    }
 }
 
 SplitContainer::Node::Type SplitContainer::Node::toContainerType(Direction _dir)