From 2a9c15b2de7b0e7defd7a0d8404e974c35902cdc Mon Sep 17 00:00:00 2001 From: kornes <28986062+kornes@users.noreply.github.com> Date: Sat, 12 Nov 2022 12:44:03 +0000 Subject: [PATCH] Fix triple click selection on message containing reply (#4131) closes https://github.com/Chatterino/chatterino2/issues/4128 --- CHANGELOG.md | 2 +- src/messages/layouts/MessageLayoutContainer.cpp | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f7b4f66..33366de6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## Unversioned -- Major: Added support for Twitch's Chat Replies. [Wiki Page](https://wiki.chatterino.com/Features/#message-replies) (#3722, #3989, #4041, #4047, #4055, #4067, #4077, #3905) +- Major: Added support for Twitch's Chat Replies. [Wiki Page](https://wiki.chatterino.com/Features/#message-replies) (#3722, #3989, #4041, #4047, #4055, #4067, #4077, #3905, #4131) - Major: Added multi-channel searching to search dialog via keyboard shortcut. (Ctrl+Shift+F by default) (#3694, #3875) - Major: Added support for emotes and badges from [7TV](https://7tv.app). [Wiki Page](https://wiki.chatterino.com/Third_party_services/#7tv) (#4002, #4062) - Major: Added support for Right-to-Left Languages (#3958, #4139) diff --git a/src/messages/layouts/MessageLayoutContainer.cpp b/src/messages/layouts/MessageLayoutContainer.cpp index 02688edd..4de1d8fe 100644 --- a/src/messages/layouts/MessageLayoutContainer.cpp +++ b/src/messages/layouts/MessageLayoutContainer.cpp @@ -776,17 +776,17 @@ int MessageLayoutContainer::getLastCharacterIndex() const int MessageLayoutContainer::getFirstMessageCharacterIndex() const { - static FlagsEnum flags; - flags.set(MessageElementFlag::Username); - flags.set(MessageElementFlag::Timestamp); - flags.set(MessageElementFlag::Badges); + static FlagsEnum skippedFlags; + skippedFlags.set(MessageElementFlag::RepliedMessage); + skippedFlags.set(MessageElementFlag::Timestamp); + skippedFlags.set(MessageElementFlag::Badges); + skippedFlags.set(MessageElementFlag::Username); // Get the index of the first character of the real message - // (no badges/timestamps/username) int index = 0; for (auto &element : this->elements_) { - if (element->getFlags().hasAny(flags)) + if (element->getFlags().hasAny(skippedFlags)) { index += element->getSelectionIndexCount(); }