diff --git a/Telegram/Resources/style.txt b/Telegram/Resources/style.txt index 0ba857233..51ed821c8 100644 --- a/Telegram/Resources/style.txt +++ b/Telegram/Resources/style.txt @@ -156,9 +156,9 @@ sysUnlock: sysButton(sysUpd) { img: sprite(207px, 22px, 19px, 19px); } titleBackButton: iconedButton(btnDefIconed) { - icon: sprite(113px, 108px, 13px, 20px); + icon: sprite(9px, 104px, 13px, 20px); iconPos: point(5px, 9px); - downIcon: sprite(113px, 108px, 13px, 20px); + downIcon: sprite(9px, 104px, 13px, 20px); downIconPos: point(5px, 10px); bgColor: #c4d8e9; @@ -259,12 +259,12 @@ cbDefFlat: flatCheckbox { disabledCursor: cursor(default); - imageRect: sprite(140px, 68px, 22px, 22px); - chkImageRect: sprite(115px, 68px, 22px, 22px); - overImageRect: sprite(190px, 68px, 22px, 22px); - chkOverImageRect: sprite(115px, 68px, 22px, 22px); - disImageRect: sprite(140px, 43px, 22px, 22px); - chkDisImageRect: sprite(115px, 43px, 22px, 22px); + imageRect: sprite(142px, 43px, 22px, 22px); + chkImageRect: sprite(120px, 68px, 22px, 22px); + overImageRect: sprite(142px, 68px, 22px, 22px); + chkOverImageRect: sprite(120px, 68px, 22px, 22px); + disImageRect: sprite(142px, 43px, 22px, 22px); + chkDisImageRect: sprite(120px, 43px, 22px, 22px); imagePos: point(0px, 0px); } @@ -715,12 +715,14 @@ dlgActiveDblCheckImg: sprite(302px, 36px, 17px, 11px); dlgActiveCheckImg: sprite(320px, 36px, 17px, 11px); dlgSendImg: sprite(122px, 25px, 17px, 11px); dlgActiveSendImg: sprite(142px, 25px, 17px, 11px); -dlgChatImg: sprite(302px, 51px, 16px, 11px); -dlgActiveChatImg: sprite(322px, 51px, 16px, 11px); -dlgChatImgLeft: 1px; -dlgChatImgTop: 4px; -dlgChatImgSkip: 22px; +dlgChatImgPos: point(1px, 4px); +dlgChatImg: sprite(104px, 26px, 16px, 11px); +dlgActiveChatImg: sprite(104px, 37px, 16px, 11px); +dlgChannelImgPos: point(2px, 3px); +dlgChannelImg: sprite(104px, 0px, 14px, 13px); +dlgActiveChannelImg: sprite(104px, 13px, 14px, 13px); +dlgImgSkip: 22px; dlgCheckLeft: 5px; dlgCheckTop: 4px; @@ -757,8 +759,8 @@ topBarBG: white; topBarDuration: 200; topBarForwardPadding: margins(17px, 8px, 39px, 8px); topBarForwardAlpha: 0.6; -topBarForwardImg: sprite(45px, 112px, 9px, 16px); -topBarBackwardImg: sprite(35px, 112px, 9px, 16px); +topBarForwardImg: sprite(31px, 104px, 9px, 16px); +topBarBackwardImg: sprite(22px, 104px, 9px, 16px); topBarBackPadding: margins(15px, 7px, 9px, 7px); topBarBackAlpha: 0.8; topBarBackImg: sprite(65px, 112px, 9px, 16px); @@ -873,19 +875,30 @@ msgPtr: 8px; msgBG: ':/gui/art/bg.jpg'; msgBG0: ':/gui/art/bg0.png'; -msgSendingRect: sprite(260px, 20px, 20px, 20px); -msgCheckRect: sprite(320px, 0px, 20px, 20px); -msgCheckPos: point(5px, 1px); -msgDblCheckRect: sprite(300px, 0px, 20px, 20px); -msgSelectCheckRect: sprite(160px, 0px, 20px, 20px); -msgSelectDblCheckRect: sprite(140px, 0px, 20px, 20px); +msgCheckPos: point(3px, 1px); +msgSendingImg: sprite(260px, 20px, 20px, 20px); +msgCheckImg: sprite(320px, 0px, 20px, 20px); +msgDblCheckImg: sprite(300px, 0px, 20px, 20px); +msgSelectCheckImg: sprite(162px, 0px, 20px, 20px); +msgSelectDblCheckImg: sprite(142px, 0px, 20px, 20px); +msgViewsPos: point(0px, -4px); +msgViewsImg: sprite(104px, 48px, 16px, 11px); +msgSelectViewsImg: sprite(104px, 70px, 16px, 11px); +msgOutViewsImg: sprite(104px, 81px, 16px, 11px); +msgSelectOutViewsImg: sprite(104px, 92px, 16px, 11px); +msgSendingViewsImg: sprite(104px, 103px, 16px, 11px); +msgSendingOutViewsImg: sprite(104px, 125px, 16px, 11px); +msgInvSendingImg: sprite(320px, 65px, 20px, 20px); +msgInvCheckImg: sprite(280px, 20px, 20px, 20px); +msgInvDblCheckImg: sprite(300px, 65px, 20px, 20px); +msgInvViewsImg: sprite(104px, 59px, 16px, 11px); +msgInvSendingViewsImg: sprite(104px, 114px, 16px, 11px); + msgDateSpace: 19px; msgDateCheckSpace: 4px; +msgDateViewsSpace: 11px; msgDateDelta: point(2px, 5px); -msgImgSendingRect: sprite(320px, 65px, 20px, 20px); -msgImgCheckRect: sprite(280px, 20px, 20px, 20px); -msgImgDblCheckRect: sprite(300px, 65px, 20px, 20px); msgDateImgDelta: 4px; msgDateImgColor: #fff; msgDateImgBg: #00000054; @@ -1027,8 +1040,8 @@ btnAttachDocument: iconedButton(btnDefIconed) { height: 46px; } btnAttachPhoto: iconedButton(btnAttachDocument) { - icon: sprite(113px, 0px, 24px, 24px); - downIcon: sprite(113px, 0px, 24px, 24px); + icon: sprite(118px, 0px, 24px, 24px); + downIcon: sprite(118px, 0px, 24px, 24px); } btnAttachEmoji: iconedButton(btnAttachDocument) { overBgColor: white; @@ -1057,6 +1070,8 @@ btnBotKbHide: iconedButton(btnAttachEmoji) { downIcon: sprite(373px, 95px, 23px, 14px); downIconPos: point(5px, 17px); } +broadcastToggle: sprite(40px, 104px, 22px, 21px); +broadcastToggleOn: sprite(40px, 125px, 22px, 21px); btnRecordAudio: sprite(379px, 390px, 16px, 24px); btnRecordAudioActive: sprite(379px, 366px, 16px, 24px); recordSignalColor: #f17077; @@ -1258,7 +1273,7 @@ profileListStatusBottom: 6px; profileHoverBG: #f5f5f5; profileActiveBG: #6294b9; profileSubFont: font(fsize); -profileCheckRect: sprite(88px, 108px, 24px, 24px); +profileCheckRect: sprite(78px, 114px, 24px, 24px); profileCheckActiveRect: sprite(128px, 108px, 24px, 24px); profileCheckDeltaX: 18px; profileCheckDeltaY: 1px; @@ -1419,7 +1434,7 @@ contactsClose: flatButton { font: font(16px); overFont: font(16px); } -contactsImg: sprite(45px, 112px, 9px, 16px); +contactsImg: sprite(31px, 104px, 9px, 16px); contactsAdd: flatButton(topBarButton) { width: -40px; height: 52px; @@ -1429,7 +1444,7 @@ contactsAdd: flatButton(topBarButton) { downTextTop: 19px; } -aboutIcon: sprite(2px, 2px, 104px, 104px); +aboutIcon: sprite(0px, 0px, 104px, 104px); aboutIconTop: 28px; aboutWidth: 448px; aboutHeight: 441px; @@ -1499,8 +1514,8 @@ dropdownAttachDocument: iconedButton(btnAttachDocument) { downTextPos: point(50px, 14px); } dropdownAttachPhoto: iconedButton(dropdownAttachDocument) { - icon: sprite(113px, 0px, 24px, 24px); - downIcon: sprite(113px, 0px, 24px, 24px); + icon: sprite(118px, 0px, 24px, 24px); + downIcon: sprite(118px, 0px, 24px, 24px); } dropdownMediaPhotos: iconedButton(dropdownAttachPhoto) { width: 200px; @@ -1552,7 +1567,7 @@ dpiSlider: slider { thikness: 2px; width: 260px; - bar: sprite(6px, 110px, 9px, 22px); + bar: sprite(0px, 104px, 9px, 22px); } dpiActive: black; dpiInactive: #999; @@ -1738,7 +1753,7 @@ emojiSwitchColor: #42a8db; stickerPanSize: size(64px, 64px); stickerPanPadding: 11px; -stickerPanDelete: sprite(123px, 132px, 12px, 12px); +stickerPanDelete: sprite(128px, 132px, 12px, 12px); stickerPanDeleteOpacity: 0.5; stickerIconPadding: 3px; stickerIconOpacity: 0.7; @@ -1880,7 +1895,7 @@ medviewSaveMsgShown: 2000; medviewSaveMsgHiding: 2500; medviewSaveMsg: #000000b2; -mvTransparentBrush: sprite(113px, 128px, 8px, 8px); +mvTransparentBrush: sprite(9px, 124px, 8px, 8px); overviewPhotoSkip: 10px; overviewPhotoMinSize: 100px; diff --git a/Telegram/SourceFiles/app.cpp b/Telegram/SourceFiles/app.cpp index b3733dbb5..41f2969df 100644 --- a/Telegram/SourceFiles/app.cpp +++ b/Telegram/SourceFiles/app.cpp @@ -746,7 +746,7 @@ namespace App { } } - void checkEntitiesUpdate(const MTPDmessage &m) { + void checkEntitiesAndViewsUpdate(const MTPDmessage &m) { PeerId peerId = peerFromMTP(m.vto_id); if (m.has_from_id() && peerToUser(peerId) == MTP::authedId()) { peerId = peerFromUser(m.vfrom_id); @@ -761,6 +761,8 @@ namespace App { existing->history()->addToOverview(existing, OverviewLinks); } } + + existing->setViewsCount(m.has_views() ? m.vviews.v : -1); } } @@ -774,7 +776,7 @@ namespace App { const MTPDmessage &d(msg.c_message()); msgsIds.insert((uint64(uint32(d.vid.v)) << 32) | uint64(i), i); if (msgsState == 1) { // new message, index my forwarded messages to links overview - checkEntitiesUpdate(d); + checkEntitiesAndViewsUpdate(d); } } break; case mtpc_messageEmpty: msgsIds.insert((uint64(uint32(msg.c_messageEmpty().vid.v)) << 32) | uint64(i), i); break; diff --git a/Telegram/SourceFiles/app.h b/Telegram/SourceFiles/app.h index e2370ced4..b2d30dadb 100644 --- a/Telegram/SourceFiles/app.h +++ b/Telegram/SourceFiles/app.h @@ -102,7 +102,7 @@ namespace App { void feedParticipants(const MTPChatParticipants &p, bool requestBotInfos, bool emitPeerUpdated = true); void feedParticipantAdd(const MTPDupdateChatParticipantAdd &d, bool emitPeerUpdated = true); void feedParticipantDelete(const MTPDupdateChatParticipantDelete &d, bool emitPeerUpdated = true); - void checkEntitiesUpdate(const MTPDmessage &m); + void checkEntitiesAndViewsUpdate(const MTPDmessage &m); void feedMsgs(const MTPVector &msgs, int msgsState = 0); // 2 - new read message, 1 - new unread message, 0 - not new message, -1 - searched message void feedInboxRead(const PeerId &peer, MsgId upTo); void feedOutboxRead(const PeerId &peer, MsgId upTo); diff --git a/Telegram/SourceFiles/art/sprite.png b/Telegram/SourceFiles/art/sprite.png index 784f8a93a..281795e88 100644 Binary files a/Telegram/SourceFiles/art/sprite.png and b/Telegram/SourceFiles/art/sprite.png differ diff --git a/Telegram/SourceFiles/art/sprite_200x.png b/Telegram/SourceFiles/art/sprite_200x.png index 7ef912b1d..18c3d0f4e 100644 Binary files a/Telegram/SourceFiles/art/sprite_200x.png and b/Telegram/SourceFiles/art/sprite_200x.png differ diff --git a/Telegram/SourceFiles/boxes/contactsbox.cpp b/Telegram/SourceFiles/boxes/contactsbox.cpp index cd2253614..f6cb0da1f 100644 --- a/Telegram/SourceFiles/boxes/contactsbox.cpp +++ b/Telegram/SourceFiles/boxes/contactsbox.cpp @@ -1285,7 +1285,7 @@ void CreateGroupBox::onCreate() { _create.setDisabled(true); _name.setDisabled(true); if (_creatingChannel) { - _createRequestId = MTP::send(MTPmessages_CreateChannel(MTP_int(MTPmessages_CreateChannel_flag_broadcast), MTP_string(_name.text()), _users), rpcDone(&CreateGroupBox::created), rpcFail(&CreateGroupBox::failed)); + _createRequestId = MTP::send(MTPmessages_CreateChannel(MTP_int(MTPmessages_CreateChannel_flag_broadcast), MTP_string(_name.text()), MTP_string(""), _users), rpcDone(&CreateGroupBox::created), rpcFail(&CreateGroupBox::failed)); } else { _createRequestId = MTP::send(MTPmessages_CreateChat(_users, MTP_string(_name.text())), rpcDone(&CreateGroupBox::created), rpcFail(&CreateGroupBox::failed)); } diff --git a/Telegram/SourceFiles/dialogswidget.cpp b/Telegram/SourceFiles/dialogswidget.cpp index 2d0ed54fb..b4fd697eb 100644 --- a/Telegram/SourceFiles/dialogswidget.cpp +++ b/Telegram/SourceFiles/dialogswidget.cpp @@ -241,9 +241,12 @@ void DialogsListWidget::peopleResultPaint(PeerData *peer, QPainter &p, int32 w, QRect rectForName(nameleft, st::dlgPaddingVer + st::dlgNameTop, namewidth, st::msgNameFont->height); // draw chat icon - if (history->peer->isChat()) { // CHANNELS_UI - p.drawPixmap(QPoint(rectForName.left() + st::dlgChatImgLeft, rectForName.top() + st::dlgChatImgTop), App::sprite(), (act ? st::dlgActiveChatImg : st::dlgChatImg)); - rectForName.setLeft(rectForName.left() + st::dlgChatImgSkip); + if (history->peer->isChat()) { + p.drawPixmap(QPoint(rectForName.left() + st::dlgChatImgPos.x(), rectForName.top() + st::dlgChatImgPos.y()), App::sprite(), (act ? st::dlgActiveChatImg : st::dlgChatImg)); + rectForName.setLeft(rectForName.left() + st::dlgImgSkip); + } else if (history->peer->isChannel()) { + p.drawPixmap(QPoint(rectForName.left() + st::dlgChannelImgPos.x(), rectForName.top() + st::dlgChannelImgPos.y()), App::sprite(), (act ? st::dlgActiveChannelImg : st::dlgChannelImg)); + rectForName.setLeft(rectForName.left() + st::dlgImgSkip); } QRect tr(nameleft, st::dlgPaddingVer + st::dlgFont->height + st::dlgSep, namewidth, st::dlgFont->height); @@ -281,9 +284,12 @@ void DialogsListWidget::searchInPeerPaint(QPainter &p, int32 w) const { QRect rectForName(nameleft, st::dlgPaddingVer + st::dlgNameTop, namewidth, st::msgNameFont->height); // draw chat icon - if (_searchInPeer->isChat()) { // CHANNELS_UI - p.drawPixmap(QPoint(rectForName.left() + st::dlgChatImgLeft, rectForName.top() + st::dlgChatImgTop), App::sprite(), st::dlgChatImg); - rectForName.setLeft(rectForName.left() + st::dlgChatImgSkip); + if (_searchInPeer->isChat()) { + p.drawPixmap(QPoint(rectForName.left() + st::dlgChatImgPos.x(), rectForName.top() + st::dlgChatImgPos.y()), App::sprite(), st::dlgChatImg); + rectForName.setLeft(rectForName.left() + st::dlgImgSkip); + } else if (_searchInPeer->isChannel()) { + p.drawPixmap(QPoint(rectForName.left() + st::dlgChannelImgPos.x(), rectForName.top() + st::dlgChannelImgPos.y()), App::sprite(), st::dlgChannelImg); + rectForName.setLeft(rectForName.left() + st::dlgImgSkip); } QRect tr(nameleft, st::dlgPaddingVer + st::dlgFont->height + st::dlgSep, namewidth, st::dlgFont->height); diff --git a/Telegram/SourceFiles/history.cpp b/Telegram/SourceFiles/history.cpp index cf5ce629a..5598f5058 100644 --- a/Telegram/SourceFiles/history.cpp +++ b/Telegram/SourceFiles/history.cpp @@ -149,7 +149,7 @@ void stopGif() { animated.stop(); } -void DialogRow::paint(QPainter &p, int32 w, bool act, bool sel) const { +void DialogRow::paint(Painter &p, int32 w, bool act, bool sel) const { QRect fullRect(0, 0, w, st::dlgHeight); p.fillRect(fullRect, (act ? st::dlgActiveBG : (sel ? st::dlgHoverBG : st::dlgBG))->b); @@ -161,10 +161,11 @@ void DialogRow::paint(QPainter &p, int32 w, bool act, bool sel) const { // draw chat icon if (history->peer->isChat()) { - p.drawPixmap(QPoint(rectForName.left() + st::dlgChatImgLeft, rectForName.top() + st::dlgChatImgTop), App::sprite(), (act ? st::dlgActiveChatImg : st::dlgChatImg)); - rectForName.setLeft(rectForName.left() + st::dlgChatImgSkip); + p.drawPixmap(QPoint(rectForName.left() + st::dlgChatImgPos.x(), rectForName.top() + st::dlgChatImgPos.y()), App::sprite(), (act ? st::dlgActiveChatImg : st::dlgChatImg)); + rectForName.setLeft(rectForName.left() + st::dlgImgSkip); } else if (history->peer->isChannel()) { - // CHANNELS_UI + p.drawPixmap(QPoint(rectForName.left() + st::dlgChannelImgPos.x(), rectForName.top() + st::dlgChannelImgPos.y()), App::sprite(), (act ? st::dlgActiveChannelImg : st::dlgChannelImg)); + rectForName.setLeft(rectForName.left() + st::dlgImgSkip); } HistoryItem *last = history->lastMsg; @@ -239,7 +240,7 @@ void DialogRow::paint(QPainter &p, int32 w, bool act, bool sel) const { history->peer->dialogName().drawElided(p, rectForName.left(), rectForName.top(), rectForName.width()); } -void FakeDialogRow::paint(QPainter &p, int32 w, bool act, bool sel) const { +void FakeDialogRow::paint(Painter &p, int32 w, bool act, bool sel) const { QRect fullRect(0, 0, w, st::dlgHeight); p.fillRect(fullRect, (act ? st::dlgActiveBG : (sel ? st::dlgHoverBG : st::dlgBG))->b); @@ -253,10 +254,11 @@ void FakeDialogRow::paint(QPainter &p, int32 w, bool act, bool sel) const { // draw chat icon if (history->peer->isChat()) { - p.drawPixmap(QPoint(rectForName.left() + st::dlgChatImgLeft, rectForName.top() + st::dlgChatImgTop), App::sprite(), (act ? st::dlgActiveChatImg : st::dlgChatImg)); - rectForName.setLeft(rectForName.left() + st::dlgChatImgSkip); + p.drawPixmap(QPoint(rectForName.left() + st::dlgChatImgPos.x(), rectForName.top() + st::dlgChatImgPos.y()), App::sprite(), (act ? st::dlgActiveChatImg : st::dlgChatImg)); + rectForName.setLeft(rectForName.left() + st::dlgImgSkip); } else if (history->peer->isChannel()) { - // CHANNELS_UI + p.drawPixmap(QPoint(rectForName.left() + st::dlgChannelImgPos.x(), rectForName.top() + st::dlgChannelImgPos.y()), App::sprite(), (act ? st::dlgActiveChannelImg : st::dlgChannelImg)); + rectForName.setLeft(rectForName.left() + st::dlgImgSkip); } // draw date @@ -1884,7 +1886,7 @@ HistoryPhoto::HistoryPhoto(const MTPDphoto &photo, const QString &caption, Histo , _caption(st::minPhotoSize) , openl(new PhotoLink(data)) { if (!caption.isEmpty()) { - _caption.setText(st::msgFont, caption + textcmdSkipBlock(parent->timeWidth(true), st::msgDateFont->height - st::msgDateDelta.y()), itemTextParseOptions(parent)); + _caption.setText(st::msgFont, caption + parent->skipBlock(), itemTextParseOptions(parent)); } init(); } @@ -1901,6 +1903,8 @@ void HistoryPhoto::init() { } void HistoryPhoto::initDimensions(const HistoryItem *parent) { + if (_caption.hasSkipBlock()) _caption.setSkipBlock(parent->skipBlockWidth(), parent->skipBlockHeight()); + int32 tw = convertScale(data->full->width()), th = convertScale(data->full->height()); if (!tw || !th) { tw = th = 1; @@ -2051,9 +2055,8 @@ void HistoryPhoto::getState(TextLinkPtr &lnk, HistoryCursorState &state, int32 x height -= skipy + st::mediaPadding.bottom(); width -= st::mediaPadding.left() + st::mediaPadding.right(); if (!_caption.isEmpty()) { - int32 dateX = skipx + width + st::msgDateDelta.x() - parent->timeWidth(true) + st::msgDateSpace; - int32 dateY = _height - st::msgPadding.bottom() + st::msgDateDelta.y() - st::msgDateFont->height; - bool inDate = QRect(dateX, dateY, parent->timeWidth(true) - st::msgDateSpace, st::msgDateFont->height).contains(x, y); + int32 fullRight = skipx + width + st::mediaPadding.right(), fullBottom = _height; + bool inDate = parent->pointInTime(fullRight, fullBottom, x, y, InfoDisplayDefault); if (inDate) { state = HistoryInDateCursorState; } @@ -2069,13 +2072,8 @@ void HistoryPhoto::getState(TextLinkPtr &lnk, HistoryCursorState &state, int32 x if (x >= skipx && y >= skipy && x < skipx + width && y < skipy + height) { lnk = openl; if (_caption.isEmpty()) { - int32 dateX = skipx + width - parent->timeWidth(false) - st::msgDateImgDelta - st::msgDateImgPadding.x(); - int32 dateY = skipy + height - st::msgDateFont->height - st::msgDateImgDelta - st::msgDateImgPadding.y(); - if (parent->fromChannel()) { - } else if (parent->out()) { - dateX -= st::msgCheckRect.pxWidth() + st::msgDateImgCheckSpace; - } - bool inDate = QRect(dateX, dateY, parent->timeWidth(true) - st::msgDateSpace, st::msgDateFont->height).contains(x, y); + int32 fullRight = skipx + width + (skipx ? st::mediaPadding.right() : 0), fullBottom = _height; + bool inDate = parent->pointInTime(fullRight, fullBottom, x, y, InfoDisplayOverImage); if (inDate) { state = HistoryInDateCursorState; } @@ -2122,7 +2120,7 @@ void HistoryPhoto::updateFrom(const MTPMessageMedia &media) { } } -void HistoryPhoto::draw(QPainter &p, const HistoryItem *parent, bool selected, int32 width) const { +void HistoryPhoto::draw(Painter &p, const HistoryItem *parent, bool selected, int32 width) const { const HistoryReply *reply = toHistoryReply(parent); const HistoryForwarded *fwd = reply ? 0 : toHistoryForwarded(parent); bool fromChannel = parent->fromChannel(), out = parent->out(), outbg = out && !fromChannel; @@ -2200,61 +2198,16 @@ void HistoryPhoto::draw(QPainter &p, const HistoryItem *parent, bool selected, i } // date - QString time(parent->time()); + QString time(parent->timeText()); if (_caption.isEmpty()) { - if (time.isEmpty()) return; - int32 dateX = skipx + width - parent->timeWidth(false) - st::msgDateImgDelta - 2 * st::msgDateImgPadding.x(); - int32 dateY = skipy + height - st::msgDateFont->height - 2 * st::msgDateImgPadding.y() - st::msgDateImgDelta; - if (fromChannel) { - } else if (out) { - dateX -= st::msgCheckRect.pxWidth() + st::msgDateImgCheckSpace; - } - int32 dateW = skipx + width - dateX - st::msgDateImgDelta; - int32 dateH = skipy + height - dateY - st::msgDateImgDelta; - - App::roundRect(p, dateX, dateY, dateW, dateH, selected ? st::msgDateImgSelectBg : st::msgDateImgBg, selected ? DateSelectedCorners : DateCorners); - - p.setFont(st::msgDateFont->f); - p.setPen(st::msgDateImgColor->p); - p.drawText(dateX + st::msgDateImgPadding.x(), dateY + st::msgDateImgPadding.y() + st::msgDateFont->ascent, time); - if (fromChannel) { - } else if (out) { - QPoint iconPos(dateX - 2 + dateW - st::msgDateImgCheckSpace - st::msgCheckRect.pxWidth(), dateY + (dateH - st::msgCheckRect.pxHeight()) / 2); - const QRect *iconRect; - if (parent->id > 0) { - if (parent->unread()) { - iconRect = &st::msgImgCheckRect; - } else { - iconRect = &st::msgImgDblCheckRect; - } - } else { - iconRect = &st::msgImgSendingRect; - } - p.drawPixmap(iconPos, App::sprite(), *iconRect); - } + int32 fullRight = skipx + width + (skipx ? st::mediaPadding.right() : 0), fullBottom = _height; + parent->drawInfo(p, fullRight, fullBottom, selected, InfoDisplayOverImage); } else { p.setPen(st::black->p); _caption.draw(p, skipx, skipy + height + st::webPagePhotoSkip, width); - style::color date(selected ? (outbg ? st::msgOutSelectDateColor : st::msgInSelectDateColor) : (outbg ? st::msgOutDateColor : st::msgInDateColor)); - p.setPen(date->p); - - p.drawText(w - st::msgPadding.right() + st::msgDateDelta.x() - parent->timeWidth(true) + st::msgDateSpace, _height - st::msgPadding.bottom() + st::msgDateDelta.y() - st::msgDateFont->descent, time); - if (fromChannel) { - } else if (out) { - QPoint iconPos(w + st::msgCheckPos.x() - st::msgPadding.right() - st::msgCheckRect.pxWidth(), _height + st::msgCheckPos.y() - st::msgPadding.bottom() + st::msgDateDelta.y() - st::msgCheckRect.pxHeight()); - const QRect *iconRect; - if (parent->id > 0) { - if (parent->unread()) { - iconRect = &(selected ? st::msgSelectCheckRect : st::msgCheckRect); - } else { - iconRect = &(selected ? st::msgSelectDblCheckRect : st::msgDblCheckRect); - } - } else { - iconRect = &st::msgSendingRect; - } - p.drawPixmap(iconPos, App::sprite(), *iconRect); - } + int32 fullRight = skipx + width + st::mediaPadding.right(), fullBottom = _height; + parent->drawInfo(p, fullRight, fullBottom, selected, InfoDisplayDefault); } } @@ -2315,7 +2268,7 @@ HistoryVideo::HistoryVideo(const MTPDvideo &video, const QString &caption, Histo , _uplDone(0) { if (!caption.isEmpty()) { - _caption.setText(st::msgFont, caption + textcmdSkipBlock(parent->timeWidth(true), st::msgDateFont->height - st::msgDateDelta.y()), itemTextParseOptions(parent)); + _caption.setText(st::msgFont, caption + parent->skipBlock(), itemTextParseOptions(parent)); } _size = formatDurationAndSizeText(data->duration, data->size); @@ -2340,6 +2293,8 @@ HistoryVideo::HistoryVideo(const MTPDvideo &video, const QString &caption, Histo } void HistoryVideo::initDimensions(const HistoryItem *parent) { + if (_caption.hasSkipBlock()) _caption.setSkipBlock(parent->skipBlockWidth(), parent->skipBlockHeight()); + _maxw = st::mediaMaxWidth; int32 tleft = st::mediaPadding.left() + st::mediaThumbSize + st::mediaPadding.right(); if (!parent->out() || parent->fromChannel()) { // add Download / Save As button @@ -2485,9 +2440,7 @@ void HistoryVideo::getState(TextLinkPtr &lnk, HistoryCursorState &state, int32 x } } - int32 dateX = width - st::msgPadding.right() + st::msgDateDelta.x() - parent->timeWidth(true) + st::msgDateSpace; - int32 dateY = height - st::msgPadding.bottom() + st::msgDateDelta.y() - st::msgDateFont->height; - bool inDate = QRect(dateX, dateY, parent->timeWidth(true) - st::msgDateSpace, st::msgDateFont->height).contains(x, y); + bool inDate = parent->pointInTime(width, height, x, y, InfoDisplayDefault); if (inDate) { state = HistoryInDateCursorState; } @@ -2508,7 +2461,7 @@ HistoryMedia *HistoryVideo::clone() const { return new HistoryVideo(*this); } -void HistoryVideo::draw(QPainter &p, const HistoryItem *parent, bool selected, int32 width) const { +void HistoryVideo::draw(Painter &p, const HistoryItem *parent, bool selected, int32 width) const { int32 height = _height; if (width < 0) { width = w; @@ -2592,8 +2545,7 @@ void HistoryVideo::draw(QPainter &p, const HistoryItem *parent, bool selected, i int32 tleft = st::mediaPadding.left() + st::mediaThumbSize + st::mediaPadding.right(); int32 twidth = width - tleft - st::mediaPadding.right(); - int32 fullTimeWidth = parent->timeWidth(true) + st::msgPadding.right(); - int32 secondwidth = width - tleft - fullTimeWidth; + int32 secondwidth = width - tleft - st::msgPadding.right() - parent->skipBlockWidth(); p.setFont(st::mediaFont->f); p.setPen(st::black->c); @@ -2643,24 +2595,8 @@ void HistoryVideo::draw(QPainter &p, const HistoryItem *parent, bool selected, i _caption.draw(p, st::mediaPadding.left(), skipy + st::mediaPadding.top() + st::mediaThumbSize + st::webPagePhotoSkip, width - st::mediaPadding.left() - st::mediaPadding.right()); } - style::color date(selected ? (outbg ? st::msgOutSelectDateColor : st::msgInSelectDateColor) : (outbg ? st::msgOutDateColor : st::msgInDateColor)); - p.setPen(date->p); - - p.drawText(width + st::msgDateDelta.x() - fullTimeWidth + st::msgDateSpace, height - st::msgPadding.bottom() + st::msgDateDelta.y() - st::msgDateFont->descent, parent->time()); - if (outbg) { - QPoint iconPos(width + 5 - st::msgPadding.right() - st::msgCheckRect.pxWidth(), height + 1 - st::msgPadding.bottom() + st::msgDateDelta.y() - st::msgCheckRect.pxHeight()); - const QRect *iconRect; - if (parent->id > 0) { - if (parent->unread()) { - iconRect = &(selected ? st::msgSelectCheckRect : st::msgCheckRect); - } else { - iconRect = &(selected ? st::msgSelectDblCheckRect : st::msgDblCheckRect); - } - } else { - iconRect = &st::msgSendingRect; - } - p.drawPixmap(iconPos, App::sprite(), *iconRect); - } + int32 fullRight = width, fullBottom = height; + parent->drawInfo(p, fullRight, fullBottom, selected, InfoDisplayDefault); } int32 HistoryVideo::resize(int32 width, const HistoryItem *parent) { @@ -2745,7 +2681,7 @@ void HistoryAudio::initDimensions(const HistoryItem *parent) { _height = _minh; } -void HistoryAudio::draw(QPainter &p, const HistoryItem *parent, bool selected, int32 width) const { +void HistoryAudio::draw(Painter &p, const HistoryItem *parent, bool selected, int32 width) const { if (width < 0) width = w; if (width < 1) return; @@ -2861,8 +2797,7 @@ void HistoryAudio::draw(QPainter &p, const HistoryItem *parent, bool selected, i int32 tleft = st::mediaPadding.left() + st::mediaThumbSize + st::mediaPadding.right(); int32 twidth = width - tleft - st::mediaPadding.right(); - int32 fullTimeWidth = parent->timeWidth(true) + st::msgPadding.right(); - int32 secondwidth = width - tleft - fullTimeWidth; + int32 secondwidth = width - tleft - st::msgPadding.right() - parent->skipBlockWidth(); p.setFont(st::mediaFont->f); p.setPen(st::black->c); @@ -2887,22 +2822,8 @@ void HistoryAudio::draw(QPainter &p, const HistoryItem *parent, bool selected, i style::color date(selected ? (outbg ? st::msgOutSelectDateColor : st::msgInSelectDateColor) : (outbg ? st::msgOutDateColor : st::msgInDateColor)); p.setPen(date->p); - p.drawText(width + st::msgDateDelta.x() - fullTimeWidth + st::msgDateSpace, _height - st::msgPadding.bottom() + st::msgDateDelta.y() - st::msgDateFont->descent, parent->time()); - if (fromChannel) { - } else if (out) { - QPoint iconPos(width + 5 - st::msgPadding.right() - st::msgCheckRect.pxWidth(), _height + 1 - st::msgPadding.bottom() + st::msgDateDelta.y() - st::msgCheckRect.pxHeight()); - const QRect *iconRect; - if (parent->id > 0) { - if (parent->unread()) { - iconRect = &(selected ? st::msgSelectCheckRect : st::msgCheckRect); - } else { - iconRect = &(selected ? st::msgSelectDblCheckRect : st::msgDblCheckRect); - } - } else { - iconRect = &st::msgSendingRect; - } - p.drawPixmap(iconPos, App::sprite(), *iconRect); - } + int32 fullRight = width, fullBottom = _height; + parent->drawInfo(p, fullRight, fullBottom, selected, InfoDisplayDefault); } void HistoryAudio::regItem(HistoryItem *item) { @@ -2993,9 +2914,7 @@ void HistoryAudio::getState(TextLinkPtr &lnk, HistoryCursorState &state, int32 x if (x >= 0 && y >= skipy && x < width && y < _height && !data->loader && data->access) { lnk = _openl; - int32 dateX = width - st::msgPadding.right() + st::msgDateDelta.x() - parent->timeWidth(true) + st::msgDateSpace; - int32 dateY = _height - st::msgPadding.bottom() + st::msgDateDelta.y() - st::msgDateFont->height; - bool inDate = QRect(dateX, dateY, parent->timeWidth(true) - st::msgDateSpace, st::msgDateFont->height).contains(x, y); + bool inDate = parent->pointInTime(width, _height, x, y, InfoDisplayDefault); if (inDate) { state = HistoryInDateCursorState; } @@ -3083,7 +3002,7 @@ void HistoryDocument::initDimensions(const HistoryItem *parent) { _height = _minh; } -void HistoryDocument::draw(QPainter &p, const HistoryItem *parent, bool selected, int32 width) const { +void HistoryDocument::draw(Painter &p, const HistoryItem *parent, bool selected, int32 width) const { if (width < 0) width = w; if (width < 1) return; @@ -3241,8 +3160,7 @@ void HistoryDocument::draw(QPainter &p, const HistoryItem *parent, bool selected int32 tleft = st::mediaPadding.left() + st::mediaThumbSize + st::mediaPadding.right(); int32 twidth = width - tleft - st::mediaPadding.right(); - int32 fullTimeWidth = parent->timeWidth(true) + st::msgPadding.right(); - int32 secondwidth = width - tleft - fullTimeWidth; + int32 secondwidth = width - tleft - st::msgPadding.right() - parent->skipBlockWidth(); p.setFont(st::mediaFont->f); p.setPen(st::black->c); @@ -3262,25 +3180,11 @@ void HistoryDocument::draw(QPainter &p, const HistoryItem *parent, bool selected style::color date(selected ? (outbg ? st::msgOutSelectDateColor : st::msgInSelectDateColor) : (outbg ? st::msgOutDateColor : st::msgInDateColor)); p.setPen(date->p); - p.drawText(width + st::msgDateDelta.x() - fullTimeWidth + st::msgDateSpace, _height - st::msgPadding.bottom() + st::msgDateDelta.y() - st::msgDateFont->descent, parent->time()); - if (fromChannel) { - } else if (out) { - QPoint iconPos(width + 5 - st::msgPadding.right() - st::msgCheckRect.pxWidth(), _height + 1 - st::msgPadding.bottom() + st::msgDateDelta.y() - st::msgCheckRect.pxHeight()); - const QRect *iconRect; - if (parent->id > 0) { - if (parent->unread()) { - iconRect = &(selected ? st::msgSelectCheckRect : st::msgCheckRect); - } else { - iconRect = &(selected ? st::msgSelectDblCheckRect : st::msgDblCheckRect); - } - } else { - iconRect = &st::msgSendingRect; - } - p.drawPixmap(iconPos, App::sprite(), *iconRect); - } + int32 fullRight = width, fullBottom = _height; + parent->drawInfo(p, fullRight, fullBottom, selected, InfoDisplayDefault); } -void HistoryDocument::drawInPlaylist(QPainter &p, const HistoryItem *parent, bool selected, bool over, int32 width) const { +void HistoryDocument::drawInPlaylist(Painter &p, const HistoryItem *parent, bool selected, bool over, int32 width) const { bool out = parent->out(), fromChannel = parent->fromChannel(), outbg = out && !fromChannel; bool already = !data->already().isEmpty(), hasdata = !data->data.isEmpty(); int32 height = st::mediaPadding.top() + st::mediaThumbSize + st::mediaPadding.bottom(); @@ -3368,8 +3272,7 @@ void HistoryDocument::drawInPlaylist(QPainter &p, const HistoryItem *parent, boo int32 tleft = st::mediaPadding.left() + st::mediaThumbSize + st::mediaPadding.right(); int32 twidth = width - tleft - st::mediaPadding.right(); - int32 fullTimeWidth = parent->timeWidth(true) + st::msgPadding.right(); - int32 secondwidth = width - tleft - fullTimeWidth; + int32 secondwidth = width - tleft - st::msgPadding.right() - parent->skipBlockWidth(); p.setFont(st::mediaFont->f); p.setPen(st::black->c); @@ -3517,9 +3420,7 @@ void HistoryDocument::getState(TextLinkPtr &lnk, HistoryCursorState &state, int3 if (x >= 0 && y >= skipy && x < width && y < _height && !data->loader && data->access) { lnk = _openl; - int32 dateX = width - st::msgPadding.right() + st::msgDateDelta.x() - parent->timeWidth(true) + st::msgDateSpace; - int32 dateY = _height - st::msgPadding.bottom() + st::msgDateDelta.y() - st::msgDateFont->height; - bool inDate = QRect(dateX, dateY, parent->timeWidth(true) - st::msgDateSpace, st::msgDateFont->height).contains(x, y); + bool inDate = parent->pointInTime(width, _height, x, y, InfoDisplayDefault); if (inDate) { state = HistoryInDateCursorState; } @@ -3567,7 +3468,7 @@ void HistorySticker::initDimensions(const HistoryItem *parent) { w = qMin(lastw, _maxw); } -void HistorySticker::draw(QPainter &p, const HistoryItem *parent, bool selected, int32 width) const { +void HistorySticker::draw(Painter &p, const HistoryItem *parent, bool selected, int32 width) const { if (width < 0) width = w; if (width < 1) return; if (width > _maxw) width = _maxw; @@ -3609,38 +3510,7 @@ void HistorySticker::draw(QPainter &p, const HistoryItem *parent, bool selected, } } - // date - QString time(parent->time()); - if (time.isEmpty()) return; - int32 dateX = usex + usew - parent->timeWidth(false) - st::msgDateImgDelta - 2 * st::msgDateImgPadding.x(); - int32 dateY = _height - st::msgDateFont->height - 2 * st::msgDateImgPadding.y() - st::msgDateImgDelta; - if (fromChannel) { - } else if (out) { - dateX -= st::msgCheckRect.pxWidth() + st::msgDateImgCheckSpace; - } - int32 dateW = usex + usew - dateX - st::msgDateImgDelta; - int32 dateH = _height - dateY - st::msgDateImgDelta; - - App::roundRect(p, dateX, dateY, dateW, dateH, selected ? st::msgDateImgSelectBg : st::msgDateImgBg, selected ? DateSelectedCorners : DateCorners); - - p.setFont(st::msgDateFont->f); - p.setPen(st::msgDateImgColor->p); - p.drawText(dateX + st::msgDateImgPadding.x(), dateY + st::msgDateImgPadding.y() + st::msgDateFont->ascent, time); - if (fromChannel) { - } else if (out) { - QPoint iconPos(dateX - 2 + dateW - st::msgDateImgCheckSpace - st::msgCheckRect.pxWidth(), dateY + (dateH - st::msgCheckRect.pxHeight()) / 2); - const QRect *iconRect; - if (parent->id > 0) { - if (parent->unread()) { - iconRect = &st::msgImgCheckRect; - } else { - iconRect = &st::msgImgDblCheckRect; - } - } else { - iconRect = &st::msgImgSendingRect; - } - p.drawPixmap(iconPos, App::sprite(), *iconRect); - } + parent->drawInfo(p, usex + usew, _height, selected, InfoDisplayOverImage); if (reply) { int32 rw = width - usew - st::msgReplyPadding.left(), rh = st::msgReplyPadding.top() + st::msgReplyBarSize.height() + st::msgReplyPadding.bottom(); @@ -3715,13 +3585,7 @@ void HistorySticker::getState(TextLinkPtr &lnk, HistoryCursorState &state, int32 return; } } - int32 dateX = usex + usew - parent->timeWidth(false) - st::msgDateImgDelta - st::msgDateImgPadding.x(); - int32 dateY = _height - st::msgDateFont->height - st::msgDateImgDelta - st::msgDateImgPadding.y(); - if (fromChannel) { - } else if (out) { - dateX -= st::msgCheckRect.pxWidth() + st::msgDateImgCheckSpace; - } - bool inDate = QRect(dateX, dateY, parent->timeWidth(true) - st::msgDateSpace, st::msgDateFont->height).contains(x, y); + bool inDate = parent->pointInTime(usex + usew, _height, x, y, InfoDisplayOverImage); if (inDate) { state = HistoryInDateCursorState; } @@ -3750,9 +3614,9 @@ HistoryContact::HistoryContact(int32 userId, const QString &first, const QString void HistoryContact::initDimensions(const HistoryItem *parent) { int32 tleft = st::mediaPadding.left() + st::mediaThumbSize + st::mediaPadding.right(); - int32 fullTimeWidth = parent->timeWidth(true) + st::msgPadding.right(); - if (name.maxWidth() + tleft + fullTimeWidth > _maxw) { - _maxw = name.maxWidth() + tleft + fullTimeWidth; + int32 fullInfoWidth = parent->skipBlockWidth() + st::msgPadding.right(); + if (name.maxWidth() + tleft + fullInfoWidth > _maxw) { + _maxw = name.maxWidth() + tleft + fullInfoWidth; } if (phonew + tleft + st::mediaPadding.right() > _maxw) { _maxw = phonew + tleft + st::mediaPadding.right(); @@ -3822,8 +3686,14 @@ void HistoryContact::getState(TextLinkPtr &lnk, HistoryCursorState &state, int32 } } - if (x >= 0 && y >= skipy && x < w && y < _height && contact) { + if (x >= 0 && y >= skipy && x < width && y < _height && contact) { lnk = contact->lnk; + + bool inDate = parent->pointInTime(width, _height, x, y, InfoDisplayDefault); + if (inDate) { + state = HistoryInDateCursorState; + } + return; } } @@ -3839,7 +3709,7 @@ HistoryMedia *HistoryContact::clone() const { return result; } -void HistoryContact::draw(QPainter &p, const HistoryItem *parent, bool selected, int32 width) const { +void HistoryContact::draw(Painter &p, const HistoryItem *parent, bool selected, int32 width) const { if (width < 0) width = w; if (width < 1) return; @@ -3888,8 +3758,7 @@ void HistoryContact::draw(QPainter &p, const HistoryItem *parent, bool selected, int32 tleft = st::mediaPadding.left() + st::mediaThumbSize + st::mediaPadding.right(); int32 twidth = width - tleft - st::mediaPadding.right(); - int32 fullTimeWidth = parent->timeWidth(true) + st::msgPadding.right(); - int32 secondwidth = width - tleft - fullTimeWidth; + int32 secondwidth = width - tleft - st::msgPadding.right() - parent->skipBlockWidth(); p.setFont(st::mediaFont->f); p.setPen(st::black->c); @@ -3904,27 +3773,8 @@ void HistoryContact::draw(QPainter &p, const HistoryItem *parent, bool selected, name.drawElided(p, tleft, skipy + st::mediaPadding.top() + st::mediaThumbSize - st::mediaDetailsShift - st::mediaFont->height, secondwidth); - p.setFont(st::msgDateFont->f); - - style::color date(selected ? (outbg ? st::msgOutSelectDateColor : st::msgInSelectDateColor) : (outbg ? st::msgOutDateColor : st::msgInDateColor)); - p.setPen(date->p); - - p.drawText(width + st::msgDateDelta.x() - fullTimeWidth + st::msgDateSpace, _height - st::msgPadding.bottom() + st::msgDateDelta.y() - st::msgDateFont->descent, parent->time()); - if (fromChannel) { - } else if (out) { - QPoint iconPos(width + 5 - st::msgPadding.right() - st::msgCheckRect.pxWidth(), _height + 1 - st::msgPadding.bottom() + st::msgDateDelta.y() - st::msgCheckRect.pxHeight()); - const QRect *iconRect; - if (parent->id > 0) { - if (parent->unread()) { - iconRect = &(selected ? st::msgSelectCheckRect : st::msgCheckRect); - } else { - iconRect = &(selected ? st::msgSelectDblCheckRect : st::msgDblCheckRect); - } - } else { - iconRect = &st::msgSendingRect; - } - p.drawPixmap(iconPos, App::sprite(), *iconRect); - } + int32 fullRight = width, fullBottom = _height; + parent->drawInfo(p, fullRight, fullBottom, selected, InfoDisplayDefault); } void HistoryContact::updateFrom(const MTPMessageMedia &media) { @@ -4006,7 +3856,7 @@ void HistoryWebPage::initDimensions(const HistoryItem *parent) { w = thumbw; - _maxw = st::webPageLeft + qMax(thumbh, qMax(w, int32(st::minPhotoSize))) + parent->timeWidth(true); + _maxw = st::webPageLeft + qMax(thumbh, qMax(w, int32(st::minPhotoSize))) + parent->skipBlockWidth(); _minh = qMax(thumbh, int32(st::minPhotoSize)); _minh += st::webPagePhotoSkip; } else if (data->doc) { @@ -4027,7 +3877,7 @@ void HistoryWebPage::initDimensions(const HistoryItem *parent) { _docNameWidth = st::mediaFont->m.width(_docName.isEmpty() ? qsl("Document") : _docName); if (parent == animated.msg) { - _maxw = st::webPageLeft + (animated.w / cIntRetinaFactor()) + parent->timeWidth(true); + _maxw = st::webPageLeft + (animated.w / cIntRetinaFactor()) + parent->skipBlockWidth(); _minh = animated.h / cIntRetinaFactor(); _minh += st::webPagePhotoSkip; } else { @@ -4044,14 +3894,14 @@ void HistoryWebPage::initDimensions(const HistoryItem *parent) { if (_asArticle) { _maxw = qMax(_maxw, int32(st::webPageLeft + _siteNameWidth + st::webPagePhotoDelta + st::webPagePhotoSize)); } else { - _maxw = qMax(_maxw, int32(st::webPageLeft + _siteNameWidth + parent->timeWidth(true))); + _maxw = qMax(_maxw, int32(st::webPageLeft + _siteNameWidth + parent->skipBlockWidth())); _minh += st::webPageTitleFont->height; } } QString title(data->title.isEmpty() ? data->author : data->title); if (!title.isEmpty()) { title = textClean(title); - if (!_asArticle && !data->photo && data->description.isEmpty()) title += textcmdSkipBlock(parent->timeWidth(true), st::msgDateFont->height - st::msgDateDelta.y()); + if (!_asArticle && !data->photo && data->description.isEmpty()) title += parent->skipBlock(); _title.setText(st::webPageTitleFont, title, _webpageTitleOptions); if (_asArticle) { _maxw = qMax(_maxw, int32(st::webPageLeft + _title.maxWidth() + st::webPagePhotoDelta + st::webPagePhotoSize)); @@ -4062,7 +3912,7 @@ void HistoryWebPage::initDimensions(const HistoryItem *parent) { } if (!data->description.isEmpty()) { QString text = textClean(data->description); - if (!_asArticle && !data->photo) text += textcmdSkipBlock(parent->timeWidth(true), st::msgDateFont->height - st::msgDateDelta.y()); + if (!_asArticle && !data->photo) text += parent->skipBlock(); const TextParseOptions *opts = &_webpageDescriptionOptions; if (data->siteName == qstr("Twitter")) { opts = &_twitterDescriptionOptions; @@ -4087,7 +3937,7 @@ void HistoryWebPage::initDimensions(const HistoryItem *parent) { _height = _minh; } -void HistoryWebPage::draw(QPainter &p, const HistoryItem *parent, bool selected, int32 width) const { +void HistoryWebPage::draw(Painter &p, const HistoryItem *parent, bool selected, int32 width) const { if (width < 0) width = w; if (width < 1 || data->pendingTill) return; @@ -4105,12 +3955,12 @@ void HistoryWebPage::draw(QPainter &p, const HistoryItem *parent, bool selected, int32 bottomSkip = 0; if (data->photo) { bottomSkip += st::webPagePhotoSkip; - if (_asArticle || (st::webPageLeft + qMax(_pixw, int16(st::minPhotoSize)) + parent->timeWidth(true) > width)) { + if (_asArticle || (st::webPageLeft + qMax(_pixw, int16(st::minPhotoSize)) + parent->skipBlockWidth() > width)) { bottomSkip += (st::msgDateFont->height - st::msgDateDelta.y()); } } else if (data->doc && animated.msg == parent) { bottomSkip += st::webPagePhotoSkip; - if (st::webPageLeft + qMax(animw, int16(st::minPhotoSize)) + parent->timeWidth(true) > width) { + if (st::webPageLeft + qMax(animw, int16(st::minPhotoSize)) + parent->skipBlockWidth() > width) { bottomSkip += (st::msgDateFont->height - st::msgDateDelta.y()); } } @@ -4122,13 +3972,6 @@ void HistoryWebPage::draw(QPainter &p, const HistoryItem *parent, bool selected, style::color regular = (selected ? (outbg ? st::msgOutSelectDateColor : st::msgInSelectDateColor) : (outbg ? st::msgOutDateColor : st::msgInDateColor)); p.fillRect(0, 0, st::webPageBar, _height - bottomSkip, bar->b); - //if (data->pendingTill) { - // p.setFont(st::linkFont->f); - // p.setPen(regular->p); - // p.drawText(st::webPageLeft, (_minh - st::linkFont->height) / 2 + st::linkFont->ascent, lang(data->pendingTill < 0 ? lng_attach_failed : lng_profile_loading)); - // return; - //} - p.save(); p.translate(st::webPageLeft, 0); @@ -4155,7 +3998,7 @@ void HistoryWebPage::draw(QPainter &p, const HistoryItem *parent, bool selected, if (_asArticle) { availw -= st::webPagePhotoSize + st::webPagePhotoDelta; } else if (_title.isEmpty() && _description.isEmpty() && !data->photo) { - availw -= parent->timeWidth(true); + availw -= parent->skipBlockWidth(); } p.setFont(st::webPageTitleFont->f); p.setPen(semibold->p); @@ -4169,7 +4012,7 @@ void HistoryWebPage::draw(QPainter &p, const HistoryItem *parent, bool selected, if (_asArticle) { availw -= st::webPagePhotoSize + st::webPagePhotoDelta; } else if (_description.isEmpty() && !data->photo) { - endskip = parent->timeWidth(true); + endskip = parent->skipBlockWidth(); } _title.drawElided(p, 0, 0, availw, 2, style::al_left, 0, -1, endskip); int32 h = _title.countHeight(availw); @@ -4188,7 +4031,7 @@ void HistoryWebPage::draw(QPainter &p, const HistoryItem *parent, bool selected, availw -= st::webPagePhotoSize + st::webPagePhotoDelta; if (articleLines > 3) articleLines = 3; } else { - if (!data->photo) endskip = parent->timeWidth(true); + if (!data->photo) endskip = parent->skipBlockWidth(); articleLines = 3; } _description.drawElided(p, 0, 0, availw, articleLines, style::al_left, 0, -1, endskip); @@ -4333,8 +4176,7 @@ void HistoryWebPage::draw(QPainter &p, const HistoryItem *parent, bool selected, int32 tleft = st::mediaPadding.left() + st::mediaThumbSize + st::mediaPadding.right(); int32 twidth = width - tleft - st::mediaPadding.right(); - int32 fullTimeWidth = parent->timeWidth(true) + st::msgPadding.right(); - int32 secondwidth = width - tleft - fullTimeWidth; + int32 secondwidth = width - tleft - st::msgPadding.right() - parent->skipBlockWidth(); p.setFont(st::mediaFont->f); p.setPen(st::black->c); @@ -4381,7 +4223,7 @@ int32 HistoryWebPage::resize(int32 width, const HistoryItem *parent) { _height = st::webPagePhotoSize; _height += st::webPagePhotoSkip + (st::msgDateFont->height - st::msgDateDelta.y()); } else if (data->photo) { - _pixw = qMin(width, int32(_maxw - st::webPageLeft - parent->timeWidth(true))); + _pixw = qMin(width, int32(_maxw - st::webPageLeft - parent->skipBlockWidth())); int32 tw = convertScale(data->photo->full->width()), th = convertScale(data->photo->full->height()); if (tw > st::maxMediaSize) { @@ -4406,7 +4248,7 @@ int32 HistoryWebPage::resize(int32 width, const HistoryItem *parent) { if (_pixh < 1) _pixh = 1; _height = qMax(_pixh, int16(st::minPhotoSize)); _height += st::webPagePhotoSkip; - if (qMax(_pixw, int16(st::minPhotoSize)) + parent->timeWidth(true) > width) { + if (qMax(_pixw, int16(st::minPhotoSize)) + parent->skipBlockWidth() > width) { _height += (st::msgDateFont->height - st::msgDateDelta.y()); } } else if (data->doc) { @@ -4421,7 +4263,7 @@ int32 HistoryWebPage::resize(int32 width, const HistoryItem *parent) { if (_height <= 0) _height = 1; } _height += st::webPagePhotoSkip; - if (w + parent->timeWidth(true) > width) { + if (w + parent->skipBlockWidth() > width) { _height += (st::msgDateFont->height - st::msgDateDelta.y()); } } else { @@ -5024,7 +4866,7 @@ void HistoryImageLink::initDimensions(const HistoryItem *parent) { _height = _minh; } -void HistoryImageLink::draw(QPainter &p, const HistoryItem *parent, bool selected, int32 width) const { +void HistoryImageLink::draw(Painter &p, const HistoryItem *parent, bool selected, int32 width) const { if (width < 0) width = w; int skipx = 0, skipy = 0, height = _height; const HistoryReply *reply = toHistoryReply(parent); @@ -5121,38 +4963,8 @@ void HistoryImageLink::draw(QPainter &p, const HistoryItem *parent, bool selecte App::roundRect(p, skipx, skipy, width, height, textstyleCurrent()->selectOverlay, SelectedOverlayCorners); } - // date - QString time(parent->time()); - if (time.isEmpty()) return; - int32 dateX = skipx + width - parent->timeWidth(false) - st::msgDateImgDelta - 2 * st::msgDateImgPadding.x(); - int32 dateY = skipy + height - st::msgDateFont->height - 2 * st::msgDateImgPadding.y() - st::msgDateImgDelta; - if (fromChannel) { - } else if (out) { - dateX -= st::msgCheckRect.pxWidth() + st::msgDateImgCheckSpace; - } - int32 dateW = skipx + width - dateX - st::msgDateImgDelta; - int32 dateH = skipy + height - dateY - st::msgDateImgDelta; - - App::roundRect(p, dateX, dateY, dateW, dateH, selected ? st::msgDateImgSelectBg : st::msgDateImgBg, selected ? DateSelectedCorners : DateCorners); - - p.setFont(st::msgDateFont->f); - p.setPen(st::msgDateImgColor->p); - p.drawText(dateX + st::msgDateImgPadding.x(), dateY + st::msgDateImgPadding.y() + st::msgDateFont->ascent, time); - if (fromChannel) { - } else if (out) { - QPoint iconPos(dateX - 2 + dateW - st::msgDateImgCheckSpace - st::msgCheckRect.pxWidth(), dateY + (dateH - st::msgCheckRect.pxHeight()) / 2); - const QRect *iconRect; - if (parent->id > 0) { - if (parent->unread()) { - iconRect = &st::msgImgCheckRect; - } else { - iconRect = &st::msgImgDblCheckRect; - } - } else { - iconRect = &st::msgImgSendingRect; - } - p.drawPixmap(iconPos, App::sprite(), *iconRect); - } + int32 fullRight = skipx + width + (skipx ? st::mediaPadding.right() : 0), fullBottom = _height; + parent->drawInfo(p, fullRight, fullBottom, selected, InfoDisplayOverImage); } int32 HistoryImageLink::resize(int32 width, const HistoryItem *parent) { @@ -5288,13 +5100,7 @@ void HistoryImageLink::getState(TextLinkPtr &lnk, HistoryCursorState &state, int if (x >= skipx && y >= skipy && x < skipx + width && y < skipy + height && data) { lnk = link; - int32 dateX = skipx + width - parent->timeWidth(false) - st::msgDateImgDelta - st::msgDateImgPadding.x(); - int32 dateY = skipy + height - st::msgDateFont->height - st::msgDateImgDelta - st::msgDateImgPadding.y(); - if (fromChannel) { - } else if (out) { - dateX -= st::msgCheckRect.pxWidth() + st::msgDateImgCheckSpace; - } - bool inDate = QRect(dateX, dateY, parent->timeWidth(true) - st::msgDateSpace, st::msgDateFont->height).contains(x, y); + bool inDate = parent->pointInTime(skipx + width + (skipx ? st::mediaPadding.right() : 0), _height, x, y, InfoDisplayOverImage); if (inDate) { state = HistoryInDateCursorState; } @@ -5313,6 +5119,7 @@ HistoryMessage::HistoryMessage(History *history, HistoryBlock *block, const MTPD , _textWidth(0) , _textHeight(0) , _media(0) +, _views(msg.has_views() ? msg.vviews.v : -1) { QString text(textClean(qs(msg.vmessage))); initTime(); @@ -5320,25 +5127,13 @@ HistoryMessage::HistoryMessage(History *history, HistoryBlock *block, const MTPD setText(text, msg.has_entities() ? linksFromMTP(msg.ventities.c_vector().v) : LinksInText()); } -HistoryMessage::HistoryMessage(History *history, HistoryBlock *block, MsgId msgId, int32 flags, QDateTime date, int32 from, const QString &msg, const LinksInText &links, const MTPMessageMedia *media) : -HistoryItem(history, block, msgId, flags, date, from) -, _text(st::msgMinWidth) -, _textWidth(0) -, _textHeight(0) -, _media(0) -{ - QString text(msg); - initTime(); - initMedia(media, text); - setText(text, links); -} - HistoryMessage::HistoryMessage(History *history, HistoryBlock *block, MsgId msgId, int32 flags, QDateTime date, int32 from, const QString &msg, const LinksInText &links, HistoryMedia *fromMedia) : HistoryItem(history, block, msgId, flags, date, from) , _text(st::msgMinWidth) , _textWidth(0) , _textHeight(0) , _media(0) +, _views(fromChannel() ? 1 : -1) { initTime(); if (fromMedia) { @@ -5354,6 +5149,7 @@ HistoryItem(history, block, msgId, flags, date, from) , _textWidth(0) , _textHeight(0) , _media(0) +, _views(fromChannel() ? 1 : -1) { initTime(); initMediaFromDocument(doc); @@ -5361,8 +5157,11 @@ HistoryItem(history, block, msgId, flags, date, from) } void HistoryMessage::initTime() { - _time = date.toString(cTimeFormat()); - _timeWidth = st::msgDateFont->m.width(_time); + _timeText = date.toString(cTimeFormat()); + _timeWidth = st::msgDateFont->m.width(_timeText); + + _viewsText = (_views >= 0) ? QString::number(_views ? _views : 1) : QString(); + _viewsWidth = _viewsText.isEmpty() ? 0 : st::msgDateFont->m.width(_viewsText); } void HistoryMessage::initMedia(const MTPMessageMedia *media, QString ¤tText) { @@ -5461,7 +5260,7 @@ void HistoryMessage::initDimensions() { _textWidth = 0; _textHeight = 0; } else if (!_media->isDisplayed() && !_text.hasSkipBlock()) { - _text.setSkipBlock(timeWidth(true), st::msgDateFont->height - st::msgDateDelta.y()); + _text.setSkipBlock(skipBlockWidth(), skipBlockHeight()); _textWidth = 0; _textHeight = 0; } @@ -5524,7 +5323,7 @@ void HistoryMessage::setMedia(const MTPMessageMedia *media) { _textWidth = 0; _textHeight = 0; } else if (mediaWasDisplayed && (!_media || !_media->isDisplayed())) { - _text.setSkipBlock(timeWidth(true), st::msgDateFont->height - st::msgDateDelta.y()); + _text.setSkipBlock(skipBlockWidth(), skipBlockHeight()); _textWidth = 0; _textHeight = 0; } @@ -5537,7 +5336,7 @@ void HistoryMessage::setText(const QString &text, const LinksInText &links) { if (_media && _media->isDisplayed()) { _text.setMarkedText(st::msgFont, text, links, itemTextParseOptions(this)); } else { - _text.setMarkedText(st::msgFont, text + textcmdSkipBlock(timeWidth(true), st::msgDateFont->height - st::msgDateDelta.y()), links, itemTextParseOptions(this)); + _text.setMarkedText(st::msgFont, text + skipBlock(), links, itemTextParseOptions(this)); } if (id > 0) { for (int32 i = 0, l = links.size(); i != l; ++i) { @@ -5562,7 +5361,92 @@ bool HistoryMessage::textHasLinks() { return _text.hasLinks(); } -void HistoryMessage::draw(QPainter &p, uint32 selection) const { +void HistoryMessage::drawInfo(Painter &p, int32 right, int32 bottom, bool selected, InfoDisplayType type) const { + p.setFont(st::msgDateFont->f); + + bool outbg = out() && !fromChannel(), overimg = (type == InfoDisplayOverImage); + int32 infoRight = right, infoBottom = bottom; + switch (type) { + case InfoDisplayDefault: + infoRight -= st::msgPadding.right() - st::msgDateDelta.x(); + infoBottom -= st::msgPadding.bottom() - st::msgDateDelta.y(); + p.setPen((selected ? (outbg ? st::msgOutSelectDateColor : st::msgInSelectDateColor) : (outbg ? st::msgOutDateColor : st::msgInDateColor))->p); + break; + case InfoDisplayOverImage: + infoRight -= st::msgDateImgDelta + st::msgDateImgPadding.x(); + infoBottom -= st::msgDateImgDelta + st::msgDateImgPadding.y(); + p.setPen(st::msgDateImgColor->p); + break; + } + + int32 infoW = HistoryMessage::infoWidth(); + int32 dateX = infoRight - infoW; + int32 dateY = infoBottom - st::msgDateFont->height; + if (type == InfoDisplayOverImage) { + int32 dateW = infoW + 2 * st::msgDateImgPadding.x(), dateH = st::msgDateFont->height + 2 * st::msgDateImgPadding.y(); + App::roundRect(p, dateX - st::msgDateImgPadding.x(), dateY - st::msgDateImgPadding.y(), dateW, dateH, selected ? st::msgDateImgSelectBg : st::msgDateImgBg, selected ? DateSelectedCorners : DateCorners); + } + dateX += HistoryMessage::timeLeft(); + + p.drawText(dateX, dateY + st::msgDateFont->ascent, _timeText); + + QPoint iconPos; + const QRect *iconRect = 0; + if (!_viewsText.isEmpty()) { + iconPos = QPoint(infoRight - infoW + st::msgViewsPos.x(), infoBottom - st::msgViewsImg.pxHeight() + st::msgViewsPos.y()); + if (id > 0) { + if (out() && !fromChannel()) { + iconRect = &(overimg ? st::msgInvViewsImg : (selected ? st::msgSelectOutViewsImg : st::msgOutViewsImg)); + } else { + iconRect = &(overimg ? st::msgInvViewsImg : (selected ? st::msgSelectViewsImg : st::msgViewsImg)); + } + p.drawText(iconPos.x() + st::msgViewsImg.pxWidth() + st::msgDateCheckSpace, infoBottom - st::msgDateFont->descent, _viewsText); + } else { + iconPos.setX(iconPos.x() + st::msgDateViewsSpace + _viewsWidth); + if (out() && !fromChannel()) { + iconRect = &(overimg ? st::msgInvSendingViewsImg : st::msgSendingOutViewsImg); + } else { + iconRect = &(overimg ? st::msgInvSendingViewsImg : st::msgSendingViewsImg); + } + } + p.drawPixmap(iconPos, App::sprite(), *iconRect); + } + if (out() && !fromChannel()) { + iconPos = QPoint(infoRight - st::msgCheckImg.pxWidth() + st::msgCheckPos.x(), infoBottom - st::msgCheckImg.pxHeight() + st::msgCheckPos.y()); + if (id > 0) { + if (unread()) { + iconRect = &(overimg ? st::msgInvCheckImg : (selected ? st::msgSelectCheckImg : st::msgCheckImg)); + } else { + iconRect = &(overimg ? st::msgInvDblCheckImg : (selected ? st::msgSelectDblCheckImg : st::msgDblCheckImg)); + } + } else { + iconRect = &(overimg ? st::msgInvSendingImg : st::msgSendingImg); + } + p.drawPixmap(iconPos, App::sprite(), *iconRect); + } +} + +void HistoryMessage::setViewsCount(int32 count) { + if (_views == count || (_views >= 0 && count >= 0 && _views > count)) return; + + int32 was = _viewsWidth; + _views = count; + _viewsText = (_views >= 0) ? QString::number(_views ? _views : 1) : QString(); + _viewsWidth = _viewsText.isEmpty() ? 0 : st::msgDateFont->m.width(_viewsText); + if (was == _viewsWidth) { + if (App::main()) App::main()->msgUpdated(history()->peer->id, this); + } else { + if (_text.hasSkipBlock()) { + _text.setSkipBlock(HistoryMessage::skipBlockWidth(), HistoryMessage::skipBlockHeight()); + _textWidth = 0; + _textHeight = 0; + } + initDimensions(); + if (App::main()) App::main()->itemResized(this); + } +} + +void HistoryMessage::draw(Painter &p, uint32 selection) const { bool outbg = out() && !fromChannel(); textstyleSet(&(outbg ? st::outTextStyle : st::inTextStyle)); @@ -5642,31 +5526,11 @@ void HistoryMessage::draw(QPainter &p, uint32 selection) const { _media->draw(p, this, selected); p.restore(); } - p.setFont(st::msgDateFont->f); - - style::color date(selected ? (outbg ? st::msgOutSelectDateColor : st::msgInSelectDateColor) : (outbg ? st::msgOutDateColor : st::msgInDateColor)); - p.setPen(date->p); - - p.drawText(r.right() - st::msgPadding.right() + st::msgDateDelta.x() - timeWidth(true) + st::msgDateSpace, r.bottom() - st::msgPadding.bottom() + st::msgDateDelta.y() - st::msgDateFont->descent, _time); - if (fromChannel()) { - } else if (out()) { - QPoint iconPos(r.right() + st::msgCheckPos.x() - st::msgPadding.right() - st::msgCheckRect.pxWidth(), r.bottom() + st::msgCheckPos.y() - st::msgPadding.bottom() + st::msgDateDelta.y() - st::msgCheckRect.pxHeight()); - const QRect *iconRect; - if (id > 0) { - if (unread()) { - iconRect = &(selected ? st::msgSelectCheckRect : st::msgCheckRect); - } else { - iconRect = &(selected ? st::msgSelectDblCheckRect : st::msgDblCheckRect); - } - } else { - iconRect = &st::msgSendingRect; - } - p.drawPixmap(iconPos, App::sprite(), *iconRect); - } + HistoryMessage::drawInfo(p, r.x() + r.width(), r.y() + r.height(), selected, InfoDisplayDefault); } } -void HistoryMessage::drawMessageText(QPainter &p, const QRect &trect, uint32 selection) const { +void HistoryMessage::drawMessageText(Painter &p, const QRect &trect, uint32 selection) const { p.setPen(st::msgColor->p); p.setFont(st::msgFont->f); uint16 selectedFrom = (selection == FullItemSel) ? 0 : (selection >> 16) & 0xFFFF; @@ -5744,6 +5608,23 @@ bool HistoryMessage::hasPoint(int32 x, int32 y) const { return r.contains(x, y); } +bool HistoryMessage::pointInTime(int32 right, int32 bottom, int32 x, int32 y, InfoDisplayType type) const { + int32 infoRight = right, infoBottom = bottom; + switch (type) { + case InfoDisplayDefault: + infoRight -= st::msgPadding.right() - st::msgDateDelta.x(); + infoBottom -= st::msgPadding.bottom() - st::msgDateDelta.y(); + break; + case InfoDisplayOverImage: + infoRight -= st::msgDateImgDelta + st::msgDateImgPadding.x(); + infoBottom -= st::msgDateImgDelta + st::msgDateImgPadding.y(); + break; + } + int32 dateX = infoRight - HistoryMessage::infoWidth() + HistoryMessage::timeLeft(); + int32 dateY = infoBottom - st::msgDateFont->height; + return QRect(dateX, dateY, HistoryMessage::timeWidth(), st::msgDateFont->height).contains(x, y); +} + void HistoryMessage::getState(TextLinkPtr &lnk, HistoryCursorState &state, int32 x, int32 y) const { state = HistoryDefaultCursorState; lnk = TextLinkPtr(); @@ -5797,9 +5678,7 @@ void HistoryMessage::getState(TextLinkPtr &lnk, HistoryCursorState &state, int32 } void HistoryMessage::getStateFromMessageText(TextLinkPtr &lnk, HistoryCursorState &state, int32 x, int32 y, const QRect &r) const { - int32 dateX = r.right() - st::msgPadding.right() + st::msgDateDelta.x() - timeWidth(true) + st::msgDateSpace; - int32 dateY = r.bottom() - st::msgPadding.bottom() + st::msgDateDelta.y() - st::msgDateFont->height; - bool inDate = QRect(dateX, dateY, timeWidth(true) - st::msgDateSpace, st::msgDateFont->height).contains(x, y); + bool inDate = HistoryMessage::pointInTime(r.x() + r.width(), r.y() + r.height(), x, y, InfoDisplayDefault); QRect trect(r.marginsAdded(-st::msgPadding)); TextLinkPtr medialnk; @@ -5864,7 +5743,7 @@ void HistoryMessage::getSymbol(uint16 &symbol, bool &after, bool &upon, int32 x, _text.getSymbol(symbol, after, upon, x - trect.x(), y - trect.y(), trect.width()); } -void HistoryMessage::drawInDialog(QPainter &p, const QRect &r, bool act, const HistoryItem *&cacheFor, Text &cache) const { +void HistoryMessage::drawInDialog(Painter &p, const QRect &r, bool act, const HistoryItem *&cacheFor, Text &cache) const { if (cacheFor != this) { cacheFor = this; QString msg(inDialogsText()); @@ -5906,7 +5785,7 @@ HistoryMessage::~HistoryMessage() { } } -HistoryForwarded::HistoryForwarded(History *history, HistoryBlock *block, const MTPDmessage &msg) : HistoryMessage(history, block, msg.vid.v, msg.vflags.v, ::date(msg.vdate), msg.has_from_id() ? msg.vfrom_id.v : 0, textClean(qs(msg.vmessage)), msg.has_entities() ? linksFromMTP(msg.ventities.c_vector().v) : LinksInText(), msg.has_media() ? (&msg.vmedia) : 0) +HistoryForwarded::HistoryForwarded(History *history, HistoryBlock *block, const MTPDmessage &msg) : HistoryMessage(history, block, msg) , fwdDate(::date(msg.vfwd_date)) , fwdFrom(App::peer(peerFromMTP(msg.vfwd_from_id))) , fwdFromVersion(fwdFrom->nameVersion) @@ -5944,7 +5823,7 @@ void HistoryForwarded::fwdNameUpdated() const { if (_namew > _maxw) _maxw = _namew; } -void HistoryForwarded::draw(QPainter &p, uint32 selection) const { +void HistoryForwarded::draw(Painter &p, uint32 selection) const { if (!justMedia() && fwdFrom->nameVersion > fwdFromVersion) { fwdNameUpdated(); fwdFromVersion = fwdFrom->nameVersion; @@ -5952,7 +5831,7 @@ void HistoryForwarded::draw(QPainter &p, uint32 selection) const { HistoryMessage::draw(p, selection); } -void HistoryForwarded::drawForwardedFrom(QPainter &p, int32 x, int32 y, int32 w, bool selected) const { +void HistoryForwarded::drawForwardedFrom(Painter &p, int32 x, int32 y, int32 w, bool selected) const { style::font serviceFont(st::msgServiceFont), serviceName(st::msgServiceNameFont); bool outbg = out() && !fromChannel(); @@ -5969,7 +5848,7 @@ void HistoryForwarded::drawForwardedFrom(QPainter &p, int32 x, int32 y, int32 w, } } -void HistoryForwarded::drawMessageText(QPainter &p, const QRect &trect, uint32 selection) const { +void HistoryForwarded::drawMessageText(Painter &p, const QRect &trect, uint32 selection) const { drawForwardedFrom(p, trect.x(), trect.y(), trect.width(), (selection == FullItemSel)); QRect realtrect(trect); @@ -6126,7 +6005,7 @@ void HistoryForwarded::getSymbol(uint16 &symbol, bool &after, bool &upon, int32 return HistoryMessage::getSymbol(symbol, after, upon, x, y); } -HistoryReply::HistoryReply(History *history, HistoryBlock *block, const MTPDmessage &msg) : HistoryMessage(history, block, msg.vid.v, msg.vflags.v, ::date(msg.vdate), msg.has_from_id() ? msg.vfrom_id.v : 0, textClean(qs(msg.vmessage)), msg.has_entities() ? linksFromMTP(msg.ventities.c_vector().v) : LinksInText(), msg.has_media() ? (&msg.vmedia) : 0) +HistoryReply::HistoryReply(History *history, HistoryBlock *block, const MTPDmessage &msg) : HistoryMessage(history, block, msg) , replyToMsgId(msg.vreply_to_msg_id.v) , replyToMsg(0) , replyToVersion(0) @@ -6231,14 +6110,14 @@ void HistoryReply::replyToReplaced(HistoryItem *oldItem, HistoryItem *newItem) { } } -void HistoryReply::draw(QPainter &p, uint32 selection) const { +void HistoryReply::draw(Painter &p, uint32 selection) const { if (replyToMsg && replyToMsg->from()->nameVersion > replyToVersion) { replyToNameUpdated(); } HistoryMessage::draw(p, selection); } -void HistoryReply::drawReplyTo(QPainter &p, int32 x, int32 y, int32 w, bool selected, bool likeService) const { +void HistoryReply::drawReplyTo(Painter &p, int32 x, int32 y, int32 w, bool selected, bool likeService) const { style::color bar; bool outbg = out() && !fromChannel(); if (likeService) { @@ -6294,7 +6173,7 @@ void HistoryReply::drawReplyTo(QPainter &p, int32 x, int32 y, int32 w, bool sele } } -void HistoryReply::drawMessageText(QPainter &p, const QRect &trect, uint32 selection) const { +void HistoryReply::drawMessageText(Painter &p, const QRect &trect, uint32 selection) const { int32 h = st::msgReplyPadding.top() + st::msgReplyBarSize.height() + st::msgReplyPadding.bottom(); drawReplyTo(p, trect.x(), trect.y(), trect.width(), (selection == FullItemSel)); @@ -6584,7 +6463,7 @@ QString HistoryServiceMsg::inReplyText() const { return result.trimmed().startsWith(from()->name) ? result.trimmed().mid(from()->name.size()).trimmed() : result; } -void HistoryServiceMsg::draw(QPainter &p, uint32 selection) const { +void HistoryServiceMsg::draw(Painter &p, uint32 selection) const { uint64 ms = App::main() ? App::main()->animActiveTime(id) : 0; if (ms) { if (ms > st::activeFadeInDuration + st::activeFadeOutDuration) { @@ -6695,7 +6574,7 @@ void HistoryServiceMsg::getSymbol(uint16 &symbol, bool &after, bool &upon, int32 return _text.getSymbol(symbol, after, upon, x - trect.x(), y - trect.y(), trect.width(), Qt::AlignCenter); } -void HistoryServiceMsg::drawInDialog(QPainter &p, const QRect &r, bool act, const HistoryItem *&cacheFor, Text &cache) const { +void HistoryServiceMsg::drawInDialog(Painter &p, const QRect &r, bool act, const HistoryItem *&cacheFor, Text &cache) const { if (cacheFor != this) { cacheFor = this; cache.setText(st::dlgHistFont, inDialogsText(), _textDlgOptions); @@ -6742,7 +6621,7 @@ void HistoryUnreadBar::setCount(int32 count) { text = lng_unread_bar(lt_count, count); } -void HistoryUnreadBar::draw(QPainter &p, uint32 selection) const { +void HistoryUnreadBar::draw(Painter &p, uint32 selection) const { p.fillRect(0, st::lineWidth, _history->width, st::unreadBarHeight - 2 * st::lineWidth, st::unreadBarBG->b); p.fillRect(0, st::unreadBarHeight - st::lineWidth, _history->width, st::lineWidth, st::unreadBarBorder->b); p.setFont(st::unreadBarFont->f); @@ -6755,7 +6634,7 @@ int32 HistoryUnreadBar::resize(int32 width) { return _height; } -void HistoryUnreadBar::drawInDialog(QPainter &p, const QRect &r, bool act, const HistoryItem *&cacheFor, Text &cache) const { +void HistoryUnreadBar::drawInDialog(Painter &p, const QRect &r, bool act, const HistoryItem *&cacheFor, Text &cache) const { } QString HistoryUnreadBar::notificationText() const { diff --git a/Telegram/SourceFiles/history.h b/Telegram/SourceFiles/history.h index 97b90cf06..27a278650 100644 --- a/Telegram/SourceFiles/history.h +++ b/Telegram/SourceFiles/history.h @@ -68,7 +68,7 @@ struct DialogRow { DialogRow(History *history = 0, DialogRow *prev = 0, DialogRow *next = 0, int32 pos = 0) : prev(prev), next(next), history(history), pos(pos), attached(0) { } - void paint(QPainter &p, int32 w, bool act, bool sel) const; + void paint(Painter &p, int32 w, bool act, bool sel) const; DialogRow *prev, *next; History *history; @@ -80,7 +80,7 @@ struct FakeDialogRow { FakeDialogRow(HistoryItem *item) : _item(item), _cacheFor(0), _cache(st::dlgRichMinWidth) { } - void paint(QPainter &p, int32 w, bool act, bool sel) const; + void paint(Painter &p, int32 w, bool act, bool sel) const; HistoryItem *_item; mutable const HistoryItem *_cacheFor; @@ -293,7 +293,7 @@ struct History : public QList { mutable const HistoryItem *textCachedFor; // cache mutable Text lastItemTextCache; - void paintDialog(QPainter &p, int32 w, bool sel) const; + void paintDialog(Painter &p, int32 w, bool sel) const; typedef QMap DialogLinks; DialogLinks dialogs; @@ -341,7 +341,7 @@ struct DialogsList { } } - void paint(QPainter &p, int32 w, int32 hFrom, int32 hTo, PeerData *act, PeerData *sel) const { + void paint(Painter &p, int32 w, int32 hFrom, int32 hTo, PeerData *act, PeerData *sel) const { adjustCurrent(hFrom, st::dlgHeight); DialogRow *drawFrom = current; @@ -662,6 +662,11 @@ enum HistoryCursorState { HistoryInDateCursorState }; +enum InfoDisplayType { + InfoDisplayDefault, + InfoDisplayOverImage, +}; + class HistoryMedia; class HistoryItem : public HistoryElem { public: @@ -676,7 +681,7 @@ public: virtual void initDimensions() = 0; virtual int32 resize(int32 width) = 0; // return new height - virtual void draw(QPainter &p, uint32 selection) const = 0; + virtual void draw(Painter &p, uint32 selection) const = 0; History *history() { return _history; @@ -728,7 +733,7 @@ public: return _from->isChannel(); } virtual bool needCheck() const { - return out() && !fromChannel(); + return out() && (!fromChannel() || id <= 0); } virtual bool hasPoint(int32 x, int32 y) const { return false; @@ -764,7 +769,11 @@ public: return inDialogsText(); } - virtual void drawInDialog(QPainter &p, const QRect &r, bool act, const HistoryItem *&cacheFor, Text &cache) const = 0; + virtual void drawInfo(Painter &p, int32 right, int32 bottom, bool selected, InfoDisplayType type) const { + } + virtual void setViewsCount(int32 count) { + } + virtual void drawInDialog(Painter &p, const QRect &r, bool act, const HistoryItem *&cacheFor, Text &cache) const = 0; virtual QString notificationHeader() const { return QString(); } @@ -793,12 +802,39 @@ public: virtual bool textHasLinks() { return false; } - virtual QString time() const { - return QString(); - } - virtual int32 timeWidth(bool forText) const { + + virtual int32 infoWidth() const { return 0; } + virtual int32 timeLeft() const { + return 0; + } + virtual QString timeText() const { + return QString(); + } + virtual int32 timeWidth() const { + return 0; + } + virtual QString viewsText() const { + return QString(); + } + virtual int32 viewsWidth() const { + return 0; + } + virtual bool pointInTime(int32 right, int32 bottom, int32 x, int32 y, InfoDisplayType type) const { + return false; + } + + int32 skipBlockWidth() const { + return st::msgDateSpace + infoWidth() - st::msgDateDelta.x(); + } + int32 skipBlockHeight() const { + return st::msgDateFont->height - st::msgDateDelta.y(); + } + QString skipBlock() const { + return textcmdSkipBlock(skipBlockWidth(), skipBlockHeight()); + } + virtual bool animating() const { return false; } @@ -886,7 +922,7 @@ public: return _height; } virtual void getState(TextLinkPtr &lnk, HistoryCursorState &state, int32 x, int32 y, const HistoryItem *parent, int32 width = -1) const = 0; - virtual void draw(QPainter &p, const HistoryItem *parent, bool selected, int32 width = -1) const = 0; + virtual void draw(Painter &p, const HistoryItem *parent, bool selected, int32 width = -1) const = 0; virtual bool uploading() const { return false; } @@ -935,7 +971,7 @@ public: void init(); void initDimensions(const HistoryItem *parent); - void draw(QPainter &p, const HistoryItem *parent, bool selected, int32 width = -1) const; + void draw(Painter &p, const HistoryItem *parent, bool selected, int32 width = -1) const; int32 resize(int32 width, const HistoryItem *parent); HistoryMediaType type() const { return MediaTypePhoto; @@ -985,7 +1021,7 @@ public: HistoryVideo(const MTPDvideo &video, const QString &caption, HistoryItem *parent); void initDimensions(const HistoryItem *parent); - void draw(QPainter &p, const HistoryItem *parent, bool selected, int32 width = -1) const; + void draw(Painter &p, const HistoryItem *parent, bool selected, int32 width = -1) const; int32 resize(int32 width, const HistoryItem *parent); HistoryMediaType type() const { return MediaTypeVideo; @@ -1027,7 +1063,7 @@ public: HistoryAudio(const MTPDaudio &audio); void initDimensions(const HistoryItem *parent); - void draw(QPainter &p, const HistoryItem *parent, bool selected, int32 width = -1) const; + void draw(Painter &p, const HistoryItem *parent, bool selected, int32 width = -1) const; HistoryMediaType type() const { return MediaTypeAudio; } @@ -1065,7 +1101,7 @@ public: HistoryDocument(DocumentData *document); void initDimensions(const HistoryItem *parent); - void draw(QPainter &p, const HistoryItem *parent, bool selected, int32 width = -1) const; + void draw(Painter &p, const HistoryItem *parent, bool selected, int32 width = -1) const; int32 resize(int32 width, const HistoryItem *parent); HistoryMediaType type() const { return MediaTypeDocument; @@ -1094,7 +1130,7 @@ public: } ImagePtr replyPreview(); - void drawInPlaylist(QPainter &p, const HistoryItem *parent, bool selected, bool over, int32 width) const; + void drawInPlaylist(Painter &p, const HistoryItem *parent, bool selected, bool over, int32 width) const; TextLinkPtr linkInPlaylist(); private: @@ -1116,7 +1152,7 @@ public: HistorySticker(DocumentData *document); void initDimensions(const HistoryItem *parent); - void draw(QPainter &p, const HistoryItem *parent, bool selected, int32 width = -1) const; + void draw(Painter &p, const HistoryItem *parent, bool selected, int32 width = -1) const; int32 resize(int32 width, const HistoryItem *parent); HistoryMediaType type() const { return MediaTypeSticker; @@ -1152,7 +1188,7 @@ public: HistoryContact(int32 userId, const QString &first, const QString &last, const QString &phone); void initDimensions(const HistoryItem *parent); - void draw(QPainter &p, const HistoryItem *parent, bool selected, int32 width) const; + void draw(Painter &p, const HistoryItem *parent, bool selected, int32 width) const; HistoryMediaType type() const { return MediaTypeContact; } @@ -1178,7 +1214,7 @@ public: HistoryWebPage(WebPageData *data); void initDimensions(const HistoryItem *parent); - void draw(QPainter &p, const HistoryItem *parent, bool selected, int32 width = -1) const; + void draw(Painter &p, const HistoryItem *parent, bool selected, int32 width = -1) const; bool isDisplayed() const { return !data->pendingTill; } @@ -1285,7 +1321,7 @@ public: int32 fullHeight() const; void initDimensions(const HistoryItem *parent); - void draw(QPainter &p, const HistoryItem *parent, bool selected, int32 width = -1) const; + void draw(Painter &p, const HistoryItem *parent, bool selected, int32 width = -1) const; int32 resize(int32 width, const HistoryItem *parent); HistoryMediaType type() const { return MediaTypeImageLink; @@ -1311,9 +1347,8 @@ class HistoryMessage : public HistoryItem { public: HistoryMessage(History *history, HistoryBlock *block, const MTPDmessage &msg); - HistoryMessage(History *history, HistoryBlock *block, MsgId msgId, int32 flags, QDateTime date, int32 from, const QString &msg, const LinksInText &links, const MTPMessageMedia *media); - HistoryMessage(History *history, HistoryBlock *block, MsgId msgId, int32 flags, QDateTime date, int32 from, const QString &msg, const LinksInText &links, HistoryMedia *media); - HistoryMessage(History *history, HistoryBlock *block, MsgId msgId, int32 flags, QDateTime date, int32 from, DocumentData *doc); + HistoryMessage(History *history, HistoryBlock *block, MsgId msgId, int32 flags, QDateTime date, int32 from, const QString &msg, const LinksInText &links, HistoryMedia *media); // local forwarded + HistoryMessage(History *history, HistoryBlock *block, MsgId msgId, int32 flags, QDateTime date, int32 from, DocumentData *doc); // local sticker and reply sticker void initTime(); void initMedia(const MTPMessageMedia *media, QString ¤tText); @@ -1328,11 +1363,14 @@ public: bool uploading() const; - void draw(QPainter &p, uint32 selection) const; - virtual void drawMessageText(QPainter &p, const QRect &trect, uint32 selection) const; + void drawInfo(Painter &p, int32 right, int32 bottom, bool selected, InfoDisplayType type) const; + void setViewsCount(int32 count); + void draw(Painter &p, uint32 selection) const; + virtual void drawMessageText(Painter &p, const QRect &trect, uint32 selection) const; int32 resize(int32 width); bool hasPoint(int32 x, int32 y) const; + bool pointInTime(int32 right, int32 bottom, int32 x, int32 y, InfoDisplayType type) const; void getState(TextLinkPtr &lnk, HistoryCursorState &state, int32 x, int32 y) const; virtual void getStateFromMessageText(TextLinkPtr &lnk, HistoryCursorState &state, int32 x, int32 y, const QRect &r) const; @@ -1342,7 +1380,7 @@ public: return _text.adjustSelection(from, to, type); } - void drawInDialog(QPainter &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; QString notificationHeader() const; QString notificationText() const; @@ -1361,20 +1399,35 @@ public: void getTextWithLinks(QString &text, LinksInText &links); bool textHasLinks(); - QString time() const { - return _time; - } - int32 timeWidth(bool forText) const { + int32 infoWidth() const { int32 result = _timeWidth; - if (forText) { - result += st::msgDateSpace - st::msgDateDelta.x(); - if (fromChannel()) { - } else if (out()) { - result += st::msgDateCheckSpace + st::msgCheckRect.pxWidth(); - } + if (!_viewsText.isEmpty()) { + result += st::msgDateViewsSpace + _viewsWidth + st::msgDateCheckSpace + st::msgViewsImg.pxWidth(); + } + if (out() && !fromChannel()) { + result += st::msgDateCheckSpace + st::msgCheckImg.pxWidth(); } return result; } + int32 timeLeft() const { + int32 result = 0; + if (!_viewsText.isEmpty()) { + result += st::msgDateViewsSpace + _viewsWidth + st::msgDateCheckSpace + st::msgViewsImg.pxWidth(); + } + return result; + } + QString timeText() const { + return _timeText; + } + int32 timeWidth() const { + return _timeWidth; + } + QString viewsText() const { + return _viewsText; + } + int32 viewsWidth() const { + return _viewsWidth; + } virtual bool animating() const { return _media ? _media->animating() : false; } @@ -1402,8 +1455,11 @@ protected: int32 _textWidth, _textHeight; HistoryMedia *_media; - QString _time; + QString _timeText; int32 _timeWidth; + + QString _viewsText; + int32 _views, _viewsWidth; }; @@ -1416,9 +1472,9 @@ public: void initDimensions(); void fwdNameUpdated() const; - void draw(QPainter &p, uint32 selection) const; - void drawForwardedFrom(QPainter &p, int32 x, int32 y, int32 w, bool selected) const; - void drawMessageText(QPainter &p, const QRect &trect, uint32 selection) const; + void draw(Painter &p, uint32 selection) const; + void drawForwardedFrom(Painter &p, int32 x, int32 y, int32 w, bool selected) const; + void drawMessageText(Painter &p, const QRect &trect, uint32 selection) const; int32 resize(int32 width); bool hasPoint(int32 x, int32 y) const; void getState(TextLinkPtr &lnk, HistoryCursorState &state, int32 x, int32 y) const; @@ -1469,9 +1525,9 @@ public: HistoryItem *replyToMessage() const; void replyToReplaced(HistoryItem *oldItem, HistoryItem *newItem); - void draw(QPainter &p, uint32 selection) const; - void drawReplyTo(QPainter &p, int32 x, int32 y, int32 w, bool selected, bool likeService = false) const; - void drawMessageText(QPainter &p, const QRect &trect, uint32 selection) const; + void draw(Painter &p, uint32 selection) const; + void drawReplyTo(Painter &p, int32 x, int32 y, int32 w, bool selected, bool likeService = false) const; + void drawMessageText(Painter &p, const QRect &trect, uint32 selection) const; int32 resize(int32 width); bool hasPoint(int32 x, int32 y) const; void getState(TextLinkPtr &lnk, HistoryCursorState &state, int32 x, int32 y) const; @@ -1512,7 +1568,7 @@ public: void initDimensions(); - void draw(QPainter &p, uint32 selection) const; + void draw(Painter &p, uint32 selection) const; int32 resize(int32 width); bool hasPoint(int32 x, int32 y) const; void getState(TextLinkPtr &lnk, HistoryCursorState &state, int32 x, int32 y) const; @@ -1521,7 +1577,7 @@ public: return _text.adjustSelection(from, to, type); } - void drawInDialog(QPainter &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; QString notificationText() const; bool needCheck() const { @@ -1584,10 +1640,10 @@ public: void setCount(int32 count); - void draw(QPainter &p, uint32 selection) const; + void draw(Painter &p, uint32 selection) const; int32 resize(int32 width); - void drawInDialog(QPainter &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; QString notificationText() const; QString selectedText(uint32 selection) const { diff --git a/Telegram/SourceFiles/historywidget.cpp b/Telegram/SourceFiles/historywidget.cpp index 03aea7ec0..161e2324d 100644 --- a/Telegram/SourceFiles/historywidget.cpp +++ b/Telegram/SourceFiles/historywidget.cpp @@ -99,7 +99,7 @@ void HistoryList::paintEvent(QPaintEvent *e) { QRect r(e->rect()); bool trivial = (rect() == r); - QPainter p(this); + Painter p(this); if (!trivial) { p.setClipRect(r); } @@ -809,14 +809,18 @@ void HistoryList::showContextMenu(QContextMenuEvent *e, bool showFromTouch) { } if (isUponSelected > 1) { _menu->addAction(lang(lng_context_forward_selected), historyWidget, SLOT(onForwardSelected())); - _menu->addAction(lang(lng_context_delete_selected), historyWidget, SLOT(onDeleteSelected())); + if ((!hist->peer->isChannel() || hist->peer->asChannel()->adminned)) { + _menu->addAction(lang(lng_context_delete_selected), historyWidget, SLOT(onDeleteSelected())); + } _menu->addAction(lang(lng_context_clear_selection), historyWidget, SLOT(onClearSelected())); } else if (App::hoveredLinkItem()) { - if (isUponSelected != -2 && (!hist->peer->isChannel() || hist->peer->asChannel()->adminned)) { + if (isUponSelected != -2) { if (dynamic_cast(App::hoveredLinkItem()) && App::hoveredLinkItem()->id > 0) { _menu->addAction(lang(lng_context_forward_msg), historyWidget, SLOT(forwardMessage()))->setEnabled(true); } - _menu->addAction(lang(lng_context_delete_msg), historyWidget, SLOT(deleteMessage()))->setEnabled(true); + if ((!hist->peer->isChannel() || hist->peer->asChannel()->adminned)) { + _menu->addAction(lang(lng_context_delete_msg), historyWidget, SLOT(deleteMessage()))->setEnabled(true); + } } if (App::hoveredLinkItem()->id > 0 && (!hist->peer->isChannel() || hist->peer->asChannel()->adminned)) { _menu->addAction(lang(lng_context_select_msg), historyWidget, SLOT(selectMessage()))->setEnabled(true); @@ -825,7 +829,7 @@ void HistoryList::showContextMenu(QContextMenuEvent *e, bool showFromTouch) { } } else { // maybe cursor on some text history item? bool canDelete = (item && item->itemType() == HistoryItem::MsgType) && (!hist->peer->isChannel() || hist->peer->asChannel()->adminned); - bool canForward = canDelete && (item->id > 0) && !item->serviceMsg(); + bool canForward = (item && item->itemType() == HistoryItem::MsgType) && (item->id > 0) && !item->serviceMsg(); HistoryMessage *msg = dynamic_cast(item); HistoryServiceMsg *srv = dynamic_cast(item); @@ -878,7 +882,9 @@ void HistoryList::showContextMenu(QContextMenuEvent *e, bool showFromTouch) { if (isUponSelected > 1) { if (!_menu) _menu = new ContextMenu(this); _menu->addAction(lang(lng_context_forward_selected), historyWidget, SLOT(onForwardSelected())); - _menu->addAction(lang(lng_context_delete_selected), historyWidget, SLOT(onDeleteSelected())); + if ((!hist->peer->isChannel() || hist->peer->asChannel()->adminned)) { + _menu->addAction(lang(lng_context_delete_selected), historyWidget, SLOT(onDeleteSelected())); + } _menu->addAction(lang(lng_context_clear_selection), historyWidget, SLOT(onClearSelected())); } else if (item && ((isUponSelected != -2 && (canForward || canDelete)) || item->id > 0)) { if (!_menu) _menu = new ContextMenu(this); @@ -3647,10 +3653,11 @@ void HistoryWidget::shareContact(const PeerId &peer, const QString &phone, const bool fromChannelName = p->isChannel(); if (fromChannelName) { sendFlags |= MTPmessages_SendMessage_flag_broadcast; + flags |= MTPDmessage::flag_views; } else { flags |= MTPDmessage::flag_from_id; } - h->addToBack(MTP_message(MTP_int(flags), MTP_int(newId.msg), MTP_int(fromChannelName ? 0 : MTP::authedId()), peerToMTP(peer), MTPPeer(), MTPint(), MTP_int(replyToId()), MTP_int(unixtime()), MTP_string(""), MTP_messageMediaContact(MTP_string(phone), MTP_string(fname), MTP_string(lname), MTP_int(userId)), MTPnullMarkup, MTPnullEntities, MTPint())); + h->addToBack(MTP_message(MTP_int(flags), MTP_int(newId.msg), MTP_int(fromChannelName ? 0 : MTP::authedId()), peerToMTP(peer), MTPPeer(), MTPint(), MTP_int(replyToId()), MTP_int(unixtime()), MTP_string(""), MTP_messageMediaContact(MTP_string(phone), MTP_string(fname), MTP_string(lname), MTP_int(userId)), MTPnullMarkup, MTPnullEntities, MTP_int(1))); h->sendRequestId = MTP::send(MTPmessages_SendMedia(MTP_int(sendFlags), p->input, MTP_int(replyTo), MTP_inputMediaContact(MTP_string(phone), MTP_string(fname), MTP_string(lname)), MTP_long(randomId), MTPnullMarkup), App::main()->rpcDone(&MainWidget::sentUpdatesReceived), App::main()->rpcFail(&MainWidget::sendMessageFail), 0, 0, h->sendRequestId); App::historyRegRandom(randomId, newId); @@ -4552,16 +4559,17 @@ void HistoryWidget::confirmSendImage(const ReadyLocalMedia &img) { if (img.replyTo) flags |= MTPDmessage::flag_reply_to_msg_id; bool fromChannelName = h->peer->isChannel(); if (fromChannelName) { + flags |= MTPDmessage::flag_views; } else { flags |= MTPDmessage::flag_from_id; } if (img.type == ToPreparePhoto) { - h->addToBack(MTP_message(MTP_int(flags), MTP_int(newId.msg), MTP_int(fromChannelName ? 0 : MTP::authedId()), peerToMTP(img.peer), MTPPeer(), MTPint(), MTP_int(img.replyTo), MTP_int(unixtime()), MTP_string(""), MTP_messageMediaPhoto(img.photo, MTP_string("")), MTPnullMarkup, MTPnullEntities, MTPint())); + h->addToBack(MTP_message(MTP_int(flags), MTP_int(newId.msg), MTP_int(fromChannelName ? 0 : MTP::authedId()), peerToMTP(img.peer), MTPPeer(), MTPint(), MTP_int(img.replyTo), MTP_int(unixtime()), MTP_string(""), MTP_messageMediaPhoto(img.photo, MTP_string("")), MTPnullMarkup, MTPnullEntities, MTP_int(1))); } else if (img.type == ToPrepareDocument) { - h->addToBack(MTP_message(MTP_int(flags), MTP_int(newId.msg), MTP_int(fromChannelName ? 0 : MTP::authedId()), peerToMTP(img.peer), MTPPeer(), MTPint(), MTP_int(img.replyTo), MTP_int(unixtime()), MTP_string(""), MTP_messageMediaDocument(img.document), MTPnullMarkup, MTPnullEntities, MTPint())); + h->addToBack(MTP_message(MTP_int(flags), MTP_int(newId.msg), MTP_int(fromChannelName ? 0 : MTP::authedId()), peerToMTP(img.peer), MTPPeer(), MTPint(), MTP_int(img.replyTo), MTP_int(unixtime()), MTP_string(""), MTP_messageMediaDocument(img.document), MTPnullMarkup, MTPnullEntities, MTP_int(1))); } else if (img.type == ToPrepareAudio) { flags |= MTPDmessage_flag_media_unread; - h->addToBack(MTP_message(MTP_int(flags), MTP_int(newId.msg), MTP_int(fromChannelName ? 0 : MTP::authedId()), peerToMTP(img.peer), MTPPeer(), MTPint(), MTP_int(img.replyTo), MTP_int(unixtime()), MTP_string(""), MTP_messageMediaAudio(img.audio), MTPnullMarkup, MTPnullEntities, MTPint())); + h->addToBack(MTP_message(MTP_int(flags), MTP_int(newId.msg), MTP_int(fromChannelName ? 0 : MTP::authedId()), peerToMTP(img.peer), MTPPeer(), MTPint(), MTP_int(img.replyTo), MTP_int(unixtime()), MTP_string(""), MTP_messageMediaAudio(img.audio), MTPnullMarkup, MTPnullEntities, MTP_int(1))); } if (_peer && img.peer == _peer->id) { @@ -5557,7 +5565,7 @@ void HistoryWidget::onForwardSelected() { } void HistoryWidget::onDeleteSelected() { - if (!_list) return; + if (!_list || (peer()->isChannel() && !peer()->asChannel()->adminned)) return; SelectedItemSet sel; _list->fillSelectedItems(sel); diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp index eda4606fa..119d77bd6 100644 --- a/Telegram/SourceFiles/mainwidget.cpp +++ b/Telegram/SourceFiles/mainwidget.cpp @@ -1123,11 +1123,12 @@ void MainWidget::sendPreparedText(History *hist, const QString &text, MsgId repl bool fromChannelName = hist->peer->isChannel(); if (fromChannelName) { sendFlags |= MTPmessages_SendMessage_flag_broadcast; + flags |= MTPDmessage::flag_views; } else { flags |= MTPDmessage::flag_from_id; } MTPVector localEntities = linksToMTP(textParseLinks(sendingText, itemTextParseOptions(hist, App::self()).flags)); - hist->addToBack(MTP_message(MTP_int(flags), MTP_int(newId.msg), MTP_int(fromChannelName ? 0 : MTP::authedId()), peerToMTP(hist->peer->id), MTPPeer(), MTPint(), MTP_int(replyTo), MTP_int(unixtime()), msgText, media, MTPnullMarkup, localEntities, MTPint())); + hist->addToBack(MTP_message(MTP_int(flags), MTP_int(newId.msg), MTP_int(fromChannelName ? 0 : MTP::authedId()), peerToMTP(hist->peer->id), MTPPeer(), MTPint(), MTP_int(replyTo), MTP_int(unixtime()), msgText, media, MTPnullMarkup, localEntities, MTP_int(1))); hist->sendRequestId = MTP::send(MTPmessages_SendMessage(MTP_int(sendFlags), hist->peer->input, MTP_int(replyTo), msgText, MTP_long(randomId), MTPnullMarkup, localEntities), rpcDone(&MainWidget::sentUpdatesReceived, randomId), rpcFail(&MainWidget::sendMessageFail), 0, 0, hist->sendRequestId); } @@ -3801,7 +3802,7 @@ void MainWidget::feedUpdate(const MTPUpdate &update) { return; } if (d.vmessage.type() == mtpc_message) { // index forwarded messages to links overview - App::checkEntitiesUpdate(d.vmessage.c_message()); + App::checkEntitiesAndViewsUpdate(d.vmessage.c_message()); } HistoryItem *item = App::histories().addToBack(d.vmessage); @@ -4102,7 +4103,7 @@ void MainWidget::feedUpdate(const MTPUpdate &update) { } } if (d.vmessage.type() == mtpc_message) { // index forwarded messages to links overview - App::checkEntitiesUpdate(d.vmessage.c_message()); + App::checkEntitiesAndViewsUpdate(d.vmessage.c_message()); } HistoryItem *item = App::histories().addToBack(d.vmessage); @@ -4149,7 +4150,7 @@ void MainWidget::feedUpdate(const MTPUpdate &update) { const MTPDupdateChannelMessageViews &d(update.c_updateChannelMessageViews()); if (HistoryItem *item = App::histItemById(peerToChannel(peerFromMTP(d.vpeer)), d.vid.v)) { if (item->from()->id == peerFromMTP(d.vpeer) && item->channelId() != NoChannel) { - // CHANNELS_TODO + item->setViewsCount(d.vviews.v); } } } break; diff --git a/Telegram/SourceFiles/mtproto/mtpScheme.cpp b/Telegram/SourceFiles/mtproto/mtpScheme.cpp index 13b21fb51..e6aa6ec56 100644 --- a/Telegram/SourceFiles/mtproto/mtpScheme.cpp +++ b/Telegram/SourceFiles/mtproto/mtpScheme.cpp @@ -2784,6 +2784,19 @@ void mtpTextSerializeType(MTPStringLogger &to, const mtpPrime *&from, const mtpP } break; + case mtpc_updateChannel: + if (stage) { + to.add(",\n").addSpaces(lev); + } else { + to.add("{ updateChannel"); + to.add("\n").addSpaces(lev); + } + switch (stage) { + case 0: to.add(" channel_id: "); ++stages.back(); types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + default: to.add("}"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); break; + } + break; + case mtpc_updateChannelGroup: if (stage) { to.add(",\n").addSpaces(lev); @@ -6192,7 +6205,8 @@ void mtpTextSerializeType(MTPStringLogger &to, const mtpPrime *&from, const mtpP switch (stage) { case 0: to.add(" flags: "); ++stages.back(); if (start >= end) throw Exception("start >= end in flags"); else flags.back() = *start; types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; case 1: to.add(" title: "); ++stages.back(); types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; - case 2: to.add(" users: "); ++stages.back(); types.push_back(00); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + case 2: to.add(" about: "); ++stages.back(); types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + case 3: to.add(" users: "); ++stages.back(); types.push_back(00); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; default: to.add("}"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); break; } break; diff --git a/Telegram/SourceFiles/mtproto/mtpScheme.h b/Telegram/SourceFiles/mtproto/mtpScheme.h index 04328bb9e..92b0133b0 100644 --- a/Telegram/SourceFiles/mtproto/mtpScheme.h +++ b/Telegram/SourceFiles/mtproto/mtpScheme.h @@ -255,6 +255,7 @@ enum { mtpc_updateWebPage = 0x7f891213, mtpc_updateReadMessagesContents = 0x68c13933, mtpc_updateChannelTooLong = 0x60946422, + mtpc_updateChannel = 0xb6d45656, mtpc_updateChannelGroup = 0xc36c1e3c, mtpc_updateNewChannelMessage = 0x62ba04d9, mtpc_updateReadChannelInbox = 0x87b87b7d, @@ -517,7 +518,7 @@ enum { mtpc_messages_getChannelDialogs = 0x92689583, mtpc_messages_getImportantHistory = 0x24af43a5, mtpc_messages_readChannelHistory = 0x36a1210e, - mtpc_messages_createChannel = 0xe830f8cb, + mtpc_messages_createChannel = 0x7f44d2c3, mtpc_messages_deleteChannelMessages = 0x9995a84f, mtpc_messages_getChannelMessages = 0x5f46b265, mtpc_messages_incrementMessagesViews = 0x91ffd479, @@ -878,6 +879,7 @@ class MTPDupdateReadHistoryOutbox; class MTPDupdateWebPage; class MTPDupdateReadMessagesContents; class MTPDupdateChannelTooLong; +class MTPDupdateChannel; class MTPDupdateChannelGroup; class MTPDupdateNewChannelMessage; class MTPDupdateReadChannelInbox; @@ -5306,6 +5308,18 @@ public: return *(const MTPDupdateChannelTooLong*)data; } + MTPDupdateChannel &_updateChannel() { + if (!data) throw mtpErrorUninitialized(); + if (_type != mtpc_updateChannel) throw mtpErrorWrongTypeId(_type, mtpc_updateChannel); + split(); + return *(MTPDupdateChannel*)data; + } + const MTPDupdateChannel &c_updateChannel() const { + if (!data) throw mtpErrorUninitialized(); + if (_type != mtpc_updateChannel) throw mtpErrorWrongTypeId(_type, mtpc_updateChannel); + return *(const MTPDupdateChannel*)data; + } + MTPDupdateChannelGroup &_updateChannelGroup() { if (!data) throw mtpErrorUninitialized(); if (_type != mtpc_updateChannelGroup) throw mtpErrorWrongTypeId(_type, mtpc_updateChannelGroup); @@ -5404,6 +5418,7 @@ private: explicit MTPupdate(MTPDupdateWebPage *_data); explicit MTPupdate(MTPDupdateReadMessagesContents *_data); explicit MTPupdate(MTPDupdateChannelTooLong *_data); + explicit MTPupdate(MTPDupdateChannel *_data); explicit MTPupdate(MTPDupdateChannelGroup *_data); explicit MTPupdate(MTPDupdateNewChannelMessage *_data); explicit MTPupdate(MTPDupdateReadChannelInbox *_data); @@ -5439,6 +5454,7 @@ private: friend MTPupdate MTP_updateWebPage(const MTPWebPage &_webpage, MTPint _pts, MTPint _pts_count); friend MTPupdate MTP_updateReadMessagesContents(const MTPVector &_messages, MTPint _pts, MTPint _pts_count); friend MTPupdate MTP_updateChannelTooLong(MTPint _channel_id); + friend MTPupdate MTP_updateChannel(MTPint _channel_id); friend MTPupdate MTP_updateChannelGroup(MTPint _channel_id, const MTPMessageGroup &_group); friend MTPupdate MTP_updateNewChannelMessage(const MTPMessage &_message, MTPint _pts, MTPint _pts_count); friend MTPupdate MTP_updateReadChannelInbox(const MTPPeer &_peer, MTPint _max_id); @@ -10525,6 +10541,16 @@ public: MTPint vchannel_id; }; +class MTPDupdateChannel : public mtpDataImpl { +public: + MTPDupdateChannel() { + } + MTPDupdateChannel(MTPint _channel_id) : vchannel_id(_channel_id) { + } + + MTPint vchannel_id; +}; + class MTPDupdateChannelGroup : public mtpDataImpl { public: MTPDupdateChannelGroup() { @@ -16819,6 +16845,7 @@ class MTPmessages_createChannel { // RPC method 'messages.createChannel' public: MTPint vflags; MTPstring vtitle; + MTPstring vabout; MTPVector vusers; MTPmessages_createChannel() { @@ -16826,11 +16853,11 @@ public: MTPmessages_createChannel(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_messages_createChannel) { read(from, end, cons); } - MTPmessages_createChannel(MTPint _flags, const MTPstring &_title, const MTPVector &_users) : vflags(_flags), vtitle(_title), vusers(_users) { + MTPmessages_createChannel(MTPint _flags, const MTPstring &_title, const MTPstring &_about, const MTPVector &_users) : vflags(_flags), vtitle(_title), vabout(_about), vusers(_users) { } uint32 innerLength() const { - return vflags.innerLength() + vtitle.innerLength() + vusers.innerLength(); + return vflags.innerLength() + vtitle.innerLength() + vabout.innerLength() + vusers.innerLength(); } mtpTypeId type() const { return mtpc_messages_createChannel; @@ -16838,11 +16865,13 @@ public: void read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_messages_createChannel) { vflags.read(from, end); vtitle.read(from, end); + vabout.read(from, end); vusers.read(from, end); } void write(mtpBuffer &to) const { vflags.write(to); vtitle.write(to); + vabout.write(to); vusers.write(to); } @@ -16856,7 +16885,7 @@ public: } MTPmessages_CreateChannel(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = 0) : MTPBoxed(from, end, cons) { } - MTPmessages_CreateChannel(MTPint _flags, const MTPstring &_title, const MTPVector &_users) : MTPBoxed(MTPmessages_createChannel(_flags, _title, _users)) { + MTPmessages_CreateChannel(MTPint _flags, const MTPstring &_title, const MTPstring &_about, const MTPVector &_users) : MTPBoxed(MTPmessages_createChannel(_flags, _title, _about, _users)) { } }; @@ -22905,6 +22934,10 @@ inline uint32 MTPupdate::innerLength() const { const MTPDupdateChannelTooLong &v(c_updateChannelTooLong()); return v.vchannel_id.innerLength(); } + case mtpc_updateChannel: { + const MTPDupdateChannel &v(c_updateChannel()); + return v.vchannel_id.innerLength(); + } case mtpc_updateChannelGroup: { const MTPDupdateChannelGroup &v(c_updateChannelGroup()); return v.vchannel_id.innerLength() + v.vgroup.innerLength(); @@ -23128,6 +23161,11 @@ inline void MTPupdate::read(const mtpPrime *&from, const mtpPrime *end, mtpTypeI MTPDupdateChannelTooLong &v(_updateChannelTooLong()); v.vchannel_id.read(from, end); } break; + case mtpc_updateChannel: _type = cons; { + if (!data) setData(new MTPDupdateChannel()); + MTPDupdateChannel &v(_updateChannel()); + v.vchannel_id.read(from, end); + } break; case mtpc_updateChannelGroup: _type = cons; { if (!data) setData(new MTPDupdateChannelGroup()); MTPDupdateChannelGroup &v(_updateChannelGroup()); @@ -23331,6 +23369,10 @@ inline void MTPupdate::write(mtpBuffer &to) const { const MTPDupdateChannelTooLong &v(c_updateChannelTooLong()); v.vchannel_id.write(to); } break; + case mtpc_updateChannel: { + const MTPDupdateChannel &v(c_updateChannel()); + v.vchannel_id.write(to); + } break; case mtpc_updateChannelGroup: { const MTPDupdateChannelGroup &v(c_updateChannelGroup()); v.vchannel_id.write(to); @@ -23393,6 +23435,7 @@ inline MTPupdate::MTPupdate(mtpTypeId type) : mtpDataOwner(0), _type(type) { case mtpc_updateWebPage: setData(new MTPDupdateWebPage()); break; case mtpc_updateReadMessagesContents: setData(new MTPDupdateReadMessagesContents()); break; case mtpc_updateChannelTooLong: setData(new MTPDupdateChannelTooLong()); break; + case mtpc_updateChannel: setData(new MTPDupdateChannel()); break; case mtpc_updateChannelGroup: setData(new MTPDupdateChannelGroup()); break; case mtpc_updateNewChannelMessage: setData(new MTPDupdateNewChannelMessage()); break; case mtpc_updateReadChannelInbox: setData(new MTPDupdateReadChannelInbox()); break; @@ -23459,6 +23502,8 @@ inline MTPupdate::MTPupdate(MTPDupdateReadMessagesContents *_data) : mtpDataOwne } inline MTPupdate::MTPupdate(MTPDupdateChannelTooLong *_data) : mtpDataOwner(_data), _type(mtpc_updateChannelTooLong) { } +inline MTPupdate::MTPupdate(MTPDupdateChannel *_data) : mtpDataOwner(_data), _type(mtpc_updateChannel) { +} inline MTPupdate::MTPupdate(MTPDupdateChannelGroup *_data) : mtpDataOwner(_data), _type(mtpc_updateChannelGroup) { } inline MTPupdate::MTPupdate(MTPDupdateNewChannelMessage *_data) : mtpDataOwner(_data), _type(mtpc_updateNewChannelMessage) { @@ -23556,6 +23601,9 @@ inline MTPupdate MTP_updateReadMessagesContents(const MTPVector &_messag inline MTPupdate MTP_updateChannelTooLong(MTPint _channel_id) { return MTPupdate(new MTPDupdateChannelTooLong(_channel_id)); } +inline MTPupdate MTP_updateChannel(MTPint _channel_id) { + return MTPupdate(new MTPDupdateChannel(_channel_id)); +} inline MTPupdate MTP_updateChannelGroup(MTPint _channel_id, const MTPMessageGroup &_group) { return MTPupdate(new MTPDupdateChannelGroup(_channel_id, _group)); } diff --git a/Telegram/SourceFiles/mtproto/scheme.tl b/Telegram/SourceFiles/mtproto/scheme.tl index 40d76656f..ff463de04 100644 --- a/Telegram/SourceFiles/mtproto/scheme.tl +++ b/Telegram/SourceFiles/mtproto/scheme.tl @@ -378,6 +378,7 @@ updateReadHistoryOutbox#2f2f21bf peer:Peer max_id:int pts:int pts_count:int = Up updateWebPage#7f891213 webpage:WebPage pts:int pts_count:int = Update; updateReadMessagesContents#68c13933 messages:Vector pts:int pts_count:int = Update; updateChannelTooLong#60946422 channel_id:int = Update; +updateChannel#b6d45656 channel_id:int = Update; updateChannelGroup#c36c1e3c channel_id:int group:MessageGroup = Update; updateNewChannelMessage#62ba04d9 message:Message pts:int pts_count:int = Update; updateReadChannelInbox#87b87b7d peer:Peer max_id:int = Update; @@ -716,7 +717,7 @@ messages.startBot#f4cc052d bot:InputUser chat_id:InputChat random_id:long start_ messages.getChannelDialogs#92689583 offset:int limit:int = messages.Dialogs; messages.getImportantHistory#24af43a5 peer:InputPeer offset_id:int add_offset:int limit:int max_id:int min_id:int = messages.Messages; messages.readChannelHistory#36a1210e peer:InputPeer max_id:int = Bool; -messages.createChannel#e830f8cb flags:# title:string users:Vector = Updates; +messages.createChannel#7f44d2c3 flags:# title:string about:string users:Vector = Updates; messages.deleteChannelMessages#9995a84f peer:InputPeer id:Vector = messages.AffectedMessages; messages.getChannelMessages#5f46b265 peer:InputPeer id:Vector = messages.Messages; messages.incrementMessagesViews#91ffd479 peer:InputPeer id:Vector = Bool; diff --git a/Telegram/SourceFiles/overviewwidget.cpp b/Telegram/SourceFiles/overviewwidget.cpp index ed20a1445..125ad8c04 100644 --- a/Telegram/SourceFiles/overviewwidget.cpp +++ b/Telegram/SourceFiles/overviewwidget.cpp @@ -985,7 +985,7 @@ QPixmap OverviewInner::genPix(PhotoData *photo, int32 size) { } void OverviewInner::paintEvent(QPaintEvent *e) { - QPainter p(this); + Painter p(this); QRect r(e->rect()); p.setClipRect(r); @@ -1784,7 +1784,9 @@ void OverviewInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) { } if (isUponSelected > 1) { _menu->addAction(lang(lng_context_forward_selected), _overview, SLOT(onForwardSelected())); - _menu->addAction(lang(lng_context_delete_selected), _overview, SLOT(onDeleteSelected())); + if (!_peer->isChannel() || _peer->asChannel()->adminned) { + _menu->addAction(lang(lng_context_delete_selected), _overview, SLOT(onDeleteSelected())); + } _menu->addAction(lang(lng_context_clear_selection), _overview, SLOT(onClearSelected())); } else if (App::hoveredLinkItem()) { if (isUponSelected != -2) { @@ -1822,7 +1824,9 @@ void OverviewInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) { _menu->addAction(lang(lng_context_to_msg), this, SLOT(goToMessage()))->setEnabled(true); if (isUponSelected > 1) { _menu->addAction(lang(lng_context_forward_selected), _overview, SLOT(onForwardSelected())); - _menu->addAction(lang(lng_context_delete_selected), _overview, SLOT(onDeleteSelected())); + if (!_peer->isChannel() || _peer->asChannel()->adminned) { + _menu->addAction(lang(lng_context_delete_selected), _overview, SLOT(onDeleteSelected())); + } _menu->addAction(lang(lng_context_clear_selection), _overview, SLOT(onClearSelected())); } else { if (isUponSelected != -2) { diff --git a/Telegram/SourceFiles/window.cpp b/Telegram/SourceFiles/window.cpp index 53863853d..5c90d402f 100644 --- a/Telegram/SourceFiles/window.cpp +++ b/Telegram/SourceFiles/window.cpp @@ -151,7 +151,7 @@ void NotifyWindow::updateNotifyDisplay() { img.fill(st::notifyBG->c); { - QPainter p(&img); + Painter p(&img); p.fillRect(0, 0, w - st::notifyBorderWidth, st::notifyBorderWidth, st::notifyBorder->b); p.fillRect(w - st::notifyBorderWidth, 0, st::notifyBorderWidth, h - st::notifyBorderWidth, st::notifyBorder->b); p.fillRect(st::notifyBorderWidth, h - st::notifyBorderWidth, w - st::notifyBorderWidth, st::notifyBorderWidth, st::notifyBorder->b); @@ -174,9 +174,12 @@ void NotifyWindow::updateNotifyDisplay() { QRect rectForName(st::notifyPhotoPos.x() + st::notifyPhotoSize + st::notifyTextLeft, st::notifyTextTop, itemWidth, st::msgNameFont->height); if (!App::passcoded() && cNotifyView() <= dbinvShowName) { - if (history->peer->isChat()) { // CHANNELS_UI - p.drawPixmap(QPoint(rectForName.left() + st::dlgChatImgLeft, rectForName.top() + st::dlgChatImgTop), App::sprite(), st::dlgChatImg); - rectForName.setLeft(rectForName.left() + st::dlgChatImgSkip); + if (history->peer->isChat()) { + p.drawPixmap(QPoint(rectForName.left() + st::dlgChatImgPos.x(), rectForName.top() + st::dlgChatImgPos.y()), App::sprite(), st::dlgChatImg); + rectForName.setLeft(rectForName.left() + st::dlgImgSkip); + } else if (history->peer->isChannel()) { + p.drawPixmap(QPoint(rectForName.left() + st::dlgChannelImgPos.x(), rectForName.top() + st::dlgChannelImgPos.y()), App::sprite(), st::dlgChannelImg); + rectForName.setLeft(rectForName.left() + st::dlgImgSkip); } }