From 5ae35660a5ca0361f3853d78dce9b102f58efb47 Mon Sep 17 00:00:00 2001 From: Rasmus Karlsson Date: Sat, 15 Aug 2026 14:57:34 +0200 Subject: [PATCH] progress: remove MessageFlag::HighlightedWhisper --- src/messages/Message.cpp | 3 +-- src/messages/MessageFlag.hpp | 2 +- src/messages/layouts/MessageLayout.cpp | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/messages/Message.cpp b/src/messages/Message.cpp index 883753e56..8f9f78773 100644 --- a/src/messages/Message.cpp +++ b/src/messages/Message.cpp @@ -35,8 +35,7 @@ Message::~Message() ScrollbarHighlight Message::getScrollBarHighlight() const { - if (this->flags.has(MessageFlag::Highlighted) || - this->flags.has(MessageFlag::HighlightedWhisper)) + if (this->flags.has(MessageFlag::Highlighted)) { return { this->highlightColor, diff --git a/src/messages/MessageFlag.hpp b/src/messages/MessageFlag.hpp index 8987839a1..1d835f112 100644 --- a/src/messages/MessageFlag.hpp +++ b/src/messages/MessageFlag.hpp @@ -30,7 +30,7 @@ enum class MessageFlag : std::int64_t { AutoMod = (1LL << 14), RecentMessage = (1LL << 15), Whisper = (1LL << 16), - HighlightedWhisper = (1LL << 17), + // Debug = (1LL << 18), Similar = (1LL << 19), RedeemedHighlight = (1LL << 20), diff --git a/src/messages/layouts/MessageLayout.cpp b/src/messages/layouts/MessageLayout.cpp index df9f86449..8ce4c6774 100644 --- a/src/messages/layouts/MessageLayout.cpp +++ b/src/messages/layouts/MessageLayout.cpp @@ -371,8 +371,7 @@ void MessageLayout::updateBuffer(QPixmap *buffer, return ctx.messageColors.regularBg; }(); - if ((this->message_->flags.has(MessageFlag::Highlighted) || - this->message_->flags.has(MessageFlag::HighlightedWhisper)) && + if (this->message_->flags.has(MessageFlag::Highlighted) && !this->flags.has(MessageLayoutFlag::IgnoreHighlights)) { // NOTE: As we move more things into Highlighted, and less things to use custom flags for their color,