kotatogram/kotatogram-desktop
kotatogram/kotatogram-desktop
1
0
Fork 0
Code Issues Releases 45 Packages Wiki Activity

Fix wrong userpic rounding in group/channel creation

Browse source
This commit is contained in:
Eric Kotato 2020-07-03 07:15:36 +03:00
parent bd75ed3021
commit 6bc634408d
1 changed files with 37 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
Telegram/SourceFiles/ui/special_buttons.cpp
View file

@ -807,9 +807,21 @@ QPoint UserpicButton::countPhotoPosition() const {
} }
QImage UserpicButton::prepareRippleMask() const { QImage UserpicButton::prepareRippleMask() const {
return Ui::RippleAnimation::ellipseMask(QSize( const auto size = QSize(_st.photoSize, _st.photoSize);
_st.photoSize,
_st.photoSize)); switch (cUserpicCornersType()) {
case 0:
return Ui::RippleAnimation::rectMask(size);
case 1:
return Ui::RippleAnimation::roundRectMask(size, st::buttonRadius);
case 2:
return Ui::RippleAnimation::roundRectMask(size, st::dateRadius);
default:
return Ui::RippleAnimation::ellipseMask(size);
}
} }
QPoint UserpicButton::prepareRippleStartPosition() const { QPoint UserpicButton::prepareRippleStartPosition() const {
@ -994,7 +1006,28 @@ void UserpicButton::prepareUserpicPixmap() {
PainterHighQualityEnabler hq(p); PainterHighQualityEnabler hq(p);
p.setBrush(color); p.setBrush(color);
p.setPen(Qt::NoPen); p.setPen(Qt::NoPen);
switch (cUserpicCornersType()) {
case 0:
p.drawRoundedRect(
QRect{ 0, 0, size, size },
0, 0);
break;
case 1:
p.drawRoundedRect(
QRect{ 0, 0, size, size },
st::buttonRadius, st::buttonRadius);
break;
case 2:
p.drawRoundedRect(
QRect{ 0, 0, size, size },
st::dateRadius, st::dateRadius);
break;
default:
p.drawEllipse(0, 0, size, size); p.drawEllipse(0, 0, size, size);
}
}; };
_userpicHasImage = _peer _userpicHasImage = _peer
? (_peer->currentUserpic(_userpicView) || _role != Role::ChangePhoto) ? (_peer->currentUserpic(_userpicView) || _role != Role::ChangePhoto)