mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 14:38:15 +00:00
Code Issues Releases Wiki Activity

Rounded square userpics for forums.

Browse Source
This commit is contained in:
John Preston
2022-10-12 17:42:35 +04:00
parent 8561893e2e
commit 24843e3acd
4 changed files with 71 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Telegram/SourceFiles/data/data_peer.cpp
View File

@@ -307,11 +307,13 @@ void PeerData::paintUserpic(
int y,
int size) const {
if (const auto userpic = currentUserpic(view)) {
const auto circled = Images::Option::RoundCircle;
const auto rounding = isForum()
? Images::Option::RoundLarge
: Images::Option::RoundCircle;
p.drawPixmap(
x,
y,
userpic->pix(size, size, { .options = circled }));
userpic->pix(size, size, { .options = rounding }));
} else {
ensureEmptyUserpic()->paint(p, x, y, x + size + x, size);
}
@@ -371,8 +373,10 @@ QPixmap PeerData::genUserpic(
std::shared_ptr<Data::CloudImageView> &view,
int size) const {
if (const auto userpic = currentUserpic(view)) {
const auto circle = Images::Option::RoundCircle;
return userpic->pix(size, size, { .options = circle });
const auto rounding = isForum()
? Images::Option::RoundLarge
: Images::Option::RoundCircle;
return userpic->pix(size, size, { .options = rounding });
}
const auto ratio = style::DevicePixelRatio();
auto result = QImage(
@@ -390,7 +394,10 @@ QPixmap PeerData::genUserpic(
QImage PeerData::generateUserpicImage(
std::shared_ptr<Data::CloudImageView> &view,
int size) const {
return generateUserpicImage(view, size, ImageRoundRadius::Ellipse);
return generateUserpicImage(
view,
size,
isForum() ? ImageRoundRadius::Large : ImageRoundRadius::Ellipse);
}
QImage PeerData::generateUserpicImage(
@@ -400,9 +407,11 @@ QImage PeerData::generateUserpicImage(
if (const auto userpic = currentUserpic(view)) {
const auto options = (radius == ImageRoundRadius::Ellipse)
? Images::Option::RoundCircle
: (radius == ImageRoundRadius::None)
? Images::Option()
: Images::Option::RoundSmall;
: (radius == ImageRoundRadius::Large)
? Images::Option::RoundLarge
: (radius == ImageRoundRadius::Small)
? Images::Option::RoundSmall
: Images::Option();
return userpic->pixNoCache(
{ size, size },
{ .options = options }).toImage();