mirror of
https://github.com/Chatterino/chatterino2.git
synced 2024-11-21 22:24:07 +01:00
fix: Show Emoji Completion in IRC Channels (#4021)
This commit is contained in:
parent
d9e17e69cf
commit
9554b83c1a
3 changed files with 4 additions and 4 deletions
|
@ -63,6 +63,7 @@
|
|||
- Bugfix: Fixed an issue where Anonymous gift messages appeared larger than normal gift messages. (#3888)
|
||||
- Bugfix: Fixed crash related to logging IRC channels (#3918)
|
||||
- Bugfix: Mentions of "You" in timeouts will link to your own user now instead of the user "You". (#3922)
|
||||
- Bugfix: Fixed emoji popup not being shown in IRC channels (#4021)
|
||||
- Dev: Removed official support for QMake. (#3839, #3883)
|
||||
- Dev: Rewrote LimitedQueue (#3798)
|
||||
- Dev: Overhauled highlight system by moving all checks into a Controller allowing for easier tests. (#3399, #3801, #3835)
|
||||
|
|
|
@ -110,10 +110,10 @@ void InputCompletionPopup::updateEmotes(const QString &text, ChannelPtr channel)
|
|||
addEmotes(emotes, *bttvG, text, "Global BetterTTV");
|
||||
if (auto ffzG = getApp()->twitch->getFfzEmotes().emotes())
|
||||
addEmotes(emotes, *ffzG, text, "Global FrankerFaceZ");
|
||||
|
||||
addEmojis(emotes, getApp()->emotes->emojis.emojis, text);
|
||||
}
|
||||
|
||||
addEmojis(emotes, getApp()->emotes->emojis.emojis, text);
|
||||
|
||||
// if there is an exact match, put that emote first
|
||||
for (size_t i = 1; i < emotes.size(); i++)
|
||||
{
|
||||
|
|
|
@ -661,8 +661,7 @@ void SplitInput::updateCompletionPopup()
|
|||
{
|
||||
auto channel = this->split_->getChannel().get();
|
||||
auto tc = dynamic_cast<TwitchChannel *>(channel);
|
||||
bool showEmoteCompletion =
|
||||
channel->isTwitchChannel() && getSettings()->emoteCompletionWithColon;
|
||||
bool showEmoteCompletion = getSettings()->emoteCompletionWithColon;
|
||||
bool showUsernameCompletion =
|
||||
tc && getSettings()->showUsernameCompletionMenu;
|
||||
if (!showEmoteCompletion && !showUsernameCompletion)
|
||||
|
|
Loading…
Reference in a new issue