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

Implement missing cheer emote tooltip (#2503)

Browse source
This commit is contained in:
James Upjohn 2021-03-13 13:16:32 +00:00 committed by GitHub
parent a8c7e4a826
commit d94d9e74dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -78,6 +78,7 @@
- Bugfix: Fix anonymous users being pinged by "username" justinfan64537 (#2156, #2352) - Bugfix: Fix anonymous users being pinged by "username" justinfan64537 (#2156, #2352)
- Bugfix: Fixed hidden tooltips when always on top is active (#2384) - Bugfix: Fixed hidden tooltips when always on top is active (#2384)
- Bugfix: Fix CLI arguments (`--help`, `--version`, `--channels`) not being respected (#2368, #2190) - Bugfix: Fix CLI arguments (`--help`, `--version`, `--channels`) not being respected (#2368, #2190)
- Bugfix: Fix Twitch cheer emotes not displaying tooltips when hovered (#2434)
- Dev: Updated minimum required Qt framework version to 5.12. (#2210) - Dev: Updated minimum required Qt framework version to 5.12. (#2210)
- Dev: Migrated `Kraken::getUser` to Helix (#2260) - Dev: Migrated `Kraken::getUser` to Helix (#2260)
- Dev: Migrated `TwitchAccount::(un)followUser` from Kraken to Helix and moved it to `Helix::(un)followUser`. (#2306) - Dev: Migrated `TwitchAccount::(un)followUser` from Kraken to Helix and moved it to `Helix::(un)followUser`. (#2306)

7
src/providers/twitch/TwitchChannel.cpp
View file

@ -909,6 +909,9 @@ void TwitchChannel::refreshCheerEmotes()
// We will continue to do so for now since we haven't had to // We will continue to do so for now since we haven't had to
// solve that anywhere else // solve that anywhere else
// Combine the prefix (e.g. BibleThump) with the tier (1, 100 etc.)
auto emoteTooltip =
set.prefix + tier.id + "<br>Twitch Cheer Emote";
cheerEmote.animatedEmote = std::make_shared<Emote>( cheerEmote.animatedEmote = std::make_shared<Emote>(
Emote{EmoteName{"cheer emote"}, Emote{EmoteName{"cheer emote"},
ImageSet{ ImageSet{
@ -916,7 +919,7 @@ void TwitchChannel::refreshCheerEmotes()
tier.images["dark"]["animated"]["2"], tier.images["dark"]["animated"]["2"],
tier.images["dark"]["animated"]["4"], tier.images["dark"]["animated"]["4"],
}, },
Tooltip{}, Url{}}); Tooltip{emoteTooltip}, Url{}});
cheerEmote.staticEmote = std::make_shared<Emote>( cheerEmote.staticEmote = std::make_shared<Emote>(
Emote{EmoteName{"cheer emote"}, Emote{EmoteName{"cheer emote"},
ImageSet{ ImageSet{
@ -924,7 +927,7 @@ void TwitchChannel::refreshCheerEmotes()
tier.images["dark"]["static"]["2"], tier.images["dark"]["static"]["2"],
tier.images["dark"]["static"]["4"], tier.images["dark"]["static"]["4"],
}, },
Tooltip{}, Url{}}); Tooltip{emoteTooltip}, Url{}});
cheerEmoteSet.cheerEmotes.emplace_back(cheerEmote); cheerEmoteSet.cheerEmotes.emplace_back(cheerEmote);
} }