mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-31 06:35:14 +00:00
Code Issues Releases Wiki Activity

Fixed building in Xcode.

Browse Source
This commit is contained in:
John Preston
2016-04-07 14:35:09 +04:00
parent db387d50b8
commit a37bbcfaca
13 changed files with 190 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Telegram/SourceFiles/history.cpp
View File

@@ -2746,7 +2746,7 @@ public:
}
QString tooltip() const override {
return _fullDisplayed ? QString() : text();
return _fullDisplayed ? QString() : buttonText();
}
void setFullDisplayed(bool full) {
@@ -2780,7 +2780,7 @@ private:
bool _fullDisplayed = true;
// Returns the full text of the corresponding button.
QString text() const {
QString buttonText() const {
if (auto button = getButton()) {
return button->text;
}
@@ -7169,7 +7169,7 @@ HistoryMedia *HistoryMessage::getMedia() const {
}
void HistoryMessage::setMedia(const MTPMessageMedia *media) {
if ((!_media || _media->isImageLink()) && (!media || media->type() == mtpc_messageMediaEmpty)) return;
if (!_media && (!media || media->type() == mtpc_messageMediaEmpty)) return;
bool mediaWasDisplayed = false;
if (_media) {