noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-21 22:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix: show correct scale factor of images (#5201)

Browse source
This commit is contained in:
nerix 2024-02-26 18:13:21 +01:00 committed by GitHub
parent 0f42df78be
commit 4315c43eac
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -39,6 +39,7 @@
- Minor: Updated to Emoji v15.1. Google emojis are now used as the fallback instead of Twitter emojis. (#5182) - Minor: Updated to Emoji v15.1. Google emojis are now used as the fallback instead of Twitter emojis. (#5182)
- Minor: Allow theming of tab live and rerun indicators. (#5188) - Minor: Allow theming of tab live and rerun indicators. (#5188)
- Minor: Added a fallback theme field to custom themes that will be used in case the custom theme does not contain a color Chatterino needs. If no fallback theme is specified, we'll pull the color from the included Dark or Light theme. (#5198) - Minor: Added a fallback theme field to custom themes that will be used in case the custom theme does not contain a color Chatterino needs. If no fallback theme is specified, we'll pull the color from the included Dark or Light theme. (#5198)
- Minor: Image links now reflect the scale of their image instead of an internal label. (#5201)
- Bugfix: Fixed an issue where certain emojis did not send to Twitch chat correctly. (#4840) - Bugfix: Fixed an issue where certain emojis did not send to Twitch chat correctly. (#4840)
- Bugfix: Fixed capitalized channel names in log inclusion list not being logged. (#4848) - Bugfix: Fixed capitalized channel names in log inclusion list not being logged. (#4848)
- Bugfix: Trimmed custom streamlink paths on all platforms making sure you don't accidentally add spaces at the beginning or end of its path. (#4834) - Bugfix: Trimmed custom streamlink paths on all platforms making sure you don't accidentally add spaces at the beginning or end of its path. (#4834)

25
src/widgets/helper/ChannelView.cpp
View file

@ -87,24 +87,31 @@ void addEmoteContextMenuItems(QMenu *menu, const Emote &emote,
auto *copyMenu = new QMenu(menu); auto *copyMenu = new QMenu(menu);
copyAction->setMenu(copyMenu); copyAction->setMenu(copyMenu);
// Add copy and open links for 1x, 2x, 3x // Scale of the smallest image
auto addImageLink = [&](const ImagePtr &image, char scale) { std::optional<qreal> baseScale;
// Add copy and open links for images
auto addImageLink = [&](const ImagePtr &image) {
if (!image->isEmpty()) if (!image->isEmpty())
{ {
copyMenu->addAction("&" + QString(scale) + "x link", if (!baseScale)
[url = image->url()] { {
baseScale = image->scale();
}
auto factor =
QString::number(static_cast<int>(*baseScale / image->scale()));
copyMenu->addAction("&" + factor + "x link", [url = image->url()] {
crossPlatformCopy(url.string); crossPlatformCopy(url.string);
}); });
openMenu->addAction("&" + QString(scale) + "x link", openMenu->addAction("&" + factor + "x link", [url = image->url()] {
[url = image->url()] {
QDesktopServices::openUrl(QUrl(url.string)); QDesktopServices::openUrl(QUrl(url.string));
}); });
} }
}; };
addImageLink(emote.images.getImage1(), '1'); addImageLink(emote.images.getImage1());
addImageLink(emote.images.getImage2(), '2'); addImageLink(emote.images.getImage2());
addImageLink(emote.images.getImage3(), '3'); addImageLink(emote.images.getImage3());
// Copy and open emote page link // Copy and open emote page link
auto addPageLink = [&](const QString &name) { auto addPageLink = [&](const QString &name) {