RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Alpha version 1.2.2: Fix build for Xcode.

This commit is contained in:
John Preston 2017-12-16 21:05:58 +04:00
parent b0f191515a
commit de16a66a4a
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/SourceFiles/history/history_media_grouped.h
View File

@ -97,7 +97,7 @@ public:
bool overrideEditedDate() const override { bool overrideEditedDate() const override {
return true; return true;
} }
HistoryMessageEdited *displayedEditBadge() const; HistoryMessageEdited *displayedEditBadge() const override;
bool canBeGrouped() const override { bool canBeGrouped() const override {
return true; return true;

4
Telegram/SourceFiles/history/history_media_types.cpp
View File

@ -749,8 +749,8 @@ void HistoryPhoto::validateGroupedCache(
const auto pixSize = CountPixSizeForSize( const auto pixSize = CountPixSizeForSize(
{ originalWidth, originalHeight }, { originalWidth, originalHeight },
{ width, height }); { width, height });
const auto pixWidth = pixSize.width(); const auto pixWidth = pixSize.width() * cIntRetinaFactor();
const auto pixHeight = pixSize.height(); const auto pixHeight = pixSize.height() * cIntRetinaFactor();
const auto &image = loaded ? _data->full : _data->thumb; const auto &image = loaded ? _data->full : _data->thumb;
*cacheKey = key; *cacheKey = key;

4
Telegram/SourceFiles/layout.h
View File

@ -36,7 +36,7 @@ inline bool IsGroupItemSelection(
return IsSubGroupSelection(selection) && (selection.to & (1 << index)); return IsSubGroupSelection(selection) && (selection.to & (1 << index));
} }
inline [[nodiscard]] TextSelection AddGroupItemSelection( [[nodiscard]] inline TextSelection AddGroupItemSelection(
TextSelection selection, TextSelection selection,
int index) { int index) {
Expects(index >= 0 && index < 0x0F); Expects(index >= 0 && index < 0x0F);
@ -47,7 +47,7 @@ inline [[nodiscard]] TextSelection AddGroupItemSelection(
IsSubGroupSelection(selection) ? (selection.to | bit) : bit); IsSubGroupSelection(selection) ? (selection.to | bit) : bit);
} }
inline[[nodiscard]] TextSelection RemoveGroupItemSelection( [[nodiscard]] inline TextSelection RemoveGroupItemSelection(
TextSelection selection, TextSelection selection,
int index) { int index) {
Expects(index >= 0 && index < 0x0F); Expects(index >= 0 && index < 0x0F);