Merge branch 'master' of github.com:Chatterino/chatterino2 into featu…

…re/lua-completion-api-v2

.CI/chatterino-nightly.flatpakref

@@ -1,9 +1,9 @@
 [Flatpak Ref]
 Name=com.chatterino.chatterino
-Branch=nightly
+Branch=beta
 Title=com.chatterino.chatterino from flathub
 IsRuntime=false
-Url=https://dl.flathub.org/repo/
-SuggestRemoteName=flathub
+Url=https://dl.flathub.org/beta-repo/
+SuggestRemoteName=flathub-beta
 GPGKey=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
 RuntimeRepo=https://dl.flathub.org/repo/flathub.flatpakrepo

CHANGELOG.md

@@ -15,6 +15,7 @@
 - Minor: All sound capabilities can now be disabled by setting your "Sound backend" setting to "Null" and restarting Chatterino. (#4978)
 - Minor: Add an option to use new experimental smarter emote completion. (#4987)
 - Minor: Add `--safe-mode` command line option that can be used for troubleshooting when Chatterino is misbehaving or is misconfigured. It disables hiding the settings button & prevents plugins from loading. (#4985)
+- Minor: Updated the flatpakref link included with nightly builds to point to up-to-date flathub-beta builds. (#5008)
 - Minor: Add a new completion API for experimental plugins feature. (#5000)
 - Bugfix: Fixed an issue where certain emojis did not send to Twitch chat correctly. (#4840)
 - Bugfix: Fixed capitalized channel names in log inclusion list not being logged. (#4848)
@@ -46,14 +47,17 @@
 - Bugfix: Fixed lookahead/-behind not working in _Ignores_. (#4965)
 - Bugfix: Fixed Image Uploader accidentally deleting images with some hosts when link resolver was enabled. (#4971)
 - Bugfix: Fixed rare crash with Image Uploader when closing a split right after starting an upload. (#4971)
+- Bugfix: Hide the Usercard button in the User Info Popup when in special channels. (#4972)
 - Bugfix: Fixed support for Windows 11 Snap layouts. (#4994)
 - Bugfix: Fixed some windows appearing between screens. (#4797)
+- Bugfix: Fixed a bug on Wayland where tooltips would spawn as separate windows instead of behaving like tooltips. (#4998)
 - Dev: Run miniaudio in a separate thread, and simplify it to not manage the device ourselves. There's a chance the simplification is a bad idea. (#4978)
 - Dev: Change clang-format from v14 to v16. (#4929)
 - Dev: Fixed UTF16 encoding of `modes` file for the installer. (#4791)
 - Dev: Temporarily disable High DPI scaling on Qt6 builds on Windows. (#4767)
 - Dev: Tests now run on Ubuntu 22.04 instead of 20.04 to loosen C++ restrictions in tests. (#4774)
 - Dev: Do a pretty major refactor of the Settings classes. List settings (e.g. highlights) are most heavily modified, and should have an extra eye kept on them. (#4775)
+- Dev: conan: Update Boost to 1.83 & OpenSSL to 3.2.0. (#5007)
 - Dev: Remove `boost::noncopyable` use & `boost_random` dependency. (#4776)
 - Dev: Fix clang-tidy `cppcoreguidelines-pro-type-member-init` warnings. (#4426)
 - Dev: Immediate layout for invisible `ChannelView`s is skipped. (#4811)

conanfile.py

@@ -5,7 +5,7 @@
 
 class Chatterino(ConanFile):
     name = "Chatterino"
-    requires = "boost/1.81.0"
+    requires = "boost/1.83.0"
     settings = "os", "compiler", "build_type", "arch"
     default_options = {
         "with_benchmark": False,
@@ -24,7 +24,7 @@ def requirements(self):
             self.requires("benchmark/1.7.1")
 
         if self.options.get_safe("with_openssl3", False):
-            self.requires("openssl/3.1.0")
+            self.requires("openssl/3.2.0")
         else:
             self.requires("openssl/1.1.1t")
 

src/widgets/BaseWindow.cpp

@@ -10,7 +10,6 @@
 #include "widgets/helper/EffectLabel.hpp"
 #include "widgets/helper/TitlebarButtons.hpp"
 #include "widgets/Label.hpp"
-#include "widgets/TooltipWidget.hpp"
 #include "widgets/Window.hpp"
 
 #include <QApplication>
@@ -468,11 +467,6 @@ EffectLabel *BaseWindow::addTitleBarLabel(std::function<void()> onClicked)
 
 void BaseWindow::changeEvent(QEvent *)
 {
-    if (this->isVisible())
-    {
-        TooltipWidget::instance()->hide();
-    }
-
 #ifdef USEWINSDK
     if (this->ui_.titlebarButtons)
     {
@@ -497,7 +491,6 @@ void BaseWindow::changeEvent(QEvent *)
 
 void BaseWindow::leaveEvent(QEvent *)
 {
-    TooltipWidget::instance()->hide();
 }
 
 void BaseWindow::moveTo(QPoint point, widgets::BoundsChecking mode)

src/widgets/TooltipWidget.cpp

@@ -12,12 +12,6 @@
 
 namespace chatterino {
 
-TooltipWidget *TooltipWidget::instance()
-{
-    static TooltipWidget *tooltipWidget = new TooltipWidget();
-    return tooltipWidget;
-}
-
 TooltipWidget::TooltipWidget(BaseWidget *parent)
     : BaseWindow({BaseWindow::TopMost, BaseWindow::DontFocus,
                   BaseWindow::DisableLayoutSave},

src/widgets/TooltipWidget.hpp

@@ -29,9 +29,7 @@ class TooltipWidget : public BaseWindow
     Q_OBJECT
 
 public:
-    static TooltipWidget *instance();
-
-    TooltipWidget(BaseWidget *parent = nullptr);
+    TooltipWidget(BaseWidget *parent);
     ~TooltipWidget() override = default;
 
     void setOne(const TooltipEntry &entry,

src/widgets/dialogs/UserInfoPopup.cpp

@@ -385,7 +385,10 @@ UserInfoPopup::UserInfoPopup(bool closeAutomatically, QWidget *parent,
         user.emplace<QCheckBox>("Block").assign(&this->ui_.block);
         user.emplace<QCheckBox>("Ignore highlights")
             .assign(&this->ui_.ignoreHighlights);
-        auto usercard = user.emplace<EffectLabel2>(this);
+        // visibility of this is updated in setData
+
+        auto usercard =
+            user.emplace<EffectLabel2>(this).assign(&this->ui_.usercardLabel);
         usercard->getLabel().setText("Usercard");
         auto mod = user.emplace<Button>(this);
         mod->setPixmap(getResources().buttons.mod);
@@ -739,6 +742,15 @@ void UserInfoPopup::setData(const QString &name,
         this->updateLatestMessages();
     }
     // If we're opening by ID, this will be called as soon as we get the information from twitch
+
+    auto type = this->channel_->getType();
+    if (type == Channel::Type::TwitchLive ||
+        type == Channel::Type::TwitchWhispers || type == Channel::Type::Irc ||
+        type == Channel::Type::Misc)
+    {
+        // not a normal twitch channel, the url opened by the button will be invalid, so hide the button
+        this->ui_.usercardLabel->hide();
+    }
 }
 
 void UserInfoPopup::updateLatestMessages()

src/widgets/dialogs/UserInfoPopup.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "widgets/DraggablePopup.hpp"
+#include "widgets/helper/EffectLabel.hpp"
 
 #include <pajlada/signals/scoped-connection.hpp>
 #include <pajlada/signals/signal.hpp>
@@ -80,6 +81,8 @@ class UserInfoPopup final : public DraggablePopup
 
         Label *noMessagesLabel = nullptr;
         ChannelView *latestMessages = nullptr;
+
+        EffectLabel2 *usercardLabel = nullptr;
     } ui_;
 
     class TimeoutWidget : public BaseWidget

src/widgets/helper/ChannelView.cpp

@@ -285,6 +285,7 @@ ChannelView::ChannelView(BaseWidget *parent, Split *split, Context context,
     , highlightAnimation_(this)
     , context_(context)
     , messages_(messagesLimit)
+    , tooltipWidget_(new TooltipWidget(this))
 {
     this->setMouseTracking(true);
 
@@ -1632,7 +1633,7 @@ void ChannelView::enterEvent(QEvent * /*event*/)
 
 void ChannelView::leaveEvent(QEvent * /*event*/)
 {
-    TooltipWidget::instance()->hide();
+    this->tooltipWidget_->hide();
 
     this->unpause(PauseReason::Mouse);
 
@@ -1653,7 +1654,6 @@ void ChannelView::mouseMoveEvent(QMouseEvent *event)
         this->pause(PauseReason::Mouse);
     }
 
-    auto *tooltipWidget = TooltipWidget::instance();
     std::shared_ptr<MessageLayout> layout;
     QPoint relativePos;
     int messageIndex;
@@ -1662,7 +1662,7 @@ void ChannelView::mouseMoveEvent(QMouseEvent *event)
     if (!tryGetMessageAt(event->pos(), layout, relativePos, messageIndex))
     {
         this->setCursor(Qt::ArrowCursor);
-        tooltipWidget->hide();
+        this->tooltipWidget_->hide();
         return;
     }
 
@@ -1700,14 +1700,14 @@ void ChannelView::mouseMoveEvent(QMouseEvent *event)
     if (layout->flags.has(MessageLayoutFlag::Collapsed))
     {
         this->setCursor(Qt::PointingHandCursor);
-        tooltipWidget->hide();
+        this->tooltipWidget_->hide();
         return;
     }
 
     if (hoverLayoutElement == nullptr)
     {
         this->setCursor(Qt::ArrowCursor);
-        tooltipWidget->hide();
+        this->tooltipWidget_->hide();
         return;
     }
 
@@ -1721,7 +1721,7 @@ void ChannelView::mouseMoveEvent(QMouseEvent *event)
     if (element->getTooltip().isEmpty() ||
         (isLinkValid && isNotEmote && !getSettings()->linkInfoTooltip))
     {
-        tooltipWidget->hide();
+        this->tooltipWidget_->hide();
     }
     else
     {
@@ -1739,7 +1739,7 @@ void ChannelView::mouseMoveEvent(QMouseEvent *event)
 
             if (emoteElement)
             {
-                tooltipWidget->setOne({
+                this->tooltipWidget_->setOne({
                     showThumbnail
                         ? emoteElement->getEmote()->images.getImage(3.0)
                         : nullptr,
@@ -1798,12 +1798,12 @@ void ChannelView::mouseMoveEvent(QMouseEvent *event)
                     auto style = layeredEmotes.size() > 2
                                      ? TooltipStyle::Grid
                                      : TooltipStyle::Vertical;
-                    tooltipWidget->set(entries, style);
+                    this->tooltipWidget_->set(entries, style);
                 }
             }
             else if (badgeElement)
             {
-                tooltipWidget->setOne({
+                this->tooltipWidget_->setOne({
                     showThumbnail
                         ? badgeElement->getEmote()->images.getImage(3.0)
                         : nullptr,
@@ -1834,7 +1834,7 @@ void ChannelView::mouseMoveEvent(QMouseEvent *event)
             if (thumbnailSize == 0)
             {
                 // "Show thumbnails" is set to "Off", show text only
-                tooltipWidget->setOne({nullptr, element->getTooltip()});
+                this->tooltipWidget_->setOne({nullptr, element->getTooltip()});
             }
             else
             {
@@ -1851,21 +1851,24 @@ void ChannelView::mouseMoveEvent(QMouseEvent *event)
                 if (element->getThumbnailType() ==
                     MessageElement::ThumbnailType::Link_Thumbnail)
                 {
-                    tooltipWidget->setOne({std::move(thumb),
-                                           element->getTooltip(), thumbnailSize,
-                                           thumbnailSize});
+                    this->tooltipWidget_->setOne({
+                        std::move(thumb),
+                        element->getTooltip(),
+                        thumbnailSize,
+                        thumbnailSize,
+                    });
                 }
                 else
                 {
-                    tooltipWidget->setOne({std::move(thumb), ""});
+                    this->tooltipWidget_->setOne({std::move(thumb), ""});
                 }
             }
         }
 
-        tooltipWidget->moveTo(event->globalPos() + QPoint(16, 16),
-                              widgets::BoundsChecking::CursorPosition);
-        tooltipWidget->setWordWrap(isLinkValid);
-        tooltipWidget->show();
+        this->tooltipWidget_->moveTo(event->globalPos() + QPoint(16, 16),
+                                     widgets::BoundsChecking::CursorPosition);
+        this->tooltipWidget_->setWordWrap(isLinkValid);
+        this->tooltipWidget_->show();
     }
 
     // check if word has a link

src/widgets/helper/ChannelView.hpp

@@ -7,6 +7,7 @@
 #include "messages/Selection.hpp"
 #include "util/ThreadGuard.hpp"
 #include "widgets/BaseWidget.hpp"
+#include "widgets/TooltipWidget.hpp"
 
 #include <pajlada/signals/signal.hpp>
 #include <QMenu>
@@ -333,6 +334,8 @@ class ChannelView final : public BaseWidget
     MessagePreferences messagePreferences_;
 
     void scrollUpdateRequested();
+
+    TooltipWidget *const tooltipWidget_{};
 };
 
 }  // namespace chatterino

src/widgets/splits/Split.cpp

@@ -39,7 +39,6 @@
 #include "widgets/splits/SplitHeader.hpp"
 #include "widgets/splits/SplitInput.hpp"
 #include "widgets/splits/SplitOverlay.hpp"
-#include "widgets/TooltipWidget.hpp"
 #include "widgets/Window.hpp"
 
 #include <QApplication>
@@ -993,8 +992,6 @@ void Split::leaveEvent(QEvent *event)
 
     this->overlay_->hide();
 
-    TooltipWidget::instance()->hide();
-
     this->handleModifiers(QGuiApplication::queryKeyboardModifiers());
 }
 

src/widgets/splits/SplitHeader.cpp

@@ -223,6 +223,7 @@ namespace chatterino {
 SplitHeader::SplitHeader(Split *split)
     : BaseWidget(split)
     , split_(split)
+    , tooltipWidget_(new TooltipWidget(this))
 {
     this->initializeLayout();
 
@@ -948,23 +949,24 @@ void SplitHeader::enterEvent(QEvent *event)
     {
         auto *channel = this->split_->getChannel().get();
 
-        auto *tooltip = TooltipWidget::instance();
-        tooltip->setOne({nullptr, this->tooltipText_});
-        tooltip->setWordWrap(true);
-        tooltip->adjustSize();
-        auto pos = this->mapToGlobal(this->rect().bottomLeft()) +
-                   QPoint((this->width() - tooltip->width()) / 2, 1);
+        this->tooltipWidget_->setOne({nullptr, this->tooltipText_});
+        this->tooltipWidget_->setWordWrap(true);
+        this->tooltipWidget_->adjustSize();
+        auto pos =
+            this->mapToGlobal(this->rect().bottomLeft()) +
+            QPoint((this->width() - this->tooltipWidget_->width()) / 2, 1);
 
-        tooltip->moveTo(pos, widgets::BoundsChecking::CursorPosition);
-        tooltip->show();
+        this->tooltipWidget_->moveTo(pos,
+                                     widgets::BoundsChecking::CursorPosition);
+        this->tooltipWidget_->show();
     }
 
     BaseWidget::enterEvent(event);
 }
 
 void SplitHeader::leaveEvent(QEvent *event)
 {
-    TooltipWidget::instance()->hide();
+    this->tooltipWidget_->hide();
 
     BaseWidget::leaveEvent(event);
 }

src/widgets/splits/SplitHeader.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "widgets/BaseWidget.hpp"
+#include "widgets/TooltipWidget.hpp"
 
 #include <boost/signals2.hpp>
 #include <pajlada/settings/setting.hpp>
@@ -68,6 +69,7 @@ class SplitHeader final : public BaseWidget
 
     Split *const split_{};
     QString tooltipText_{};
+    TooltipWidget *const tooltipWidget_{};
     bool isLive_{false};
     QString thumbnail_;
     QElapsedTimer lastThumbnail_;