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

Fixed fast share button in messages with big emoji and reply.

This commit is contained in:
23rd 2019-08-16 15:24:27 +03:00 committed by John Preston
parent de270d5283
commit 9f228d8146
1 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -170,6 +170,7 @@ void UnwrappedMedia::drawSurrounding(
selected, selected,
InfoDisplayType::Background); InfoDisplayType::Background);
} }
auto replyRight = 0;
if (const auto recth = surroundingHeight(via, reply)) { if (const auto recth = surroundingHeight(via, reply)) {
int rectw = width() - inner.width() - st::msgReplyPadding.left(); int rectw = width() - inner.width() - st::msgReplyPadding.left();
int rectx = rightAligned ? 0 : (inner.width() + st::msgReplyPadding.left()); int rectx = rightAligned ? 0 : (inner.width() + st::msgReplyPadding.left());
@ -193,10 +194,19 @@ void UnwrappedMedia::drawSurrounding(
} }
reply->paint(p, _parent, rectx, recty, rectw, flags); reply->paint(p, _parent, rectx, recty, rectw, flags);
} }
replyRight = rectx + rectw;
} }
if (rightAction) { if (rightAction) {
auto fastShareLeft = (fullRight + st::historyFastShareLeft); const auto fastShareTop = (fullBottom
auto fastShareTop = (fullBottom - st::historyFastShareBottom - st::historyFastShareSize); - st::historyFastShareBottom
- st::historyFastShareSize);
const auto doesRightActionHitReply = replyRight && (fastShareTop <
st::msgReplyBarSize.height()
+ st::msgReplyPadding.top()
+ st::msgReplyPadding.bottom());
const auto fastShareLeft = ((doesRightActionHitReply
? replyRight
: fullRight) + st::historyFastShareLeft);
_parent->drawRightAction(p, fastShareLeft, fastShareTop, 2 * inner.x() + inner.width()); _parent->drawRightAction(p, fastShareLeft, fastShareTop, 2 * inner.x() + inner.width());
} }
} }
@ -233,6 +243,7 @@ TextState UnwrappedMedia::textState(QPoint point, StateRequest request) const {
const auto inner = QRect(usex, usey, usew, useh); const auto inner = QRect(usex, usey, usew, useh);
if (_parent->media() == this) { if (_parent->media() == this) {
auto replyRight = 0;
if (auto recth = surroundingHeight(via, reply)) { if (auto recth = surroundingHeight(via, reply)) {
int rectw = width() - inner.width() - st::msgReplyPadding.left(); int rectw = width() - inner.width() - st::msgReplyPadding.left();
int rectx = rightAligned ? 0 : (inner.width() + st::msgReplyPadding.left()); int rectx = rightAligned ? 0 : (inner.width() + st::msgReplyPadding.left());
@ -255,6 +266,7 @@ TextState UnwrappedMedia::textState(QPoint point, StateRequest request) const {
return result; return result;
} }
} }
replyRight = rectx + rectw - st::msgReplyPadding.right();
} }
const auto infoWidth = _parent->infoWidth() const auto infoWidth = _parent->infoWidth()
+ st::msgDateImgPadding.x() * 2 + st::msgDateImgPadding.x() * 2
@ -274,9 +286,18 @@ TextState UnwrappedMedia::textState(QPoint point, StateRequest request) const {
result.cursor = CursorState::Date; result.cursor = CursorState::Date;
} }
if (rightAction) { if (rightAction) {
auto fastShareLeft = (fullRight + st::historyFastShareLeft); const auto size = st::historyFastShareSize;
auto fastShareTop = (fullBottom - st::historyFastShareBottom - st::historyFastShareSize); const auto fastShareTop = (fullBottom
if (QRect(fastShareLeft, fastShareTop, st::historyFastShareSize, st::historyFastShareSize).contains(point)) { - st::historyFastShareBottom
- size);
const auto doesRightActionHitReply = replyRight && (fastShareTop <
st::msgReplyBarSize.height()
+ st::msgReplyPadding.top()
+ st::msgReplyPadding.bottom());
const auto fastShareLeft = ((doesRightActionHitReply
? replyRight
: fullRight) + st::historyFastShareLeft) - size / 2;
if (QRect(fastShareLeft, fastShareTop, size, size).contains(point)) {
result.link = _parent->rightActionLink(); result.link = _parent->rightActionLink();
return result; return result;
} }