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

Fixed display of long title or long description in sponsored messages.

Browse source
This commit is contained in:
23rd 2023-12-23 01:30:43 +03:00
parent b24290b019
commit 5bc954396c
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
View file

@ -418,6 +418,7 @@ QSize WebPage::countCurrentSize(int newWidth) {
auto siteNameHeight = _siteNameLines ? lineHeight : 0; auto siteNameHeight = _siteNameLines ? lineHeight : 0;
const auto asSponsored = (!!_sponsoredData); const auto asSponsored = (!!_sponsoredData);
if (asArticle() || asSponsored) { if (asArticle() || asSponsored) {
const auto sponsoredUserpic = (asSponsored && _sponsoredData->peer);
constexpr auto kSponsoredUserpicLines = 2; constexpr auto kSponsoredUserpicLines = 2;
_pixh = (asSponsored ? kSponsoredUserpicLines : linesMax) * lineHeight; _pixh = (asSponsored ? kSponsoredUserpicLines : linesMax) * lineHeight;
do { do {
@ -437,7 +438,9 @@ QSize WebPage::countCurrentSize(int newWidth) {
newHeight += _titleLines * lineHeight; newHeight += _titleLines * lineHeight;
} }
auto descriptionHeight = _description.countHeight(wleft); auto descriptionHeight = _description.countHeight(sponsoredUserpic
? innerWidth
: wleft);
if (descriptionHeight < (linesMax - _siteNameLines - _titleLines) * st::webPageDescriptionFont->height) { if (descriptionHeight < (linesMax - _siteNameLines - _titleLines) * st::webPageDescriptionFont->height) {
// We have height for all the lines. // We have height for all the lines.
_descriptionLines = -1; _descriptionLines = -1;
@ -608,6 +611,8 @@ void WebPage::draw(Painter &p, const PaintContext &context) const {
} }
} }
const auto asSponsored = (!!_sponsoredData);
auto lineHeight = UnitedLineHeight(); auto lineHeight = UnitedLineHeight();
if (asArticle()) { if (asArticle()) {
ensurePhotoMediaCreated(); ensurePhotoMediaCreated();
@ -647,8 +652,12 @@ void WebPage::draw(Painter &p, const PaintContext &context) const {
st->msgSelectOverlay(), st->msgSelectOverlay(),
st->msgSelectOverlayCorners(Ui::CachedCornerRadius::Small)); st->msgSelectOverlayCorners(Ui::CachedCornerRadius::Small));
} }
paintw -= pw + st::webPagePhotoDelta; if (!asSponsored) {
} else if (_sponsoredData && _sponsoredData->peer) { // Ignore photo width in sponsored messages,
// as its width only affects the title.
paintw -= pw + st::webPagePhotoDelta;
}
} else if (asSponsored && _sponsoredData->peer) {
const auto size = _pixh; const auto size = _pixh;
const auto sizeHq = size * style::DevicePixelRatio(); const auto sizeHq = size * style::DevicePixelRatio();
const auto userpicPos = QPoint(inner.left() + paintw - size, tshift); const auto userpicPos = QPoint(inner.left() + paintw - size, tshift);
@ -685,7 +694,10 @@ void WebPage::draw(Painter &p, const PaintContext &context) const {
if (_title.hasSkipBlock()) { if (_title.hasSkipBlock()) {
endskip = _parent->skipBlockWidth(); endskip = _parent->skipBlockWidth();
} }
_title.drawLeftElided(p, inner.left(), tshift, paintw, width(), _titleLines, style::al_left, 0, -1, endskip, false, toTitleSelection(context.selection)); const auto titleWidth = asSponsored
? (paintw - _pixh - st::webPagePhotoDelta)
: paintw;
_title.drawLeftElided(p, inner.left(), tshift, titleWidth, width(), _titleLines, style::al_left, 0, -1, endskip, false, toTitleSelection(context.selection));
tshift += _titleLines * lineHeight; tshift += _titleLines * lineHeight;
} }
if (_descriptionLines) { if (_descriptionLines) {