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

Improve ViewButton + Reactions view.

Browse source
This commit is contained in:
John Preston 2022-02-01 00:26:34 +03:00
parent 2eb8ed59cc
commit 656146c445
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -390,7 +390,7 @@ void Message::animateReaction(ReactionAnimationArgs &&args) {
if (_viewButton) { if (_viewButton) {
const auto belowInfo = _viewButton->belowMessageInfo(); const auto belowInfo = _viewButton->belowMessageInfo();
const auto infoHeight = reactionsInBubble const auto infoHeight = reactionsInBubble
? (reactionsHeight + st::msgPadding.bottom()) ? (reactionsHeight + 2 * st::mediaInBubbleSkip)
: _bottomInfo.height(); : _bottomInfo.height();
const auto heightMargins = QMargins(0, 0, 0, infoHeight); const auto heightMargins = QMargins(0, 0, 0, infoHeight);
if (belowInfo) { if (belowInfo) {
@ -398,7 +398,7 @@ void Message::animateReaction(ReactionAnimationArgs &&args) {
} }
trect.setHeight(trect.height() - _viewButton->height()); trect.setHeight(trect.height() - _viewButton->height());
if (reactionsInBubble) { if (reactionsInBubble) {
trect.setHeight(trect.height() + st::msgPadding.bottom()); trect.setHeight(trect.height() - st::mediaInBubbleSkip + st::msgPadding.bottom());
} else if (mediaDisplayed) { } else if (mediaDisplayed) {
trect.setHeight(trect.height() - st::mediaInBubbleSkip); trect.setHeight(trect.height() - st::mediaInBubbleSkip);
} }
@ -486,7 +486,7 @@ QSize Message::performCountOptimalSize() {
accumulate_max( accumulate_max(
maxWidth, maxWidth,
std::min(st::msgMaxWidth, reactionsMaxWidth)); std::min(st::msgMaxWidth, reactionsMaxWidth));
if (!mediaDisplayed) { if (!mediaDisplayed || _viewButton) {
minHeight += st::mediaInBubbleSkip; minHeight += st::mediaInBubbleSkip;
} }
if (maxWidth >= reactionsMaxWidth) { if (maxWidth >= reactionsMaxWidth) {
@ -796,7 +796,7 @@ void Message::draw(Painter &p, const PaintContext &context) const {
if (_viewButton) { if (_viewButton) {
const auto belowInfo = _viewButton->belowMessageInfo(); const auto belowInfo = _viewButton->belowMessageInfo();
const auto infoHeight = reactionsInBubble const auto infoHeight = reactionsInBubble
? (reactionsHeight + st::msgPadding.bottom()) ? (reactionsHeight + 2 * st::mediaInBubbleSkip)
: _bottomInfo.height(); : _bottomInfo.height();
const auto heightMargins = QMargins(0, 0, 0, infoHeight); const auto heightMargins = QMargins(0, 0, 0, infoHeight);
_viewButton->draw( _viewButton->draw(
@ -810,7 +810,7 @@ void Message::draw(Painter &p, const PaintContext &context) const {
} }
trect.setHeight(trect.height() - _viewButton->height()); trect.setHeight(trect.height() - _viewButton->height());
if (reactionsInBubble) { if (reactionsInBubble) {
trect.setHeight(trect.height() + st::msgPadding.bottom()); trect.setHeight(trect.height() - st::mediaInBubbleSkip + st::msgPadding.bottom());
} else if (mediaDisplayed) { } else if (mediaDisplayed) {
trect.setHeight(trect.height() - st::mediaInBubbleSkip); trect.setHeight(trect.height() - st::mediaInBubbleSkip);
} }
@ -1474,7 +1474,7 @@ TextState Message::textState(
if (_viewButton) { if (_viewButton) {
const auto belowInfo = _viewButton->belowMessageInfo(); const auto belowInfo = _viewButton->belowMessageInfo();
const auto infoHeight = reactionsInBubble const auto infoHeight = reactionsInBubble
? (reactionsHeight + st::msgPadding.bottom()) ? (reactionsHeight + 2 * st::mediaInBubbleSkip)
: _bottomInfo.height(); : _bottomInfo.height();
const auto heightMargins = QMargins(0, 0, 0, infoHeight); const auto heightMargins = QMargins(0, 0, 0, infoHeight);
if (_viewButton->getState( if (_viewButton->getState(
@ -1486,19 +1486,17 @@ TextState Message::textState(
return result; return result;
} }
if (belowInfo) { if (belowInfo) {
inner -= heightMargins; inner.setHeight(inner.height() - _viewButton->height());
} }
trect.setHeight(trect.height() - _viewButton->height()); trect.setHeight(trect.height() - _viewButton->height());
if (reactionsInBubble) { if (reactionsInBubble) {
trect.setHeight(trect.height() + st::msgPadding.bottom()); trect.setHeight(trect.height() - st::mediaInBubbleSkip + st::msgPadding.bottom());
} else if (mediaDisplayed) { } else if (mediaDisplayed) {
trect.setHeight(trect.height() - st::mediaInBubbleSkip); trect.setHeight(trect.height() - st::mediaInBubbleSkip);
} }
} }
if (mediaOnBottom) { if (mediaOnBottom) {
trect.setHeight(trect.height() trect.setHeight(trect.height() + st::msgPadding.bottom());
+ st::msgPadding.bottom()
- viewButtonHeight());
} }
if (mediaOnTop) { if (mediaOnTop) {
trect.setY(trect.y() - st::msgPadding.top()); trect.setY(trect.y() - st::msgPadding.top());
@ -2901,7 +2899,7 @@ int Message::resizeContentGetHeight(int newWidth) {
newHeight += entry->resizeGetHeight(contentWidth); newHeight += entry->resizeGetHeight(contentWidth);
} }
if (reactionsInBubble) { if (reactionsInBubble) {
if (!mediaDisplayed) { if (!mediaDisplayed || _viewButton) {
newHeight += st::mediaInBubbleSkip; newHeight += st::mediaInBubbleSkip;
} }
newHeight += _reactions->height(); newHeight += _reactions->height();