mirror of
https://github.com/telegramdesktop/tdesktop
synced 2025-08-31 14:38:15 +00:00
Fixed position of via bot header above reply in message view.
This commit is contained in:
@@ -1301,8 +1301,8 @@ void Message::draw(Painter &p, const PaintContext &context) const {
|
|||||||
paintFromName(p, trect, context);
|
paintFromName(p, trect, context);
|
||||||
paintTopicButton(p, trect, context);
|
paintTopicButton(p, trect, context);
|
||||||
paintForwardedInfo(p, trect, context);
|
paintForwardedInfo(p, trect, context);
|
||||||
paintReplyInfo(p, trect, context);
|
|
||||||
paintViaBotIdInfo(p, trect, context);
|
paintViaBotIdInfo(p, trect, context);
|
||||||
|
paintReplyInfo(p, trect, context);
|
||||||
}
|
}
|
||||||
if (entry) {
|
if (entry) {
|
||||||
trect.setHeight(trect.height() - entry->height());
|
trect.setHeight(trect.height() - entry->height());
|
||||||
@@ -4147,17 +4147,17 @@ QRect Message::innerGeometry() const {
|
|||||||
+ st::topicButtonPadding.bottom()
|
+ st::topicButtonPadding.bottom()
|
||||||
+ st::topicButtonSkip);
|
+ st::topicButtonSkip);
|
||||||
}
|
}
|
||||||
// Skip displayForwardedFrom() until there are no animations for it.
|
|
||||||
if (const auto reply = Get<Reply>()) {
|
|
||||||
// See paintReplyInfo().
|
|
||||||
result.translate(0, reply->height());
|
|
||||||
}
|
|
||||||
if (!displayFromName() && !displayForwardedFrom()) {
|
if (!displayFromName() && !displayForwardedFrom()) {
|
||||||
// See paintViaBotIdInfo().
|
// See paintViaBotIdInfo().
|
||||||
if (data()->Has<HistoryMessageVia>()) {
|
if (data()->Has<HistoryMessageVia>()) {
|
||||||
result.translate(0, st::msgServiceNameFont->height);
|
result.translate(0, st::msgServiceNameFont->height);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// Skip displayForwardedFrom() until there are no animations for it.
|
||||||
|
if (const auto reply = Get<Reply>()) {
|
||||||
|
// See paintReplyInfo().
|
||||||
|
result.translate(0, reply->height());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user