diff --git a/src/singletons/Theme.cpp b/src/singletons/Theme.cpp index 9d91bab11..39272c4be 100644 --- a/src/singletons/Theme.cpp +++ b/src/singletons/Theme.cpp @@ -212,7 +212,8 @@ void Theme::actuallyUpdate(double hue, double multiplier) this->messages.backgrounds.highlighted = blendColors(themeColor, this->messages.backgrounds.regular, 0.8); } else { - this->messages.backgrounds.highlighted = QColor(getSettings()->highlightColor); + this->messages.backgrounds.highlighted = + QColor(getSettings()->highlightColor); } this->messages.backgrounds.subscription = diff --git a/src/singletons/WindowManager.hpp b/src/singletons/WindowManager.hpp index db2f71ae2..9ca3dc879 100644 --- a/src/singletons/WindowManager.hpp +++ b/src/singletons/WindowManager.hpp @@ -32,9 +32,17 @@ public: static const int uiScaleMax; void showSettingsDialog(); + + // Show the account selector widget at point void showAccountSelectPopup(QPoint point); + // Tell a channel (or all channels if channel is nullptr) to redo their + // layout void layoutChannelViews(Channel *channel = nullptr); + + // Force all channel views to redo their layout + // This is called, for example, when the emote scale or timestamp format has + // changed void forceLayoutChannelViews(); void repaintVisibleChatWidgets(Channel *channel = nullptr); void repaintGifEmotes(); @@ -57,10 +65,16 @@ public: void updateWordTypeMask(); pajlada::Signals::NoArgSignal repaintGifs; + + // This signal fires whenever views rendering a channel, or all views if the + // channel is a nullptr, need to redo their layout pajlada::Signals::Signal layout; pajlada::Signals::NoArgSignal wordFlagsChanged; + // Sends an alert to the main window + // It reads the `longAlert` setting to decide whether the alert will expire + // or not void sendAlert(); private: diff --git a/src/widgets/Window.cpp b/src/widgets/Window.cpp index e2300b421..22a326ebf 100644 --- a/src/widgets/Window.cpp +++ b/src/widgets/Window.cpp @@ -314,7 +314,9 @@ void Window::onAccountSelected() auto user = getApp()->accounts->twitch.getCurrent(); #ifdef CHATTERINO_NIGHTLY_VERSION_STRING - auto windowTitleEnd = QString(" - Chatterino Nightly " CHATTERINO_VERSION " (" UGLYMACROHACK(CHATTERINO_NIGHTLY_VERSION_STRING) ")"); + auto windowTitleEnd = + QString(" - Chatterino Nightly " CHATTERINO_VERSION + " (" UGLYMACROHACK(CHATTERINO_NIGHTLY_VERSION_STRING) ")"); #else auto windowTitleEnd = QString(" - Chatterino Beta " CHATTERINO_VERSION); #endif diff --git a/src/widgets/helper/ChannelView.cpp b/src/widgets/helper/ChannelView.cpp index a5bffcbf2..8c2c60217 100644 --- a/src/widgets/helper/ChannelView.cpp +++ b/src/widgets/helper/ChannelView.cpp @@ -1346,8 +1346,7 @@ void ChannelView::showUserInfoPopup(const QString &userName) auto *userPopup = new UserInfoPopup; userPopup->setData(userName, this->channel_); userPopup->setActionOnFocusLoss(BaseWindow::Delete); - QPoint offset(int(150 * this->getScale()), - int(70 * this->getScale())); + QPoint offset(int(150 * this->getScale()), int(70 * this->getScale())); userPopup->move(QCursor::pos() - offset); userPopup->show(); }