procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed profile photo edit for channels, 0.8.58.dev version

This commit is contained in:
John Preston 2015-09-22 13:35:54 +03:00
parent 7a74c5a311
commit d54f299327
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Telegram/SourceFiles/profilewidget.cpp
View File

@ -645,7 +645,7 @@ void ProfileInner::paintEvent(QPaintEvent *e) {
// profile // profile
top += st::profilePadding.top(); top += st::profilePadding.top();
if (_photoLink || !_peerChat || _peerChat->isForbidden) { if (_photoLink || _peerUser || (_peerChat && _peerChat->isForbidden) || (_peerChannel && !_amCreator)) {
p.drawPixmap(_left, top, _peer->photo->pix(st::profilePhotoSize)); p.drawPixmap(_left, top, _peer->photo->pix(st::profilePhotoSize));
} else { } else {
if (a_photo.current() < 1) { if (a_photo.current() < 1) {
@ -843,12 +843,12 @@ void ProfileInner::mouseMoveEvent(QMouseEvent *e) {
bool photoOver = QRect(_left, st::profilePadding.top(), st::setPhotoSize, st::setPhotoSize).contains(e->pos()); bool photoOver = QRect(_left, st::profilePadding.top(), st::setPhotoSize, st::setPhotoSize).contains(e->pos());
if (photoOver != _photoOver) { if (photoOver != _photoOver) {
_photoOver = photoOver; _photoOver = photoOver;
if (!_photoLink && _peerChat && !_peerChat->isForbidden) { if (!_photoLink && ((_peerChat && !_peerChat->isForbidden) || (_peerChannel && _amCreator))) {
a_photo.start(_photoOver ? 1 : 0); a_photo.start(_photoOver ? 1 : 0);
anim::start(this); anim::start(this);
} }
} }
if (!_photoLink && (!_peerChat || _peerChat->isForbidden)) { if (!_photoLink && (_peerUser || (_peerChat && _peerChat->isForbidden) || (_peerChannel && !_amCreator))) {
setCursor((_kickOver || _kickDown || textlnkOver()) ? style::cur_pointer : style::cur_default); setCursor((_kickOver || _kickDown || textlnkOver()) ? style::cur_pointer : style::cur_default);
} else { } else {
setCursor((_kickOver || _kickDown || _photoOver || textlnkOver()) ? style::cur_pointer : style::cur_default); setCursor((_kickOver || _kickDown || _photoOver || textlnkOver()) ? style::cur_pointer : style::cur_default);
@ -914,7 +914,7 @@ void ProfileInner::mousePressEvent(QMouseEvent *e) {
} else if (QRect(_left, st::profilePadding.top(), st::setPhotoSize, st::setPhotoSize).contains(e->pos())) { } else if (QRect(_left, st::profilePadding.top(), st::setPhotoSize, st::setPhotoSize).contains(e->pos())) {
if (_photoLink) { if (_photoLink) {
_photoLink->onClick(e->button()); _photoLink->onClick(e->button());
} else if (_peerChat && !_peerChat->isForbidden) { } else if ((_peerChat && !_peerChat->isForbidden) || (_peerChannel && _amCreator)) {
onUpdatePhoto(); onUpdatePhoto();
} }
} }
@ -946,7 +946,11 @@ void ProfileInner::mouseReleaseEvent(QMouseEvent *e) {
} }
} }
_kickDown = 0; _kickDown = 0;
setCursor((_kickOver || textlnkOver()) ? style::cur_pointer : style::cur_default); if (!_photoLink && (_peerUser || (_peerChat && _peerChat->isForbidden) || (_peerChannel && !_amCreator))) {
setCursor((_kickOver || _kickDown || textlnkOver()) ? style::cur_pointer : style::cur_default);
} else {
setCursor((_kickOver || _kickDown || _photoOver || textlnkOver()) ? style::cur_pointer : style::cur_default);
}
update(); update();
} }