mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-09-04 16:45:12 +00:00
Code Issues Releases Wiki Activity

Hide emoji outline instead of disabling it

Browse Source
This commit is contained in:
RadRussianRus
2019-10-03 22:21:59 +03:00
parent 3dfd65ceda
commit ea49d10be2
3 changed files with 46 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
Telegram/SourceFiles/chat_helpers/stickers_emoji_pack.cpp
View File

@@ -323,13 +323,14 @@ EmojiImageLoader::EmojiImageLoader(
QImage EmojiImageLoader::prepare(EmojiPtr emoji) { QImage EmojiImageLoader::prepare(EmojiPtr emoji) {
const auto loaded = _images->ensureLoaded(); const auto loaded = _images->ensureLoaded();
const auto factor = cIntRetinaFactor(); const auto factor = cIntRetinaFactor();
const auto side = st::largeEmojiSize; const auto side = st::largeEmojiSize + 2 * st::largeEmojiOutline;
auto result = QImage( auto tinted = QImage(
QSize(side, side) * factor, QSize(st::largeEmojiSize, st::largeEmojiSize) * factor,
QImage::Format_ARGB32_Premultiplied); QImage::Format_ARGB32_Premultiplied);
result.fill(Qt::transparent); tinted.fill(QColor(0, 0, 0, 0));
if (loaded) { if (loaded) {
QPainter p(&result); QPainter p(&tinted);
p.setCompositionMode(QPainter::CompositionMode_DestinationIn);
_images->draw( _images->draw(
p, p,
emoji, emoji,
@@ -337,6 +338,43 @@ QImage EmojiImageLoader::prepare(EmojiPtr emoji) {
0, 0,
0); 0);
} }
auto result = QImage(
QSize(side, side) * factor,
QImage::Format_ARGB32_Premultiplied);
result.fill(Qt::transparent);
if (loaded) {
QPainter p(&result);
const auto delta = st::largeEmojiOutline * factor;
const auto planar = std::array<QPoint, 4>{ {
{ 0, -1 },
{ -1, 0 },
{ 1, 0 },
{ 0, 1 },
} };
for (const auto &shift : planar) {
for (auto i = 0; i != delta; ++i) {
p.drawImage(QPoint(delta, delta) + shift * (i + 1), tinted);
}
}
const auto diagonal = std::array<QPoint, 4>{ {
{ -1, -1 },
{ 1, -1 },
{ -1, 1 },
{ 1, 1 },
} };
const auto corrected = int(std::round(delta / sqrt(2.)));
for (const auto &shift : diagonal) {
for (auto i = 0; i != corrected; ++i) {
p.drawImage(QPoint(delta, delta) + shift * (i + 1), tinted);
}
}
_images->draw(
p,
emoji,
st::largeEmojiSize * factor,
delta,
delta);
}
return result; return result;
} }

4
Telegram/SourceFiles/history/view/media/history_view_large_emoji.cpp
View File

@@ -55,7 +55,7 @@ QSize LargeEmoji::size() {
Assert(count > 0); Assert(count > 0);
const auto single = _images[0]->size() / cIntRetinaFactor(); const auto single = _images[0]->size() / cIntRetinaFactor();
const auto skip = st::largeEmojiSkip; const auto skip = st::largeEmojiSkip - 2 * st::largeEmojiOutline;
const auto inner = count * single.width() + (count - 1) * skip; const auto inner = count * single.width() + (count - 1) * skip;
const auto &padding = st::largeEmojiPadding; const auto &padding = st::largeEmojiPadding;
_size = QSize( _size = QSize(
@@ -70,7 +70,7 @@ void LargeEmoji::draw(Painter &p, const QRect &r, bool selected) {
auto x = r.x() + (r.width() - _size.width()) / 2 + padding.left(); auto x = r.x() + (r.width() - _size.width()) / 2 + padding.left();
const auto y = r.y() + (r.height() - _size.height()) / 2 + padding.top(); const auto y = r.y() + (r.height() - _size.height()) / 2 + padding.top();
const auto o = Data::FileOrigin(); const auto o = Data::FileOrigin();
const auto skip = st::largeEmojiSkip; const auto skip = st::largeEmojiSkip - 2 * st::largeEmojiOutline;
for (const auto &image : images) { for (const auto &image : images) {
image->load(Data::FileOrigin()); image->load(Data::FileOrigin());
const auto w = image->width() / cIntRetinaFactor(); const auto w = image->width() / cIntRetinaFactor();

2
Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.cpp
View File

@@ -34,7 +34,7 @@ QSize UnwrappedMedia::countOptimalSize() {
_content->size(), _content->size(),
{ st::maxStickerSize, st::historyStickerHeight })); { st::maxStickerSize, st::historyStickerHeight }));
auto maxWidth = _contentSize.width(); auto maxWidth = _contentSize.width();
const auto minimal = st::largeEmojiSize; const auto minimal = st::largeEmojiSize + 2 * st::largeEmojiOutline;
auto minHeight = std::max(_contentSize.height(), minimal); auto minHeight = std::max(_contentSize.height(), minimal);
if (_parent->media() == this) { if (_parent->media() == this) {
const auto item = _parent->data(); const auto item = _parent->data();