From de16a66a4ab2177fba0e56df664115ebbbd66090 Mon Sep 17 00:00:00 2001 From: John Preston Date: Sat, 16 Dec 2017 21:05:58 +0400 Subject: [PATCH] Alpha version 1.2.2: Fix build for Xcode. --- Telegram/SourceFiles/history/history_media_grouped.h | 2 +- Telegram/SourceFiles/history/history_media_types.cpp | 4 ++-- Telegram/SourceFiles/layout.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Telegram/SourceFiles/history/history_media_grouped.h b/Telegram/SourceFiles/history/history_media_grouped.h index 6e642cd841..5434cd92d3 100644 --- a/Telegram/SourceFiles/history/history_media_grouped.h +++ b/Telegram/SourceFiles/history/history_media_grouped.h @@ -97,7 +97,7 @@ public: bool overrideEditedDate() const override { return true; } - HistoryMessageEdited *displayedEditBadge() const; + HistoryMessageEdited *displayedEditBadge() const override; bool canBeGrouped() const override { return true; diff --git a/Telegram/SourceFiles/history/history_media_types.cpp b/Telegram/SourceFiles/history/history_media_types.cpp index 63e3eae703..6f89d61555 100644 --- a/Telegram/SourceFiles/history/history_media_types.cpp +++ b/Telegram/SourceFiles/history/history_media_types.cpp @@ -749,8 +749,8 @@ void HistoryPhoto::validateGroupedCache( const auto pixSize = CountPixSizeForSize( { originalWidth, originalHeight }, { width, height }); - const auto pixWidth = pixSize.width(); - const auto pixHeight = pixSize.height(); + const auto pixWidth = pixSize.width() * cIntRetinaFactor(); + const auto pixHeight = pixSize.height() * cIntRetinaFactor(); const auto &image = loaded ? _data->full : _data->thumb; *cacheKey = key; diff --git a/Telegram/SourceFiles/layout.h b/Telegram/SourceFiles/layout.h index 8ac6cdf1b6..d5f16e9f2c 100644 --- a/Telegram/SourceFiles/layout.h +++ b/Telegram/SourceFiles/layout.h @@ -36,7 +36,7 @@ inline bool IsGroupItemSelection( return IsSubGroupSelection(selection) && (selection.to & (1 << index)); } -inline [[nodiscard]] TextSelection AddGroupItemSelection( +[[nodiscard]] inline TextSelection AddGroupItemSelection( TextSelection selection, int index) { Expects(index >= 0 && index < 0x0F); @@ -47,7 +47,7 @@ inline [[nodiscard]] TextSelection AddGroupItemSelection( IsSubGroupSelection(selection) ? (selection.to | bit) : bit); } -inline[[nodiscard]] TextSelection RemoveGroupItemSelection( +[[nodiscard]] inline TextSelection RemoveGroupItemSelection( TextSelection selection, int index) { Expects(index >= 0 && index < 0x0F);