From 03e90840def60c7656ff9b75dd369e319a8511b6 Mon Sep 17 00:00:00 2001 From: John Preston Date: Sat, 10 Sep 2022 11:07:08 +0400 Subject: [PATCH] Closed alpha version 4.1.1.1: Fix build with GCC. --- .../SourceFiles/boxes/premium_preview_box.cpp | 17 ----------------- .../history/view/media/history_view_gif.cpp | 1 - .../history/view/media/history_view_photo.cpp | 1 - .../history_view_reactions_selector.cpp | 2 -- Telegram/lib_ui | 2 +- 5 files changed, 1 insertion(+), 22 deletions(-) diff --git a/Telegram/SourceFiles/boxes/premium_preview_box.cpp b/Telegram/SourceFiles/boxes/premium_preview_box.cpp index a7bc9d5fd..0c9b927b7 100644 --- a/Telegram/SourceFiles/boxes/premium_preview_box.cpp +++ b/Telegram/SourceFiles/boxes/premium_preview_box.cpp @@ -73,23 +73,6 @@ bool operator==(const Descriptor &a, const Descriptor &b) { && (a.fromSettings == b.fromSettings); } -[[nodiscard]] int ComputeX(int column, int columns) { - const auto skip = st::premiumReactionWidthSkip; - const auto fullWidth = columns * skip; - const auto left = (st::boxWideWidth - fullWidth) / 2; - return left + column * skip + (skip / 2); -} - -[[nodiscard]] int ComputeY(int row, int rows) { - const auto middle = (rows > 3) - ? (st::premiumReactionInfoTop / 2) - : st::premiumReactionsMiddle; - const auto skip = st::premiumReactionHeightSkip; - const auto fullHeight = rows * skip; - const auto top = middle - (fullHeight / 2); - return top + row * skip + (skip / 2); -} - struct Preload { Descriptor descriptor; std::shared_ptr media; diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp index 524aac032..7401356b3 100644 --- a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp +++ b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp @@ -701,7 +701,6 @@ QImage Gif::prepareThumbCache(QSize outer) const { const auto good = _dataMedia->goodThumbnail(); const auto normal = good ? good : _dataMedia->thumbnail(); const auto videothumb = normal ? nullptr : _videoThumbnailFrame.get(); - const auto ratio = style::DevicePixelRatio(); auto blurred = (!good && normal && (normal->width() < kUseNonBlurredThreshold) diff --git a/Telegram/SourceFiles/history/view/media/history_view_photo.cpp b/Telegram/SourceFiles/history/view/media/history_view_photo.cpp index 11aa7160f..3b9060774 100644 --- a/Telegram/SourceFiles/history/view/media/history_view_photo.cpp +++ b/Telegram/SourceFiles/history/view/media/history_view_photo.cpp @@ -385,7 +385,6 @@ QImage Photo::prepareImageCache( QImage Photo::prepareImageCache(QSize outer) const { using Size = PhotoSize; const auto large = _dataMedia->image(Size::Large); - const auto ratio = style::DevicePixelRatio(); auto blurred = (Image*)nullptr; if (const auto embedded = _dataMedia->thumbnailInline()) { blurred = embedded; diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp index 7ffca12c7..709151501 100644 --- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp +++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp @@ -639,8 +639,6 @@ ChosenReaction Selector::lookupChosen(const Data::ReactionId &id) const { if (result.icon.isNull()) { return result; } - const auto between = st::reactionCornerSkip; - const auto oneHeight = (st::reactionCornerSize.height() + between); const auto rect = QRect(_skipx + index * _size, _skipy, _size, _size); const auto imageSize = _strip->computeOverSize(); result.globalGeometry = mapToGlobal(QRect( diff --git a/Telegram/lib_ui b/Telegram/lib_ui index e16cff487..38875a85b 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit e16cff487ddd01522436f8a2789a8cff3b4c1da6 +Subproject commit 38875a85be4d5639f078068385c6fe7c9af05faa