From fc02f96ef1c815c144fd673e4a3881ec5d6701aa Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 11 Jan 2016 12:45:07 +0800 Subject: [PATCH] via @bot fixed in forwarded, stickers requested in stickersbox, sticker not autoselected in dropdown, forwarded messages to chats fixed from_id and via_bot_id --- Telegram/SourceFiles/boxes/stickersetbox.cpp | 1 + Telegram/SourceFiles/dropdown.cpp | 2 +- Telegram/SourceFiles/history.cpp | 18 +++++++++++++----- Telegram/SourceFiles/history.h | 7 +++++++ Telegram/SourceFiles/structs.h | 4 ---- 5 files changed, 22 insertions(+), 10 deletions(-) diff --git a/Telegram/SourceFiles/boxes/stickersetbox.cpp b/Telegram/SourceFiles/boxes/stickersetbox.cpp index d8112e530..442475595 100644 --- a/Telegram/SourceFiles/boxes/stickersetbox.cpp +++ b/Telegram/SourceFiles/boxes/stickersetbox.cpp @@ -727,6 +727,7 @@ StickersBox::StickersBox() : ItemListBox(st::boxScroll) setMaxHeight(snap(countHeight(), int32(st::sessionsHeight), int32(st::boxMaxListHeight))); connect(App::main(), SIGNAL(stickersUpdated()), this, SLOT(onStickersUpdated())); + App::main()->updateStickers(); connect(&_cancel, SIGNAL(clicked()), this, SLOT(onClose())); connect(&_save, SIGNAL(clicked()), this, SLOT(onSave())); diff --git a/Telegram/SourceFiles/dropdown.cpp b/Telegram/SourceFiles/dropdown.cpp index 0c706f7dc..d16cb8c21 100644 --- a/Telegram/SourceFiles/dropdown.cpp +++ b/Telegram/SourceFiles/dropdown.cpp @@ -4030,7 +4030,7 @@ void MentionsInner::mouseMoveEvent(QMouseEvent *e) { void MentionsInner::clearSel() { _mouseSel = _overDelete = false; - setSel((_mrows->isEmpty() && _brows->isEmpty() && _hrows->isEmpty() && _srows->isEmpty()) ? -1 : 0); + setSel((_mrows->isEmpty() && _brows->isEmpty() && _hrows->isEmpty()) ? -1 : 0); } bool MentionsInner::moveSel(int key) { diff --git a/Telegram/SourceFiles/history.cpp b/Telegram/SourceFiles/history.cpp index 8f49eed68..ef73e71ac 100644 --- a/Telegram/SourceFiles/history.cpp +++ b/Telegram/SourceFiles/history.cpp @@ -6578,17 +6578,18 @@ int32 HistoryMessage::resize(int32 width) { if (media) _height += _media->resize(width, this); } - int32 l = 0, w = 0; - countPositionAndSize(l, w); - if (displayFromName()) { if (emptyText()) { _height += st::msgPadding.top() + st::msgNameFont->height + st::mediaHeaderSkip; } else { _height += st::msgNameFont->height; } + int32 l = 0, w = 0; + countPositionAndSize(l, w); fromNameUpdated(w); } else if (via() && !toHistoryForwarded()) { + int32 l = 0, w = 0; + countPositionAndSize(l, w); via()->resize(w - st::msgPadding.left() - st::msgPadding.right()); if (emptyText() && !displayFromName()) { _height += st::msgPadding.top() + st::msgNameFont->height + st::mediaHeaderSkip; @@ -6788,7 +6789,7 @@ HistoryForwarded::HistoryForwarded(History *history, HistoryBlock *block, const } HistoryForwarded::HistoryForwarded(History *history, HistoryBlock *block, MsgId id, QDateTime date, int32 from, HistoryMessage *msg) -: HistoryMessage(history, block, id, newMessageFlags(history->peer) | (!history->peer->isChannel() && msg->getMedia() && (msg->getMedia()->type() == MediaTypeAudio/* || msg->getMedia()->type() == MediaTypeVideo*/) ? MTPDmessage::flag_media_unread : 0), msg->via() ? peerToUser(msg->viaBot()->id) : 0, date, from, msg->HistoryMessage::originalText(), msg->HistoryMessage::originalEntities(), msg->getMedia()) +: HistoryMessage(history, block, id, newForwardedFlags(history->peer, from, msg), msg->via() ? peerToUser(msg->viaBot()->id) : 0, date, from, msg->HistoryMessage::originalText(), msg->HistoryMessage::originalEntities(), msg->getMedia()) , fwdDate(msg->dateForwarded()) , fwdFrom(msg->fromForwarded()) , fwdFromVersion(fwdFrom->nameVersion) @@ -6818,6 +6819,11 @@ void HistoryForwarded::initDimensions() { void HistoryForwarded::fwdNameUpdated() const { QString fwdName((via() && fwdFrom->isUser()) ? fwdFrom->asUser()->firstName : App::peerName(fwdFrom)); fwdFromName.setText(st::msgServiceNameFont, fwdName, _textNameOptions); + if (via()) { + int32 l = 0, w = 0; + countPositionAndSize(l, w); + via()->resize(w - st::msgPadding.left() - st::msgPadding.right() - fromWidth - fwdFromName.maxWidth() - st::msgServiceFont->spacew); + } } void HistoryForwarded::draw(Painter &p, const QRect &r, uint32 selection, uint64 ms) const { @@ -6870,7 +6876,9 @@ int32 HistoryForwarded::resize(int32 width) { _height += st::msgServiceNameFont->height; } if (via()) { - via()->resize(width - st::msgPadding.left() - st::msgPadding.right() - fromWidth - fwdFromName.maxWidth() - st::msgServiceFont->spacew); + int32 l = 0, w = 0; + countPositionAndSize(l, w); + via()->resize(w - st::msgPadding.left() - st::msgPadding.right() - fromWidth - fwdFromName.maxWidth() - st::msgServiceFont->spacew); } } } diff --git a/Telegram/SourceFiles/history.h b/Telegram/SourceFiles/history.h index f176fc6f3..360d2cedc 100644 --- a/Telegram/SourceFiles/history.h +++ b/Telegram/SourceFiles/history.h @@ -2235,6 +2235,13 @@ protected: }; +inline int32 newMessageFlags(PeerData *p) { + return p->isSelf() ? 0 : (((p->isChat() || (p->isUser() && !p->asUser()->botInfo)) ? MTPDmessage::flag_unread : 0) | MTPDmessage::flag_out); +} +inline int32 newForwardedFlags(PeerData *p, int32 from, HistoryMessage *msg) { + return newMessageFlags(p) | (from ? MTPDmessage::flag_from_id : 0) | (msg->via() ? MTPDmessage::flag_via_bot_id : 0) | (!p->isChannel() && msg->getMedia() && (msg->getMedia()->type() == MediaTypeAudio/* || msg->getMedia()->type() == MediaTypeVideo*/) ? MTPDmessage::flag_media_unread : 0); +} + class HistoryServiceMsg : public HistoryItem { public: diff --git a/Telegram/SourceFiles/structs.h b/Telegram/SourceFiles/structs.h index 4da22636d..8de9bf0c5 100644 --- a/Telegram/SourceFiles/structs.h +++ b/Telegram/SourceFiles/structs.h @@ -717,10 +717,6 @@ inline bool PeerData::canWrite() const { return isChannel() ? asChannel()->canWrite() : (isChat() ? asChat()->canWrite() : (isUser() ? asUser()->canWrite() : false)); } -inline int32 newMessageFlags(PeerData *p) { - return p->isSelf() ? 0 : (((p->isChat() || (p->isUser() && !p->asUser()->botInfo)) ? MTPDmessage::flag_unread : 0) | MTPDmessage::flag_out); -} - enum ActionOnLoad { ActionOnLoadNone, ActionOnLoadOpen,