noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change the highlight order to prioritize Message highlights over User highlights (#4303)

Browse source
This commit is contained in:
pajlada 2023-01-15 14:21:42 +01:00 committed by GitHub
parent 4c782ce90c
commit f933d9cdf2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -2,6 +2,7 @@
## Unversioned ## Unversioned
- Minor: Change the highlight order to prioritize Message highlights over User highlights. (#4303)
- Minor: Added ability to negate search options by prefixing it with an exclamation mark (e.g. `!badge:mod` to search for messages where the author does not have the moderator badge). (#4207) - Minor: Added ability to negate search options by prefixing it with an exclamation mark (e.g. `!badge:mod` to search for messages where the author does not have the moderator badge). (#4207)
- Minor: Search window input will automatically use currently selected text if present. (#4178) - Minor: Search window input will automatically use currently selected text if present. (#4178)
- Minor: Cleared up highlight sound settings (#4194) - Minor: Cleared up highlight sound settings (#4194)

6
src/controllers/highlights/HighlightController.cpp
View file

@ -445,16 +445,16 @@ void HighlightController::rebuildChecks(Settings &settings)
checks->clear(); checks->clear();
// CURRENT ORDER: // CURRENT ORDER:
// Subscription -> Whisper -> User -> Message -> Reply Threads -> Badge // Subscription -> Whisper -> Message -> User -> Reply Threads -> Badge
rebuildSubscriptionHighlights(settings, *checks); rebuildSubscriptionHighlights(settings, *checks);
rebuildWhisperHighlights(settings, *checks); rebuildWhisperHighlights(settings, *checks);
rebuildUserHighlights(settings, *checks);
rebuildMessageHighlights(settings, *checks); rebuildMessageHighlights(settings, *checks);
rebuildUserHighlights(settings, *checks);
rebuildReplyThreadHighlight(settings, *checks); rebuildReplyThreadHighlight(settings, *checks);
rebuildBadgeHighlights(settings, *checks); rebuildBadgeHighlights(settings, *checks);

8
src/widgets/settingspages/HighlightingPage.cpp
View file

@ -63,8 +63,8 @@ HighlightingPage::HighlightingPage()
highlights.emplace<QLabel>( highlights.emplace<QLabel>(
"Play notification sounds and highlight messages based on " "Play notification sounds and highlight messages based on "
"certain patterns.\n" "certain patterns.\n"
"Message highlights are prioritized over badge highlights, " "Message highlights are prioritized over badge highlights "
"but under user highlights"); "and user highlights.");
auto view = auto view =
highlights highlights
@ -109,8 +109,8 @@ HighlightingPage::HighlightingPage()
pingUsers.emplace<QLabel>( pingUsers.emplace<QLabel>(
"Play notification sounds and highlight messages from " "Play notification sounds and highlight messages from "
"certain users.\n" "certain users.\n"
"User highlights are prioritized over message and badge " "User highlights are prioritized badge highlights, but "
"highlights."); "under message highlights.");
EditableModelView *view = EditableModelView *view =
pingUsers pingUsers
.emplace<EditableModelView>( .emplace<EditableModelView>(