Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 4 commits into from
Jan 15, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6c4596b
Change the highlight order to prioritize Message highlights over User…
pajlada Jan 14, 2023
0753958
Add changelog entry
pajlada Jan 14, 2023
7047110
Update UI to match new highlight order
pajlada Jan 14, 2023
a561682
Merge branch 'master' into fix/change-highlight-priority-order
Felanbird Jan 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## 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: Search window input will automatically use currently selected text if present. (#4178)
- Minor: Cleared up highlight sound settings (#4194)
Expand Down
6 changes: 3 additions & 3 deletions src/controllers/highlights/HighlightController.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,16 +445,16 @@ void HighlightController::rebuildChecks(Settings &settings)
checks->clear();

// CURRENT ORDER:
// Subscription -> Whisper -> User -> Message -> Reply Threads -> Badge
// Subscription -> Whisper -> Message -> User -> Reply Threads -> Badge

rebuildSubscriptionHighlights(settings, *checks);

rebuildWhisperHighlights(settings, *checks);

rebuildUserHighlights(settings, *checks);

rebuildMessageHighlights(settings, *checks);

rebuildUserHighlights(settings, *checks);

rebuildReplyThreadHighlight(settings, *checks);

rebuildBadgeHighlights(settings, *checks);
Expand Down
8 changes: 4 additions & 4 deletions src/widgets/settingspages/HighlightingPage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ HighlightingPage::HighlightingPage()
highlights.emplace<QLabel>(
"Play notification sounds and highlight messages based on "
"certain patterns.\n"
"Message highlights are prioritized over badge highlights, "
"but under user highlights");
"Message highlights are prioritized over badge highlights "
"and user highlights.");

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