void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reactions under view button in the message bubble.

Browse source
This commit is contained in:
John Preston 2021-12-29 19:58:29 +03:00
parent c875f367e6
commit 70658c6e65
1 changed files with 67 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

113
Telegram/SourceFiles/history/view/history_view_message.cpp
View file

@ -377,9 +377,11 @@ QSize Message::performCountOptimalSize() {
minHeight += _reactions->resizeGetHeight(widthForReactions); minHeight += _reactions->resizeGetHeight(widthForReactions);
} }
} }
if (!mediaOnBottom) { if (!mediaOnBottom && (!_viewButton || !reactionsInBubble)) {
minHeight += st::msgPadding.bottom(); minHeight += st::msgPadding.bottom();
if (mediaDisplayed) minHeight += st::mediaInBubbleSkip; if (mediaDisplayed) {
minHeight += st::mediaInBubbleSkip;
}
} }
if (!mediaOnTop) { if (!mediaOnTop) {
minHeight += st::msgPadding.top(); minHeight += st::msgPadding.top();
@ -561,7 +563,7 @@ void Message::draw(Painter &p, const PaintContext &context) const {
if (reactionsInBubble) { if (reactionsInBubble) {
localMediaBottom -= st::mediaInBubbleSkip + _reactions->height(); localMediaBottom -= st::mediaInBubbleSkip + _reactions->height();
} }
if (!mediaOnBottom) { if (!mediaOnBottom && (!_viewButton || !reactionsInBubble)) {
localMediaBottom -= st::msgPadding.bottom(); localMediaBottom -= st::msgPadding.bottom();
} }
if (entry) { if (entry) {
@ -649,9 +651,26 @@ void Message::draw(Painter &p, const PaintContext &context) const {
paintCommentsButton(p, inner, context); paintCommentsButton(p, inner, context);
auto trect = inner.marginsRemoved(st::msgPadding); auto trect = inner.marginsRemoved(st::msgPadding);
const auto reactionsTop = (reactionsInBubble && !_viewButton)
? st::mediaInBubbleSkip
: 0;
const auto reactionsHeight = reactionsInBubble
? (reactionsTop + _reactions->height())
: 0;
if (reactionsInBubble) {
trect.setHeight(trect.height() - reactionsHeight);
const auto reactionsPosition = QPoint(trect.left(), trect.top() + trect.height() + reactionsTop);
p.translate(reactionsPosition);
_reactions->paint(p, context, g.width(), context.clip.translated(-reactionsPosition));
p.translate(-reactionsPosition);
}
if (_viewButton) { if (_viewButton) {
const auto belowInfo = _viewButton->belowMessageInfo(); const auto belowInfo = _viewButton->belowMessageInfo();
const auto infoHeight = _bottomInfo.height(); const auto infoHeight = reactionsInBubble
? (reactionsHeight + st::msgPadding.bottom())
: _bottomInfo.height();
const auto heightMargins = QMargins(0, 0, 0, infoHeight); const auto heightMargins = QMargins(0, 0, 0, infoHeight);
_viewButton->draw( _viewButton->draw(
p, p,
@ -663,20 +682,13 @@ void Message::draw(Painter &p, const PaintContext &context) const {
inner.setHeight(inner.height() - _viewButton->height()); inner.setHeight(inner.height() - _viewButton->height());
} }
trect.setHeight(trect.height() - _viewButton->height()); trect.setHeight(trect.height() - _viewButton->height());
if (mediaDisplayed) { if (reactionsInBubble) {
trect.setHeight(trect.height() + st::msgPadding.bottom());
} else if (mediaDisplayed) {
trect.setHeight(trect.height() - st::mediaInBubbleSkip); trect.setHeight(trect.height() - st::mediaInBubbleSkip);
} }
} }
if (reactionsInBubble) {
const auto reactionsHeight = st::mediaInBubbleSkip + _reactions->height();
trect.setHeight(trect.height() - reactionsHeight);
const auto reactionsPosition = QPoint(trect.left(), trect.top() + trect.height() + st::mediaInBubbleSkip);
p.translate(reactionsPosition);
_reactions->paint(p, context, g.width(), context.clip.translated(-reactionsPosition));
p.translate(-reactionsPosition);
}
if (mediaOnBottom) { if (mediaOnBottom) {
trect.setHeight(trect.height() + st::msgPadding.bottom()); trect.setHeight(trect.height() + st::msgPadding.bottom());
} }
@ -1097,17 +1109,19 @@ PointState Message::pointState(QPoint point) const {
} }
auto trect = g.marginsRemoved(st::msgPadding); auto trect = g.marginsRemoved(st::msgPadding);
if (_viewButton) {
trect.setHeight(trect.height() - _viewButton->height());
if (mediaDisplayed) {
trect.setHeight(trect.height() - st::mediaInBubbleSkip);
}
}
if (reactionsInBubble) { if (reactionsInBubble) {
const auto reactionsHeight = st::mediaInBubbleSkip const auto reactionsHeight = (_viewButton ? 0 : st::mediaInBubbleSkip)
+ _reactions->height(); + _reactions->height();
trect.setHeight(trect.height() - reactionsHeight); trect.setHeight(trect.height() - reactionsHeight);
} }
if (_viewButton) {
trect.setHeight(trect.height() - _viewButton->height());
if (reactionsInBubble) {
trect.setHeight(trect.height() + st::msgPadding.bottom());
} else if (mediaDisplayed) {
trect.setHeight(trect.height() - st::mediaInBubbleSkip);
}
}
if (mediaOnBottom) { if (mediaOnBottom) {
trect.setHeight(trect.height() + st::msgPadding.bottom()); trect.setHeight(trect.height() + st::msgPadding.bottom());
} }
@ -1284,43 +1298,48 @@ TextState Message::textState(
auto mediaOnBottom = (mediaDisplayed && media->isBubbleBottom()) || (entry/* && entry->isBubbleBottom()*/); auto mediaOnBottom = (mediaDisplayed && media->isBubbleBottom()) || (entry/* && entry->isBubbleBottom()*/);
auto mediaOnTop = (mediaDisplayed && media->isBubbleTop()) || (entry && entry->isBubbleTop()); auto mediaOnTop = (mediaDisplayed && media->isBubbleTop()) || (entry && entry->isBubbleTop());
auto bubble = g; auto inner = g;
if (getStateCommentsButton(point, bubble, &result)) { if (getStateCommentsButton(point, inner, &result)) {
return result; return result;
} }
auto trect = inner.marginsRemoved(st::msgPadding);
const auto reactionsTop = (reactionsInBubble && !_viewButton)
? st::mediaInBubbleSkip
: 0;
const auto reactionsHeight = reactionsInBubble
? (reactionsTop + _reactions->height())
: 0;
if (reactionsInBubble) {
trect.setHeight(trect.height() - reactionsHeight);
const auto reactionsPosition = QPoint(trect.left(), trect.top() + trect.height() + reactionsTop);
if (_reactions->getState(point - reactionsPosition, &result)) {
return result;
}
}
if (_viewButton) { if (_viewButton) {
const auto belowInfo = _viewButton->belowMessageInfo(); const auto belowInfo = _viewButton->belowMessageInfo();
const auto infoHeight = _bottomInfo.height(); const auto infoHeight = reactionsInBubble
? (reactionsHeight + st::msgPadding.bottom())
: _bottomInfo.height();
const auto heightMargins = QMargins(0, 0, 0, infoHeight); const auto heightMargins = QMargins(0, 0, 0, infoHeight);
if (_viewButton->getState( if (_viewButton->getState(
point, point,
_viewButton->countRect(belowInfo _viewButton->countRect(belowInfo
? bubble ? inner
: bubble - heightMargins), : inner - heightMargins),
&result)) { &result)) {
return result; return result;
} }
if (belowInfo) { if (belowInfo) {
bubble -= heightMargins; inner -= heightMargins;
} }
}
auto trect = bubble.marginsRemoved(st::msgPadding);
if (_viewButton) {
trect.setHeight(trect.height() - _viewButton->height()); trect.setHeight(trect.height() - _viewButton->height());
if (mediaDisplayed) { if (reactionsInBubble) {
trect.setHeight(trect.height() + st::msgPadding.bottom());
} else if (mediaDisplayed) {
trect.setHeight(trect.height() - st::mediaInBubbleSkip); trect.setHeight(trect.height() - st::mediaInBubbleSkip);
} }
} }
if (reactionsInBubble) {
const auto reactionsHeight = _reactions->height()
+ st::mediaInBubbleSkip;
trect.setHeight(trect.height() - reactionsHeight);
const auto reactionsPosition = QPoint(trect.left(), trect.top() + trect.height() + st::mediaInBubbleSkip);
if (_reactions->getState(point - reactionsPosition, &result)) {
return result;
}
}
if (mediaOnBottom) { if (mediaOnBottom) {
trect.setHeight(trect.height() trect.setHeight(trect.height()
+ st::msgPadding.bottom() + st::msgPadding.bottom()
@ -1345,7 +1364,7 @@ TextState Message::textState(
if (entry) { if (entry) {
auto entryHeight = entry->height(); auto entryHeight = entry->height();
trect.setHeight(trect.height() - entryHeight); trect.setHeight(trect.height() - entryHeight);
auto entryLeft = bubble.left(); auto entryLeft = inner.left();
auto entryTop = trect.y() + trect.height(); auto entryTop = trect.y() + trect.height();
if (point.y() >= entryTop && point.y() < entryTop + entryHeight) { if (point.y() >= entryTop && point.y() < entryTop + entryHeight) {
result = entry->textState( result = entry->textState(
@ -1360,8 +1379,8 @@ TextState Message::textState(
return; return;
} }
const auto bottomInfoResult = bottomInfoTextState( const auto bottomInfoResult = bottomInfoTextState(
bubble.left() + bubble.width(), inner.left() + inner.width(),
bubble.top() + bubble.height(), inner.top() + inner.height(),
point, point,
InfoDisplayType::Default); InfoDisplayType::Default);
if (bottomInfoResult.link if (bottomInfoResult.link
@ -2709,9 +2728,11 @@ int Message::resizeContentGetHeight(int newWidth) {
} else { } else {
newHeight = 0; newHeight = 0;
} }
if (!mediaOnBottom) { if (!mediaOnBottom && (!_viewButton || !reactionsInBubble)) {
newHeight += st::msgPadding.bottom(); newHeight += st::msgPadding.bottom();
if (mediaDisplayed) newHeight += st::mediaInBubbleSkip; if (mediaDisplayed) {
newHeight += st::mediaInBubbleSkip;
}
} }
if (!mediaOnTop) { if (!mediaOnTop) {
newHeight += st::msgPadding.top(); newHeight += st::msgPadding.top();