From d54f2993275ee5f8776f06f39f2e765cdd0c7027 Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 22 Sep 2015 13:35:54 +0300 Subject: [PATCH] fixed profile photo edit for channels, 0.8.58.dev version --- Telegram/SourceFiles/profilewidget.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/Telegram/SourceFiles/profilewidget.cpp b/Telegram/SourceFiles/profilewidget.cpp index 1674cfbbb..632da334c 100644 --- a/Telegram/SourceFiles/profilewidget.cpp +++ b/Telegram/SourceFiles/profilewidget.cpp @@ -645,7 +645,7 @@ void ProfileInner::paintEvent(QPaintEvent *e) { // profile 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)); } else { 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()); if (photoOver != _photoOver) { _photoOver = photoOver; - if (!_photoLink && _peerChat && !_peerChat->isForbidden) { + if (!_photoLink && ((_peerChat && !_peerChat->isForbidden) || (_peerChannel && _amCreator))) { a_photo.start(_photoOver ? 1 : 0); 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); } else { 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())) { if (_photoLink) { _photoLink->onClick(e->button()); - } else if (_peerChat && !_peerChat->isForbidden) { + } else if ((_peerChat && !_peerChat->isForbidden) || (_peerChannel && _amCreator)) { onUpdatePhoto(); } } @@ -946,7 +946,11 @@ void ProfileInner::mouseReleaseEvent(QMouseEvent *e) { } } _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(); }