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.

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

fix: double ellipsis in reply #5174

Merged
merged 4 commits into from
Feb 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
- Bugfix: Fixed empty page being added when showing out of bounds dialog. (#4849)
- Bugfix: Fixed an issue preventing searching a redemption by it's title when the redemption contained text input. (#5117)
- Bugfix: Fixed issue on Windows preventing the title bar from being dragged in the top left corner. (#4873)
- Bugfix: Fixed an issue where reply context didn't render correctly if an emoji was touching text. (#4875, #4977)
- Bugfix: Fixed an issue where reply context didn't render correctly if an emoji was touching text. (#4875, #4977, #5174)
- Bugfix: Fixed the input completion popup from disappearing when clicking on it on Windows and macOS. (#4876)
- Bugfix: Fixed double-click text selection moving its position with each new message. (#4898)
- Bugfix: Fixed an issue where notifications on Windows would contain no or an old avatar. (#4899)
Expand Down
10 changes: 9 additions & 1 deletion src/messages/MessageElement.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,7 @@ void SingleLineTextElement::addToContainer(MessageLayoutContainer &container,
return e;
};

static const auto ellipsis = QStringLiteral("...");
static const auto ellipsis = QStringLiteral("");

// String to continuously append words onto until we place it in the container
// once we encounter an emote or reach the end of the message text. */
Expand All @@ -628,6 +628,7 @@ void SingleLineTextElement::addToContainer(MessageLayoutContainer &container,
currentText += ' ';
}

bool done = false;
for (const auto &parsedWord :
app->getEmotes()->getEmojis()->parse(word.text))
{
Expand All @@ -641,6 +642,7 @@ void SingleLineTextElement::addToContainer(MessageLayoutContainer &container,
container.remainingWidth());
if (currentText != prev)
{
done = true;
break;
}
}
Expand All @@ -663,6 +665,7 @@ void SingleLineTextElement::addToContainer(MessageLayoutContainer &container,
emoteSize.width()))
{
currentText += ellipsis;
done = true;
break;
}

Expand All @@ -678,6 +681,11 @@ void SingleLineTextElement::addToContainer(MessageLayoutContainer &container,
}
}
}

if (done)
{
break;
}
}

// Add the last of the pending message text to the container.
Expand Down
Loading