From b35d3f57fe8e8e374139896af602635dbd7b5a98 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Mon, 22 Apr 2024 22:47:13 +0300 Subject: [PATCH] Slightly improved style of sub-button in sponsored messages. --- .../history/view/media/history_view_web_page.cpp | 12 +++++------- .../history/view/media/history_view_web_page.h | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp index d2a609c39c..c75824a566 100644 --- a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp +++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp @@ -897,12 +897,10 @@ void WebPage::draw(Painter &p, const PaintContext &context) const { const auto height = st::webPageSponsoredHintFont->height; const auto radius = height / 2; - _sponsoredData->lastHintPos = QPoint( + _sponsoredData->lastHintPos = QPointF( radius + inner.left() + _sponsoredData->widthBeforeHint, - tshift - + (_siteName.style()->font->height - height) / 2 - + st::webPageSponsoredHintFont->descent / 2); - const auto rect = QRect( + tshift + (_siteName.style()->font->height - height) / 2.); + const auto rect = QRectF( _sponsoredData->lastHintPos, _sponsoredData->hintSize); auto hq = PainterHighQualityEnabler(p); @@ -1205,7 +1203,7 @@ TextState WebPage::textState(QPoint point, StateRequest request) const { result.link = _openl; } if (_sponsoredData && _sponsoredData->canReport) { - const auto contains = QRect( + const auto contains = QRectF( _sponsoredData->lastHintPos, _sponsoredData->hintSize).contains(point - QPoint(0, st::msgDateFont->height)); @@ -1298,7 +1296,7 @@ void WebPage::clickHandlerPressedChanged( const auto outer = full - inBubblePadding(); _sponsoredData->hintRipple->add(_lastPoint + outer.topLeft() - - _sponsoredData->lastHintPos); + - _sponsoredData->lastHintPos.toPoint()); } else if (_sponsoredData->hintRipple) { _sponsoredData->hintRipple->lastStop(); } diff --git a/Telegram/SourceFiles/history/view/media/history_view_web_page.h b/Telegram/SourceFiles/history/view/media/history_view_web_page.h index 37471f869b..1e1088bf78 100644 --- a/Telegram/SourceFiles/history/view/media/history_view_web_page.h +++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.h @@ -149,7 +149,7 @@ private: bool canReport = false; QSize hintSize; - QPoint lastHintPos; + QPointF lastHintPos; int widthBeforeHint = 0; std::unique_ptr hintRipple; ClickHandlerPtr hintLink;