void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

override specifiers added, retina bug in image circle fixed

Browse source
This commit is contained in:
John Preston 2016-03-21 21:57:03 +03:00
parent 91f87057bc
commit fd7a30f143
7 changed files with 158 additions and 152 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Telegram/SourceFiles/gui/images.cpp
View file

@ -416,6 +416,7 @@ const QPixmap &circleMask(int width, int height) {
p.setPen(Qt::NoPen); p.setPen(Qt::NoPen);
p.drawEllipse(0, 0, width, height); p.drawEllipse(0, 0, width, height);
} }
mask.setDevicePixelRatio(cRetinaFactor());
i = masks.insert(key, QPixmap::fromImage(mask)); i = masks.insert(key, QPixmap::fromImage(mask));
} }
return i.value(); return i.value();

296
Telegram/SourceFiles/history.h
View file

@ -1710,58 +1710,58 @@ public:
HistoryPhoto(PeerData *chat, const MTPDphoto &photo, int32 width = 0); HistoryPhoto(PeerData *chat, const MTPDphoto &photo, int32 width = 0);
HistoryPhoto(const HistoryPhoto &other); HistoryPhoto(const HistoryPhoto &other);
void init(); void init();
HistoryMediaType type() const { HistoryMediaType type() const override {
return MediaTypePhoto; return MediaTypePhoto;
} }
HistoryMedia *clone() const { HistoryMedia *clone() const override {
return new HistoryPhoto(*this); return new HistoryPhoto(*this);
} }
void initDimensions(const HistoryItem *parent); void initDimensions(const HistoryItem *parent) override;
int32 resize(int32 width, const HistoryItem *parent); int32 resize(int32 width, const HistoryItem *parent) override;
void draw(Painter &p, const HistoryItem *parent, const QRect &r, bool selected, uint64 ms) const; void draw(Painter &p, const HistoryItem *parent, const QRect &r, bool selected, uint64 ms) const override;
void getState(TextLinkPtr &lnk, HistoryCursorState &state, int32 x, int32 y, const HistoryItem *parent) const; void getState(TextLinkPtr &lnk, HistoryCursorState &state, int32 x, int32 y, const HistoryItem *parent) const override;
const QString inDialogsText() const; const QString inDialogsText() const override;
const QString inHistoryText() const; const QString inHistoryText() const override;
PhotoData *photo() const { PhotoData *photo() const {
return _data; return _data;
} }
void updateFrom(const MTPMessageMedia &media, HistoryItem *parent); void updateFrom(const MTPMessageMedia &media, HistoryItem *parent) override;
void attachToItem(HistoryItem *item) override; void attachToItem(HistoryItem *item) override;
void detachFromItem(HistoryItem *item) override; void detachFromItem(HistoryItem *item) override;
bool hasReplyPreview() const { bool hasReplyPreview() const override {
return !_data->thumb->isNull(); return !_data->thumb->isNull();
} }
ImagePtr replyPreview(); ImagePtr replyPreview() override;
QString getCaption() const { QString getCaption() const override {
return _caption.original(); return _caption.original();
} }
bool needsBubble(const HistoryItem *parent) const { bool needsBubble(const HistoryItem *parent) const override {
return !_caption.isEmpty() || parent->Is<HistoryMessageForwarded>() || parent->toHistoryReply() || parent->viaBot(); return !_caption.isEmpty() || parent->Is<HistoryMessageForwarded>() || parent->toHistoryReply() || parent->viaBot();
} }
bool customInfoLayout() const { bool customInfoLayout() const override {
return _caption.isEmpty(); return _caption.isEmpty();
} }
bool hideFromName() const { bool hideFromName() const override {
return true; return true;
} }
protected: protected:
float64 dataProgress() const { float64 dataProgress() const override {
return _data->progress(); return _data->progress();
} }
bool dataFinished() const { bool dataFinished() const override {
return !_data->loading() && !_data->uploading(); return !_data->loading() && !_data->uploading();
} }
bool dataLoaded() const { bool dataLoaded() const override {
return _data->loaded(); return _data->loaded();
} }
@ -1777,60 +1777,60 @@ public:
HistoryVideo(DocumentData *document, const QString &caption, const HistoryItem *parent); HistoryVideo(DocumentData *document, const QString &caption, const HistoryItem *parent);
HistoryVideo(const HistoryVideo &other); HistoryVideo(const HistoryVideo &other);
HistoryMediaType type() const { HistoryMediaType type() const override {
return MediaTypeVideo; return MediaTypeVideo;
} }
HistoryMedia *clone() const { HistoryMedia *clone() const override {
return new HistoryVideo(*this); return new HistoryVideo(*this);
} }
void initDimensions(const HistoryItem *parent); void initDimensions(const HistoryItem *parent) override;
int32 resize(int32 width, const HistoryItem *parent); int32 resize(int32 width, const HistoryItem *parent) override;
void draw(Painter &p, const HistoryItem *parent, const QRect &r, bool selected, uint64 ms) const; void draw(Painter &p, const HistoryItem *parent, const QRect &r, bool selected, uint64 ms) const override;
void getState(TextLinkPtr &lnk, HistoryCursorState &state, int32 x, int32 y, const HistoryItem *parent) const; void getState(TextLinkPtr &lnk, HistoryCursorState &state, int32 x, int32 y, const HistoryItem *parent) const override;
const QString inDialogsText() const; const QString inDialogsText() const override;
const QString inHistoryText() const; const QString inHistoryText() const override;
DocumentData *getDocument() { DocumentData *getDocument() override {
return _data; return _data;
} }
bool uploading() const { bool uploading() const override {
return _data->uploading(); return _data->uploading();
} }
void attachToItem(HistoryItem *item) override; void attachToItem(HistoryItem *item) override;
void detachFromItem(HistoryItem *item) override; void detachFromItem(HistoryItem *item) override;
bool hasReplyPreview() const { bool hasReplyPreview() const override {
return !_data->thumb->isNull(); return !_data->thumb->isNull();
} }
ImagePtr replyPreview(); ImagePtr replyPreview() override;
QString getCaption() const { QString getCaption() const override {
return _caption.original(); return _caption.original();
} }
bool needsBubble(const HistoryItem *parent) const { bool needsBubble(const HistoryItem *parent) const override {
return !_caption.isEmpty() || parent->Is<HistoryMessageForwarded>() || parent->toHistoryReply() || parent->viaBot(); return !_caption.isEmpty() || parent->Is<HistoryMessageForwarded>() || parent->toHistoryReply() || parent->viaBot();
} }
bool customInfoLayout() const { bool customInfoLayout() const override {
return _caption.isEmpty(); return _caption.isEmpty();
} }
bool hideFromName() const { bool hideFromName() const override {
return true; return true;
} }
protected: protected:
float64 dataProgress() const { float64 dataProgress() const override {
return _data->progress(); return _data->progress();
} }
bool dataFinished() const { bool dataFinished() const override {
return !_data->loading() && !_data->uploading(); return !_data->loading() && !_data->uploading();
} }
bool dataLoaded() const { bool dataLoaded() const override {
return _data->loaded(); return _data->loaded();
} }
@ -1888,56 +1888,56 @@ public:
HistoryDocument(DocumentData *document, const QString &caption, const HistoryItem *parent); HistoryDocument(DocumentData *document, const QString &caption, const HistoryItem *parent);
HistoryDocument(const HistoryDocument &other); HistoryDocument(const HistoryDocument &other);
HistoryMediaType type() const { HistoryMediaType type() const override {
return _data->voice() ? MediaTypeVoiceFile : (_data->song() ? MediaTypeMusicFile : MediaTypeFile); return _data->voice() ? MediaTypeVoiceFile : (_data->song() ? MediaTypeMusicFile : MediaTypeFile);
} }
HistoryMedia *clone() const { HistoryMedia *clone() const override {
return new HistoryDocument(*this); return new HistoryDocument(*this);
} }
void initDimensions(const HistoryItem *parent); void initDimensions(const HistoryItem *parent) override;
int32 resize(int32 width, const HistoryItem *parent); int32 resize(int32 width, const HistoryItem *parent) override;
void draw(Painter &p, const HistoryItem *parent, const QRect &r, bool selected, uint64 ms) const; void draw(Painter &p, const HistoryItem *parent, const QRect &r, bool selected, uint64 ms) const override;
void getState(TextLinkPtr &lnk, HistoryCursorState &state, int32 x, int32 y, const HistoryItem *parent) const; void getState(TextLinkPtr &lnk, HistoryCursorState &state, int32 x, int32 y, const HistoryItem *parent) const override;
const QString inDialogsText() const; const QString inDialogsText() const override;
const QString inHistoryText() const; const QString inHistoryText() const override;
bool uploading() const { bool uploading() const override {
return _data->uploading(); return _data->uploading();
} }
DocumentData *getDocument() { DocumentData *getDocument() override {
return _data; return _data;
} }
void attachToItem(HistoryItem *item) override; void attachToItem(HistoryItem *item) override;
void detachFromItem(HistoryItem *item) override; void detachFromItem(HistoryItem *item) override;
void updateFrom(const MTPMessageMedia &media, HistoryItem *parent); void updateFrom(const MTPMessageMedia &media, HistoryItem *parent) override;
bool hasReplyPreview() const { bool hasReplyPreview() const override {
return !_data->thumb->isNull(); return !_data->thumb->isNull();
} }
ImagePtr replyPreview(); ImagePtr replyPreview() override;
QString getCaption() const { QString getCaption() const override {
if (const HistoryDocumentCaptioned *captioned = Get<HistoryDocumentCaptioned>()) { if (const HistoryDocumentCaptioned *captioned = Get<HistoryDocumentCaptioned>()) {
return captioned->_caption.original(); return captioned->_caption.original();
} }
return QString(); return QString();
} }
bool needsBubble(const HistoryItem *parent) const { bool needsBubble(const HistoryItem *parent) const override {
return true; return true;
} }
bool customInfoLayout() const { bool customInfoLayout() const override {
return false; return false;
} }
QMargins bubbleMargins() const { QMargins bubbleMargins() const override {
return Get<HistoryDocumentThumbed>() ? QMargins(st::msgFileThumbPadding.left(), st::msgFileThumbPadding.top(), st::msgFileThumbPadding.left(), st::msgFileThumbPadding.bottom()) : st::msgPadding; return Get<HistoryDocumentThumbed>() ? QMargins(st::msgFileThumbPadding.left(), st::msgFileThumbPadding.top(), st::msgFileThumbPadding.left(), st::msgFileThumbPadding.bottom()) : st::msgPadding;
} }
bool hideForwardedFrom() const { bool hideForwardedFrom() const override {
return _data->song(); return _data->song();
} }
@ -1945,13 +1945,13 @@ public:
protected: protected:
float64 dataProgress() const { float64 dataProgress() const override {
return _data->progress(); return _data->progress();
} }
bool dataFinished() const { bool dataFinished() const override {
return !_data->loading() && !_data->uploading(); return !_data->loading() && !_data->uploading();
} }
bool dataLoaded() const { bool dataLoaded() const override {
return _data->loaded(); return _data->loaded();
} }
@ -1971,30 +1971,30 @@ public:
HistoryGif(DocumentData *document, const QString &caption, const HistoryItem *parent); HistoryGif(DocumentData *document, const QString &caption, const HistoryItem *parent);
HistoryGif(const HistoryGif &other); HistoryGif(const HistoryGif &other);
HistoryMediaType type() const { HistoryMediaType type() const override {
return MediaTypeGif; return MediaTypeGif;
} }
HistoryMedia *clone() const { HistoryMedia *clone() const override {
return new HistoryGif(*this); return new HistoryGif(*this);
} }
void initDimensions(const HistoryItem *parent); void initDimensions(const HistoryItem *parent) override;
int32 resize(int32 width, const HistoryItem *parent); int32 resize(int32 width, const HistoryItem *parent) override;
void draw(Painter &p, const HistoryItem *parent, const QRect &r, bool selected, uint64 ms) const; void draw(Painter &p, const HistoryItem *parent, const QRect &r, bool selected, uint64 ms) const override;
void getState(TextLinkPtr &lnk, HistoryCursorState &state, int32 x, int32 y, const HistoryItem *parent) const; void getState(TextLinkPtr &lnk, HistoryCursorState &state, int32 x, int32 y, const HistoryItem *parent) const override;
const QString inDialogsText() const; const QString inDialogsText() const override;
const QString inHistoryText() const; const QString inHistoryText() const override;
bool uploading() const { bool uploading() const override {
return _data->uploading(); return _data->uploading();
} }
DocumentData *getDocument() { DocumentData *getDocument() override {
return _data; return _data;
} }
ClipReader *getClipReader() { ClipReader *getClipReader() override {
return gif(); return gif();
} }
@ -2004,23 +2004,23 @@ public:
void attachToItem(HistoryItem *item) override; void attachToItem(HistoryItem *item) override;
void detachFromItem(HistoryItem *item) override; void detachFromItem(HistoryItem *item) override;
void updateFrom(const MTPMessageMedia &media, HistoryItem *parent); void updateFrom(const MTPMessageMedia &media, HistoryItem *parent) override;
bool hasReplyPreview() const { bool hasReplyPreview() const override {
return !_data->thumb->isNull(); return !_data->thumb->isNull();
} }
ImagePtr replyPreview(); ImagePtr replyPreview() override;
QString getCaption() const { QString getCaption() const override {
return _caption.original(); return _caption.original();
} }
bool needsBubble(const HistoryItem *parent) const { bool needsBubble(const HistoryItem *parent) const override {
return !_caption.isEmpty() || parent->Is<HistoryMessageForwarded>() || parent->toHistoryReply() || parent->viaBot(); return !_caption.isEmpty() || parent->Is<HistoryMessageForwarded>() || parent->toHistoryReply() || parent->viaBot();
} }
bool customInfoLayout() const { bool customInfoLayout() const override {
return _caption.isEmpty(); return _caption.isEmpty();
} }
bool hideFromName() const { bool hideFromName() const override {
return true; return true;
} }
@ -2028,9 +2028,9 @@ public:
protected: protected:
float64 dataProgress() const; float64 dataProgress() const override;
bool dataFinished() const; bool dataFinished() const override;
bool dataLoaded() const; bool dataLoaded() const override;
private: private:
@ -2056,35 +2056,35 @@ class HistorySticker : public HistoryMedia {
public: public:
HistorySticker(DocumentData *document); HistorySticker(DocumentData *document);
HistoryMediaType type() const { HistoryMediaType type() const override {
return MediaTypeSticker; return MediaTypeSticker;
} }
HistoryMedia *clone() const { HistoryMedia *clone() const override {
return new HistorySticker(*this); return new HistorySticker(*this);
} }
void initDimensions(const HistoryItem *parent); void initDimensions(const HistoryItem *parent) override;
int32 resize(int32 width, const HistoryItem *parent); int32 resize(int32 width, const HistoryItem *parent) override;
void draw(Painter &p, const HistoryItem *parent, const QRect &r, bool selected, uint64 ms) const; void draw(Painter &p, const HistoryItem *parent, const QRect &r, bool selected, uint64 ms) const override;
void getState(TextLinkPtr &lnk, HistoryCursorState &state, int32 x, int32 y, const HistoryItem *parent) const; void getState(TextLinkPtr &lnk, HistoryCursorState &state, int32 x, int32 y, const HistoryItem *parent) const override;
const QString inDialogsText() const; const QString inDialogsText() const override;
const QString inHistoryText() const; const QString inHistoryText() const override;
DocumentData *getDocument() { DocumentData *getDocument() override {
return _data; return _data;
} }
void attachToItem(HistoryItem *item) override; void attachToItem(HistoryItem *item) override;
void detachFromItem(HistoryItem *item) override; void detachFromItem(HistoryItem *item) override;
void updateFrom(const MTPMessageMedia &media, HistoryItem *parent); void updateFrom(const MTPMessageMedia &media, HistoryItem *parent) override;
bool needsBubble(const HistoryItem *parent) const { bool needsBubble(const HistoryItem *parent) const override {
return false; return false;
} }
bool customInfoLayout() const { bool customInfoLayout() const override {
return true; return true;
} }
@ -2120,30 +2120,30 @@ class HistoryContact : public HistoryMedia {
public: public:
HistoryContact(int32 userId, const QString &first, const QString &last, const QString &phone); HistoryContact(int32 userId, const QString &first, const QString &last, const QString &phone);
HistoryMediaType type() const { HistoryMediaType type() const override {
return MediaTypeContact; return MediaTypeContact;
} }
HistoryMedia *clone() const { HistoryMedia *clone() const override {
return new HistoryContact(_userId, _fname, _lname, _phone); return new HistoryContact(_userId, _fname, _lname, _phone);
} }
void initDimensions(const HistoryItem *parent); void initDimensions(const HistoryItem *parent) override;
void draw(Painter &p, const HistoryItem *parent, const QRect &r, bool selected, uint64 ms) const; void draw(Painter &p, const HistoryItem *parent, const QRect &r, bool selected, uint64 ms) const override;
void getState(TextLinkPtr &lnk, HistoryCursorState &state, int32 x, int32 y, const HistoryItem *parent) const; void getState(TextLinkPtr &lnk, HistoryCursorState &state, int32 x, int32 y, const HistoryItem *parent) const override;
const QString inDialogsText() const; const QString inDialogsText() const override;
const QString inHistoryText() const; const QString inHistoryText() const override;
void attachToItem(HistoryItem *item) override; void attachToItem(HistoryItem *item) override;
void detachFromItem(HistoryItem *item) override; void detachFromItem(HistoryItem *item) override;
void updateFrom(const MTPMessageMedia &media, HistoryItem *parent); void updateFrom(const MTPMessageMedia &media, HistoryItem *parent) override;
bool needsBubble(const HistoryItem *parent) const { bool needsBubble(const HistoryItem *parent) const override {
return true; return true;
} }
bool customInfoLayout() const { bool customInfoLayout() const override {
return false; return false;
} }
@ -2176,32 +2176,32 @@ public:
HistoryWebPage(WebPageData *data); HistoryWebPage(WebPageData *data);
HistoryWebPage(const HistoryWebPage &other); HistoryWebPage(const HistoryWebPage &other);
HistoryMediaType type() const { HistoryMediaType type() const override {
return MediaTypeWebPage; return MediaTypeWebPage;
} }
HistoryMedia *clone() const { HistoryMedia *clone() const override {
return new HistoryWebPage(*this); return new HistoryWebPage(*this);
} }
void initDimensions(const HistoryItem *parent); void initDimensions(const HistoryItem *parent) override;
int32 resize(int32 width, const HistoryItem *parent); int32 resize(int32 width, const HistoryItem *parent) override;
void draw(Painter &p, const HistoryItem *parent, const QRect &r, bool selected, uint64 ms) const; void draw(Painter &p, const HistoryItem *parent, const QRect &r, bool selected, uint64 ms) const override;
void getState(TextLinkPtr &lnk, HistoryCursorState &state, int32 x, int32 y, const HistoryItem *parent) const; void getState(TextLinkPtr &lnk, HistoryCursorState &state, int32 x, int32 y, const HistoryItem *parent) const override;
const QString inDialogsText() const; const QString inDialogsText() const override;
const QString inHistoryText() const; const QString inHistoryText() const override;
void linkOver(HistoryItem *parent, const TextLinkPtr &lnk); void linkOver(HistoryItem *parent, const TextLinkPtr &lnk) override;
void linkOut(HistoryItem *parent, const TextLinkPtr &lnk); void linkOut(HistoryItem *parent, const TextLinkPtr &lnk) override;
bool isDisplayed() const { bool isDisplayed() const override {
return !_data->pendingTill; return !_data->pendingTill;
} }
DocumentData *getDocument() { DocumentData *getDocument() override {
return _attach ? _attach->getDocument() : 0; return _attach ? _attach->getDocument() : 0;
} }
ClipReader *getClipReader() { ClipReader *getClipReader() override {
return _attach ? _attach->getClipReader() : 0; return _attach ? _attach->getClipReader() : 0;
} }
bool playInline(HistoryItem *item, bool autoplay) override { bool playInline(HistoryItem *item, bool autoplay) override {
@ -2214,19 +2214,19 @@ public:
void attachToItem(HistoryItem *item) override; void attachToItem(HistoryItem *item) override;
void detachFromItem(HistoryItem *item) override; void detachFromItem(HistoryItem *item) override;
bool hasReplyPreview() const { bool hasReplyPreview() const override {
return (_data->photo && !_data->photo->thumb->isNull()) || (_data->doc && !_data->doc->thumb->isNull()); return (_data->photo && !_data->photo->thumb->isNull()) || (_data->doc && !_data->doc->thumb->isNull());
} }
ImagePtr replyPreview(); ImagePtr replyPreview() override;
WebPageData *webpage() { WebPageData *webpage() {
return _data; return _data;
} }
bool needsBubble(const HistoryItem *parent) const { bool needsBubble(const HistoryItem *parent) const override {
return true; return true;
} }
bool customInfoLayout() const { bool customInfoLayout() const override {
return false; return false;
} }
@ -2374,7 +2374,7 @@ public:
void initMediaFromDocument(DocumentData *doc, const QString &caption); void initMediaFromDocument(DocumentData *doc, const QString &caption);
void fromNameUpdated(int32 width) const; void fromNameUpdated(int32 width) const;
virtual UserData *viaBot() const { virtual UserData *viaBot() const override {
if (const HistoryMessageVia *via = Get<HistoryMessageVia>()) { if (const HistoryMessageVia *via = Get<HistoryMessageVia>()) {
return via->_bot; return via->_bot;
} }
@ -2390,7 +2390,7 @@ public:
bool drawBubble() const { bool drawBubble() const {
return _media ? (!emptyText() || _media->needsBubble(this)) : true; return _media ? (!emptyText() || _media->needsBubble(this)) : true;
} }
bool hasBubble() const { bool hasBubble() const override {
return drawBubble(); return drawBubble();
} }
bool displayFromName() const { bool displayFromName() const {
@ -2403,35 +2403,35 @@ public:
return _media && _media->uploading(); return _media && _media->uploading();
} }
void drawInfo(Painter &p, int32 right, int32 bottom, int32 width, bool selected, InfoDisplayType type) const; void drawInfo(Painter &p, int32 right, int32 bottom, int32 width, bool selected, InfoDisplayType type) const override;
void setViewsCount(int32 count); void setViewsCount(int32 count) override;
void setId(MsgId newId); void setId(MsgId newId) override;
void draw(Painter &p, const QRect &r, uint32 selection, uint64 ms) const override; void draw(Painter &p, const QRect &r, uint32 selection, uint64 ms) const override;
virtual void drawMessageText(Painter &p, QRect trect, uint32 selection) const; virtual void drawMessageText(Painter &p, QRect trect, uint32 selection) const;
void destroy(); void destroy() override;
bool hasPoint(int32 x, int32 y) const; bool hasPoint(int32 x, int32 y) const override;
bool pointInTime(int32 right, int32 bottom, int32 x, int32 y, InfoDisplayType type) const; bool pointInTime(int32 right, int32 bottom, int32 x, int32 y, InfoDisplayType type) const override;
void getState(TextLinkPtr &lnk, HistoryCursorState &state, int32 x, int32 y) const; void getState(TextLinkPtr &lnk, HistoryCursorState &state, int32 x, int32 y) const override;
virtual void getStateFromMessageText(TextLinkPtr &lnk, HistoryCursorState &state, int32 x, int32 y, const QRect &r) const; virtual void getStateFromMessageText(TextLinkPtr &lnk, HistoryCursorState &state, int32 x, int32 y, const QRect &r) const;
void getSymbol(uint16 &symbol, bool &after, bool &upon, int32 x, int32 y) const; void getSymbol(uint16 &symbol, bool &after, bool &upon, int32 x, int32 y) const override;
uint32 adjustSelection(uint16 from, uint16 to, TextSelectType type) const { uint32 adjustSelection(uint16 from, uint16 to, TextSelectType type) const override {
return _text.adjustSelection(from, to, type); return _text.adjustSelection(from, to, type);
} }
void linkOver(const TextLinkPtr &lnk) { void linkOver(const TextLinkPtr &lnk) override {
if (_media) _media->linkOver(this, lnk); if (_media) _media->linkOver(this, lnk);
} }
void linkOut(const TextLinkPtr &lnk) { void linkOut(const TextLinkPtr &lnk) override {
if (_media) _media->linkOut(this, lnk); if (_media) _media->linkOut(this, lnk);
} }
void drawInDialog(Painter &p, const QRect &r, bool act, const HistoryItem *&cacheFor, Text &cache) const; void drawInDialog(Painter &p, const QRect &r, bool act, const HistoryItem *&cacheFor, Text &cache) const override;
QString notificationHeader() const; QString notificationHeader() const override;
QString notificationText() const; QString notificationText() const override;
void updateMedia(const MTPMessageMedia *media, bool edited = false) override { void updateMedia(const MTPMessageMedia *media, bool edited = false) override {
if (!edited && media && _media && _media->type() != MediaTypeWebPage) { if (!edited && media && _media && _media->type() != MediaTypeWebPage) {
@ -2441,19 +2441,19 @@ public:
} }
setPendingInitDimensions(); setPendingInitDimensions();
} }
int32 addToOverview(AddToOverviewMethod method); int32 addToOverview(AddToOverviewMethod method) override;
void eraseFromOverview(); void eraseFromOverview();
QString selectedText(uint32 selection) const; QString selectedText(uint32 selection) const override;
QString inDialogsText() const; QString inDialogsText() const override;
HistoryMedia *getMedia(bool inOverview = false) const; HistoryMedia *getMedia(bool inOverview = false) const override;
void setMedia(const MTPMessageMedia *media); void setMedia(const MTPMessageMedia *media);
void setText(const QString &text, const EntitiesInText &entities); void setText(const QString &text, const EntitiesInText &entities) override;
QString originalText() const; QString originalText() const override;
EntitiesInText originalEntities() const; EntitiesInText originalEntities() const override;
bool textHasLinks(); bool textHasLinks() override;
int32 infoWidth() const { int32 infoWidth() const override {
int32 result = _timeWidth; int32 result = _timeWidth;
if (const HistoryMessageViews *views = Get<HistoryMessageViews>()) { if (const HistoryMessageViews *views = Get<HistoryMessageViews>()) {
result += st::msgDateViewsSpace + views->_viewsWidth + st::msgDateCheckSpace + st::msgViewsImg.pxWidth(); result += st::msgDateViewsSpace + views->_viewsWidth + st::msgDateCheckSpace + st::msgViewsImg.pxWidth();
@ -2465,7 +2465,7 @@ public:
} }
return result; return result;
} }
int32 timeLeft() const { int32 timeLeft() const override {
int32 result = 0; int32 result = 0;
if (const HistoryMessageViews *views = Get<HistoryMessageViews>()) { if (const HistoryMessageViews *views = Get<HistoryMessageViews>()) {
result += st::msgDateViewsSpace + views->_viewsWidth + st::msgDateCheckSpace + st::msgViewsImg.pxWidth(); result += st::msgDateViewsSpace + views->_viewsWidth + st::msgDateCheckSpace + st::msgViewsImg.pxWidth();
@ -2474,21 +2474,21 @@ public:
} }
return result; return result;
} }
int32 timeWidth() const { int32 timeWidth() const override {
return _timeWidth; return _timeWidth;
} }
int32 viewsCount() const { int32 viewsCount() const override {
if (const HistoryMessageViews *views = Get<HistoryMessageViews>()) { if (const HistoryMessageViews *views = Get<HistoryMessageViews>()) {
return views->_views; return views->_views;
} }
return HistoryItem::viewsCount(); return HistoryItem::viewsCount();
} }
HistoryMessage *toHistoryMessage() { // dynamic_cast optimize HistoryMessage *toHistoryMessage() override { // dynamic_cast optimize
return this; return this;
} }
const HistoryMessage *toHistoryMessage() const { // dynamic_cast optimize const HistoryMessage *toHistoryMessage() const override { // dynamic_cast optimize
return this; return this;
} }

2
Telegram/SourceFiles/localstorage.cpp
View file

@ -3641,7 +3641,7 @@ namespace Local {
flags = flagsData; flags = flagsData;
} else { } else {
// flagsData was haveLeft // flagsData was haveLeft
flags = (flagsData == 1 ? MTPDchat::Flags(MTPDchat::Flag::f_left) : 0); flags = (flagsData == 1) ? MTPDchat::Flags(MTPDchat::Flag::f_left) : MTPDchat::Flags(0);
} }
if (!wasLoaded) { if (!wasLoaded) {
chat->updateName(name, QString(), QString()); chat->updateName(name, QString(), QString());

4
Telegram/SourceFiles/mtproto/mtpConnection.h
View file

@ -207,7 +207,7 @@ public slots:
protected: protected:
void socketPacket(const char *packet, uint32 length); void socketPacket(const char *packet, uint32 length) override;
private: private:
@ -269,7 +269,7 @@ public slots:
protected: protected:
void socketPacket(const char *packet, uint32 length); void socketPacket(const char *packet, uint32 length) override;
private: private:

2
Telegram/SourceFiles/pspecific_mac.cpp
View file

@ -502,7 +502,7 @@ void PsMainWindow::psNotifyShown(NotifyWindow *w) {
void PsMainWindow::psPlatformNotify(HistoryItem *item, int32 fwdCount) { void PsMainWindow::psPlatformNotify(HistoryItem *item, int32 fwdCount) {
QString title = (!App::passcoded() && cNotifyView() <= dbinvShowName) ? item->history()->peer->name : qsl("Telegram Desktop"); QString title = (!App::passcoded() && cNotifyView() <= dbinvShowName) ? item->history()->peer->name : qsl("Telegram Desktop");
QString subtitle = (!App::passcoded() && cNotifyView() <= dbinvShowName) ? item->notificationHeader() : QString(); QString subtitle = (!App::passcoded() && cNotifyView() <= dbinvShowName) ? item->notificationHeader() : QString();
QPixmap pix = (!App::passcoded() && cNotifyView() <= dbinvShowName) ? item->history()->peer->photo->pix(st::notifyMacPhotoSize) : QPixmap(); QPixmap pix = (!App::passcoded() && cNotifyView() <= dbinvShowName) ? item->history()->peer->genUserpic(st::notifyMacPhotoSize) : QPixmap();
QString msg = (!App::passcoded() && cNotifyView() <= dbinvShowPreview) ? (fwdCount < 2 ? item->notificationText() : lng_forward_messages(lt_count, fwdCount)) : lang(lng_notification_preview); QString msg = (!App::passcoded() && cNotifyView() <= dbinvShowPreview) ? (fwdCount < 2 ? item->notificationText() : lng_forward_messages(lt_count, fwdCount)) : lang(lng_notification_preview);
_private.showNotify(item->history()->peer->id, item->id, pix, title, subtitle, msg, !App::passcoded() && (cNotifyView() <= dbinvShowPreview)); _private.showNotify(item->history()->peer->id, item->id, pix, title, subtitle, msg, !App::passcoded() && (cNotifyView() <= dbinvShowPreview));

4
Telegram/SourceFiles/structs.cpp
View file

@ -187,6 +187,10 @@ void PeerData::saveUserpic(const QString &path) const {
currentUserpic()->pixCircled().save(path, "PNG"); currentUserpic()->pixCircled().save(path, "PNG");
} }
QPixmap PeerData::genUserpic(int size) const {
return currentUserpic()->pixCircled(size, size);
}
const Text &BotCommand::descriptionText() const { const Text &BotCommand::descriptionText() const {
if (_descriptionText.isEmpty() && !_description.isEmpty()) { if (_descriptionText.isEmpty() && !_description.isEmpty()) {
_descriptionText.setText(st::mentionFont, _description, _textNameOptions); _descriptionText.setText(st::mentionFont, _description, _textNameOptions);

1
Telegram/SourceFiles/structs.h
View file

@ -286,6 +286,7 @@ public:
} }
StorageKey userpicUniqueKey() const; StorageKey userpicUniqueKey() const;
void saveUserpic(const QString &path) const; void saveUserpic(const QString &path) const;
QPixmap genUserpic(int size) const;
PhotoId photoId; PhotoId photoId;
StorageImageLocation photoLoc; StorageImageLocation photoLoc;