procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Move draw / getState code to HistoryView::Message. 

Item dimensions broken for now.
Also remove history.h from pch.
This commit is contained in:
John Preston 2018-01-13 15:45:11 +03:00
parent bee474f6e9
commit 97a9089ebf
95 changed files with 3215 additions and 2768 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Telegram/SourceFiles/apiwrap.cpp
View File

@ -20,6 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "messenger.h"
#include "mainwidget.h"
#include "boxes/add_contact_box.h"
#include "history/history.h"
#include "history/history_message.h"
#include "history/history_media_types.h"
#include "history/history_item_components.h"
@ -1726,7 +1727,7 @@ void ApiWrap::gotWebPages(ChannelData *channel, const MTPmessages_Messages &msgs
v->at(index),
NewMessageExisting);
if (item) {
item->setPendingInitDimensions();
Auth().data().requestItemViewResize(item);
}
}
@ -1738,7 +1739,7 @@ void ApiWrap::gotWebPages(ChannelData *channel, const MTPmessages_Messages &msgs
auto j = items.constFind(i.key());
if (j != items.cend()) {
for_const (auto item, j.value()) {
item->setPendingInitDimensions();
Auth().data().requestItemViewResize(item);
}
}
}

3
Telegram/SourceFiles/app.cpp
View File

@ -19,6 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "lang/lang_keys.h"
#include "data/data_abstract_structure.h"
#include "data/data_session.h"
#include "history/history.h"
#include "history/history_location_manager.h"
#include "history/history_media_types.h"
#include "history/history_item_components.h"
@ -1607,7 +1608,7 @@ namespace {
auto i = items.constFind(result);
if (i != items.cend()) {
for_const (auto item, i.value()) {
item->setPendingInitDimensions();
Auth().data().requestItemViewResize(item);
}
}
}

9
Telegram/SourceFiles/app.h
View File

@ -8,17 +8,20 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#pragma once
#include "core/basic_types.h"
#include "history/history.h"
#include "data/data_types.h"
#include "data/data_peer.h"
enum NewMessageType : char;
class Messenger;
class MainWindow;
class MainWidget;
class LocationCoords;
struct LocationData;
class HistoryItem;
class History;
class Histories;
namespace HistoryView {
class Message;
class Element;
} // namespace HistoryView
using HistoryItemsMap = base::flat_set<not_null<HistoryItem*>>;

1
Telegram/SourceFiles/boxes/confirm_box.cpp
View File

@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "mainwindow.h"
#include "apiwrap.h"
#include "application.h"
#include "history/history.h"
#include "history/history_item.h"
#include "ui/widgets/checkbox.h"
#include "ui/widgets/buttons.h"

2
Telegram/SourceFiles/boxes/edit_caption_box.cpp
View File

@ -10,6 +10,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/widgets/input_fields.h"
#include "ui/text_options.h"
#include "media/media_clip_reader.h"
#include "history/history.h"
#include "history/history_item.h"
#include "history/history_media_types.h"
#include "lang/lang_keys.h"
#include "window/window_controller.h"

2
Telegram/SourceFiles/boxes/edit_caption_box.h
View File

@ -9,6 +9,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "boxes/abstract_box.h"
class HistoryMedia;
namespace Ui {
class InputArea;
} // namespace Ui

1
Telegram/SourceFiles/boxes/edit_privacy_box.cpp
View File

@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/widgets/labels.h"
#include "ui/widgets/buttons.h"
#include "ui/wrap/slide_wrap.h"
#include "history/history.h"
#include "boxes/peer_list_controllers.h"
#include "apiwrap.h"
#include "auth_session.h"

6
Telegram/SourceFiles/boxes/peer_list_controllers.cpp
View File

@ -17,6 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "apiwrap.h"
#include "mainwidget.h"
#include "lang/lang_keys.h"
#include "history/history.h"
#include "dialogs/dialogs_indexed_list.h"
namespace {
@ -208,6 +209,11 @@ bool PeerListGlobalSearchController::isLoading() {
return _timer.isActive() || _requestId;
}
ChatsListBoxController::Row::Row(not_null<History*> history)
: PeerListRow(history->peer)
, _history(history) {
}
ChatsListBoxController::ChatsListBoxController(
std::unique_ptr<PeerListSearchController> searchController)
: PeerListController(std::move(searchController)) {

4
Telegram/SourceFiles/boxes/peer_list_controllers.h
View File

@ -91,8 +91,8 @@ public:
protected:
class Row : public PeerListRow {
public:
Row(not_null<History*> history) : PeerListRow(history->peer), _history(history) {
}
Row(not_null<History*> history);
not_null<History*> history() const {
return _history;
}

1
Telegram/SourceFiles/boxes/share_box.cpp
View File

@ -23,6 +23,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/widgets/buttons.h"
#include "ui/widgets/scroll_area.h"
#include "ui/text_options.h"
#include "history/history.h"
#include "history/history_media_types.h"
#include "history/history_message.h"
#include "window/themes/window_theme.h"

2
Telegram/SourceFiles/calls/calls_box_controller.cpp
View File

@ -13,6 +13,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "observer_peer.h"
#include "ui/effects/ripple_animation.h"
#include "calls/calls_instance.h"
#include "history/history.h"
#include "history/history_item.h"
#include "history/history_media_types.h"
#include "mainwidget.h"
#include "auth_session.h"

1
Telegram/SourceFiles/chat_helpers/bot_keyboard.cpp
View File

@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/
#include "chat_helpers/bot_keyboard.h"
#include "history/history.h"
#include "history/history_item_components.h"
#include "styles/style_widgets.h"
#include "styles/style_history.h"

2
Telegram/SourceFiles/data/data_channel_admins.cpp
View File

@ -7,6 +7,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/
#include "data/data_channel_admins.h"
#include "history/history.h"
namespace Data {
ChannelAdminChanges::ChannelAdminChanges(not_null<ChannelData*> channel)

2
Telegram/SourceFiles/data/data_document.cpp
View File

@ -15,6 +15,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "media/media_audio.h"
#include "storage/localstorage.h"
#include "platform/platform_specific.h"
#include "history/history.h"
#include "history/history_item.h"
#include "history/history_media_types.h"
#include "auth_session.h"
#include "messenger.h"

1
Telegram/SourceFiles/data/data_drafts.cpp
View File

@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/widgets/input_fields.h"
#include "chat_helpers/message_field.h"
#include "history/history.h"
#include "history/history_widget.h"
#include "mainwidget.h"
#include "storage/localstorage.h"

1
Telegram/SourceFiles/data/data_feed.cpp
View File

@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "data/data_feed.h"
#include "dialogs/dialogs_key.h"
#include "history/history.h"
#include "history/history_item.h"
namespace Data {

1
Telegram/SourceFiles/data/data_peer.cpp
View File

@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "data/data_photo.h"
#include "data/data_feed.h"
#include "data/data_session.h"
#include "history/history.h"
#include "lang/lang_keys.h"
#include "observer_peer.h"
#include "mainwidget.h"

1
Telegram/SourceFiles/data/data_search_controller.cpp
View File

@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "auth_session.h"
#include "data/data_session.h"
#include "data/data_messages.h"
#include "history/history.h"
#include "history/history_item.h"
namespace Api {

1
Telegram/SourceFiles/data/data_search_controller.h
View File

@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "storage/storage_sparse_ids_list.h"
#include "storage/storage_shared_media.h"
#include "base/value_ordering.h"
#include "base/timer.h"
namespace Data {
enum class LoadDirection : char;

18
Telegram/SourceFiles/data/data_session.cpp
View File

@ -43,6 +43,22 @@ rpl::producer<not_null<const HistoryItem*>> Session::itemRepaintRequest() const
return _itemRepaintRequest.events();
}
void Session::requestItemViewResize(not_null<const HistoryItem*> item) {
_itemViewResizeRequest.fire_copy(item);
}
rpl::producer<not_null<const HistoryItem*>> Session::itemViewResizeRequest() const {
return _itemViewResizeRequest.events();
}
void Session::requestItemViewRefresh(not_null<const HistoryItem*> item) {
_itemViewRefreshRequest.fire_copy(item);
}
rpl::producer<not_null<const HistoryItem*>> Session::itemViewRefreshRequest() const {
return _itemViewRefreshRequest.events();
}
void Session::markItemRemoved(not_null<const HistoryItem*> item) {
_itemRemoved.fire_copy(item);
}
@ -130,7 +146,7 @@ void Session::userIsContactUpdated(not_null<UserData*> user) {
const auto i = items.constFind(peerToUser(user->id));
if (i != items.cend()) {
for (const auto item : std::as_const(i.value())) {
item->setPendingInitDimensions();
requestItemViewResize(item);
}
}
}

6
Telegram/SourceFiles/data/data_session.h
View File

@ -44,6 +44,10 @@ public:
rpl::producer<not_null<const HistoryItem*>> itemLayoutChanged() const;
void requestItemRepaint(not_null<const HistoryItem*> item);
rpl::producer<not_null<const HistoryItem*>> itemRepaintRequest() const;
void requestItemViewResize(not_null<const HistoryItem*> item);
rpl::producer<not_null<const HistoryItem*>> itemViewResizeRequest() const;
void requestItemViewRefresh(not_null<const HistoryItem*> item);
rpl::producer<not_null<const HistoryItem*>> itemViewRefreshRequest() const;
void markItemRemoved(not_null<const HistoryItem*> item);
rpl::producer<not_null<const HistoryItem*>> itemRemoved() const;
void markHistoryUnloaded(not_null<const History*> history);
@ -179,6 +183,8 @@ private:
base::Observable<ItemVisibilityQuery> _queryItemVisibility;
rpl::event_stream<not_null<const HistoryItem*>> _itemLayoutChanged;
rpl::event_stream<not_null<const HistoryItem*>> _itemRepaintRequest;
rpl::event_stream<not_null<const HistoryItem*>> _itemViewResizeRequest;
rpl::event_stream<not_null<const HistoryItem*>> _itemViewRefreshRequest;
rpl::event_stream<not_null<const HistoryItem*>> _itemRemoved;
rpl::event_stream<not_null<const History*>> _historyUnloaded;
rpl::event_stream<not_null<const History*>> _historyCleared;

2
Telegram/SourceFiles/data/data_shared_media.cpp
View File

@ -12,6 +12,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "apiwrap.h"
#include "storage/storage_facade.h"
#include "storage/storage_shared_media.h"
#include "history/history.h"
#include "history/history_item.h"
#include "history/history_media_types.h"
#include "data/data_sparse_ids.h"
#include "info/info_memento.h"

3
Telegram/SourceFiles/data/data_types.h
View File

@ -7,6 +7,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/
#pragma once
class HistoryItem;
using HistoryItemsList = std::vector<not_null<HistoryItem*>>;
namespace Data {
struct UploadState {

1
Telegram/SourceFiles/dialogs/dialogs_entry.cpp
View File

@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "mainwidget.h"
#include "styles/style_dialogs.h"
#include "history/history_item.h"
#include "history/history.h"
namespace Dialogs {
namespace {

1
Telegram/SourceFiles/dialogs/dialogs_indexed_list.cpp
View File

@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "auth_session.h"
#include "data/data_session.h"
#include "history/history.h"
namespace Dialogs {

9
Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
View File

@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "dialogs/dialogs_layout.h"
#include "dialogs/dialogs_search_from_controllers.h"
#include "history/feed/history_feed_section.h"
#include "history/history.h"
#include "history/history_item.h"
#include "styles/style_dialogs.h"
#include "styles/style_chat_helpers.h"
@ -323,7 +324,7 @@ void DialogsInner::paintRegion(Painter &p, const QRegion &region, bool paintingO
const auto row = _filterResults[from];
const auto key = row->key();
const auto history = key.history();
const auto peer = history ? history->peer : nullptr;
const auto peer = history ? history->peer.get() : nullptr;
const auto active = !activeMsgId
&& peer
&& activePeer
@ -1356,6 +1357,12 @@ void DialogsInner::updateSelectedRow(Dialogs::Key key) {
}
}
Dialogs::IndexedList *DialogsInner::shownDialogs() const {
return (Global::DialogsMode() == Dialogs::Mode::Important)
? _dialogsImportant.get()
: _dialogs.get();
}
void DialogsInner::leaveEventHook(QEvent *e) {
setMouseTracking(false);
clearSelection();

4
Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
View File

@ -244,9 +244,7 @@ private:
void clearSearchResults(bool clearPeerSearchResults = true);
void updateSelectedRow(Dialogs::Key key = Dialogs::Key());
Dialogs::IndexedList *shownDialogs() const {
return (Global::DialogsMode() == Dialogs::Mode::Important) ? _dialogsImportant.get() : _dialogs.get();
}
Dialogs::IndexedList *shownDialogs() const;
void checkReorderPinnedStart(QPoint localPosition);
int shownPinnedCount() const;

1
Telegram/SourceFiles/dialogs/dialogs_key.cpp
View File

@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "dialogs/dialogs_key.h"
#include "data/data_feed.h"
#include "history/history.h"
namespace Dialogs {

13
Telegram/SourceFiles/dialogs/dialogs_layout.cpp
View File

@ -16,6 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/text_options.h"
#include "lang/lang_keys.h"
#include "history/history_item.h"
#include "history/history.h"
namespace Dialogs {
namespace Layout {
@ -355,7 +356,7 @@ void RowPainter::paint(
TimeMs ms) {
const auto entry = row->entry();
const auto history = row->history();
const auto peer = history ? history->peer : nullptr;
const auto peer = history ? history->peer.get() : nullptr;
const auto unreadCount = entry->chatListUnreadCount();
const auto unreadMuted = entry->chatListMutedBadge();
const auto item = entry->chatsListItem();
@ -385,7 +386,7 @@ void RowPainter::paint(
const auto from = history
? (history->peer->migrateTo()
? history->peer->migrateTo()
: history->peer)
: history->peer.get())
: nullptr;
const auto flags = (active ? Flag::Active : Flag(0))
| (selected ? Flag::Selected : Flag(0))
@ -520,12 +521,14 @@ void RowPainter::paint(
const auto from = [&] {
if (auto searchPeer = row->searchInPeer()) {
if (searchPeer->isSelf()) {
return item->senderOriginal();
return item->senderOriginal().get();
} else if (!searchPeer->isChannel() || searchPeer->isMegagroup()) {
return item->from();
return item->from().get();
}
}
return (history->peer->migrateTo() ? history->peer->migrateTo() : history->peer);
return history->peer->migrateTo()
? history->peer->migrateTo()
: history->peer.get();
}();
const auto drawInDialogWay = [&] {
if (auto searchPeer = row->searchInPeer()) {

1
Telegram/SourceFiles/dialogs/dialogs_list.cpp
View File

@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/
#include "dialogs/dialogs_list.h"
#include "dialogs/dialogs_entry.h"
#include "dialogs/dialogs_layout.h"
#include "styles/style_dialogs.h"
#include "mainwidget.h"

2
Telegram/SourceFiles/dialogs/dialogs_list.h
View File

@ -12,6 +12,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
class PeerData;
namespace Dialogs {
enum class SortMode;
class List {
public:
List(SortMode sortMode);

5
Telegram/SourceFiles/dialogs/dialogs_row.cpp
View File

@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "styles/style_dialogs.h"
#include "ui/effects/ripple_animation.h"
#include "dialogs/dialogs_entry.h"
#include "mainwidget.h"
namespace Dialogs {
@ -39,6 +40,10 @@ void RippleRow::paintRipple(Painter &p, int x, int y, int outerWidth, TimeMs ms,
}
}
uint64 Row::sortKey() const {
return _id.entry()->sortKeyInChatList();
}
FakeRow::FakeRow(PeerData *searchInPeer, not_null<HistoryItem*> item)
: _searchInPeer(searchInPeer)
, _item(item)

4
Telegram/SourceFiles/dialogs/dialogs_row.h
View File

@ -67,9 +67,7 @@ public:
int pos() const {
return _pos;
}
uint64 sortKey() const {
return _id.entry()->sortKeyInChatList();
}
uint64 sortKey() const;
// for any attached data, for example View in contacts list
void *attached = nullptr;

2
Telegram/SourceFiles/dialogs/dialogs_widget.cpp
View File

@ -10,6 +10,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "dialogs/dialogs_inner_widget.h"
#include "dialogs/dialogs_search_from_controllers.h"
#include "dialogs/dialogs_key.h"
#include "dialogs/dialogs_entry.h"
#include "history/history.h"
#include "ui/widgets/buttons.h"
#include "ui/widgets/input_fields.h"
#include "ui/wrap/fade_wrap.h"

1
Telegram/SourceFiles/dialogs/dialogs_widget.h
View File

@ -17,6 +17,7 @@ struct RowDescriptor;
class Row;
class FakeRow;
class IndexedList;
class Key;
} // namespace Dialogs
namespace Ui {

47
Telegram/SourceFiles/facades.cpp
View File

@ -22,6 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "window/layer_widget.h"
#include "lang/lang_keys.h"
#include "base/observer.h"
#include "history/history.h"
#include "history/history_item.h"
#include "history/history_media.h"
#include "styles/style_history.h"
@ -258,6 +259,10 @@ void showPeerProfile(const PeerId &peer) {
}
}
void showPeerProfile(not_null<const History*> history) {
showPeerProfile(history->peer->id);
}
void showPeerHistory(
const PeerId &peer,
MsgId msgId) {
@ -274,6 +279,10 @@ void showPeerHistoryAtItem(not_null<const HistoryItem*> item) {
showPeerHistory(item->history()->peer->id, item->id);
}
void showPeerHistory(not_null<const History*> history, MsgId msgId) {
showPeerHistory(history->peer->id, msgId);
}
PeerData *getPeerForMouseAction() {
return Messenger::Instance().ui_getPeerForMouseAction();
}
@ -343,25 +352,25 @@ void handlePendingHistoryUpdate() {
Auth().data().requestItemRepaint(item);
// Start the video if it is waiting for that.
if (item->pendingInitDimensions()) {
if (const auto media = item->getMedia()) {
if (const auto reader = media->getClipReader()) {
const auto startRequired = [&] {
if (reader->started()) {
return false;
}
using Mode = Media::Clip::Reader::Mode;
return (reader->mode() == Mode::Video);
};
if (startRequired()) {
const auto width = std::max(
item->width(),
st::historyMinimalWidth);
item->resizeGetHeight(width);
}
}
}
}
//if (item->pendingInitDimensions()) { // #TODO floating player video
// if (const auto media = item->getMedia()) {
// if (const auto reader = media->getClipReader()) {
// const auto startRequired = [&] {
// if (reader->started()) {
// return false;
// }
// using Mode = Media::Clip::Reader::Mode;
// return (reader->mode() == Mode::Video);
// };
// if (startRequired()) {
// const auto width = std::max(
// item->width(),
// st::historyMinimalWidth);
// item->resizeGetHeight(width);
// }
// }
// }
//}
}
}

14
Telegram/SourceFiles/facades.h
View File

@ -12,6 +12,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
class BoxContent;
namespace Dialogs {
enum class Mode;
} // namespace Dialogs
namespace InlineBots {
namespace Layout {
class ItemBase;
@ -184,9 +188,7 @@ void showPeerProfile(const PeerId &peer);
inline void showPeerProfile(const PeerData *peer) {
showPeerProfile(peer->id);
}
inline void showPeerProfile(const History *history) {
showPeerProfile(history->peer->id);
}
void showPeerProfile(not_null<const History*> history);
void showPeerHistory(const PeerId &peer, MsgId msgId);
void showPeerHistoryAtItem(not_null<const HistoryItem*> item);
@ -194,11 +196,7 @@ void showPeerHistoryAtItem(not_null<const HistoryItem*> item);
inline void showPeerHistory(const PeerData *peer, MsgId msgId) {
showPeerHistory(peer->id, msgId);
}
inline void showPeerHistory(
const History *history,
MsgId msgId) {
showPeerHistory(history->peer->id, msgId);
}
void showPeerHistory(not_null<const History*> history, MsgId msgId);
inline void showChatsList() {
showPeerHistory(PeerId(0), 0);
}

75
Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
View File

@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "history/admin_log/history_admin_log_inner.h"
#include "styles/style_history.h"
#include "history/history.h"
#include "history/history_media_types.h"
#include "history/history_message.h"
#include "history/history_item_components.h"
@ -56,16 +57,16 @@ void InnerWidget::enumerateItems(Method method) {
auto begin = std::rbegin(_items), end = std::rend(_items);
auto from = TopToBottom ? std::lower_bound(begin, end, _visibleTop, [this](auto &elem, int top) {
return this->itemTop(elem) + elem->data()->height() <= top;
return this->itemTop(elem) + elem->height() <= top;
}) : std::upper_bound(begin, end, _visibleBottom, [this](int bottom, auto &elem) {
return this->itemTop(elem) + elem->data()->height() >= bottom;
return this->itemTop(elem) + elem->height() >= bottom;
});
auto wasEnd = (from == end);
if (wasEnd) {
--from;
}
if (TopToBottom) {
Assert(itemTop(from->get()) + from->get()->data()->height() > _visibleTop);
Assert(itemTop(from->get()) + from->get()->height() > _visibleTop);
} else {
Assert(itemTop(from->get()) < _visibleBottom);
}
@ -73,7 +74,7 @@ void InnerWidget::enumerateItems(Method method) {
while (true) {
auto item = from->get();
auto itemtop = itemTop(item);
auto itembottom = itemtop + item->data()->height();
auto itembottom = itemtop + item->height();
// Binary search should've skipped all the items that are above / below the visible area.
if (TopToBottom) {
@ -121,19 +122,19 @@ void InnerWidget::enumerateUserpics(Method method) {
const auto message = view->data()->toHistoryMessage();
if (!message) return true;
if (lowestAttachedItemTop < 0 && message->isAttachedToNext()) {
lowestAttachedItemTop = itemtop + message->marginTop();
if (lowestAttachedItemTop < 0 && view->isAttachedToNext()) {
lowestAttachedItemTop = itemtop + view->marginTop();
}
// Call method on a userpic for all messages that have it and for those who are not showing it
// because of their attachment to the next message if they are bottom-most visible.
if (message->displayFromPhoto() || (message->hasFromPhoto() && itembottom >= _visibleBottom)) {
if (view->displayFromPhoto() || (view->hasFromPhoto() && itembottom >= _visibleBottom)) {
if (lowestAttachedItemTop < 0) {
lowestAttachedItemTop = itemtop + message->marginTop();
lowestAttachedItemTop = itemtop + view->marginTop();
}
// Attach userpic to the bottom of the visible area with the same margin as the last message.
auto userpicMinBottomSkip = st::historyPaddingBottom + st::msgMargin.bottom();
auto userpicBottom = qMin(itembottom - message->marginBottom(), _visibleBottom - userpicMinBottomSkip);
auto userpicBottom = qMin(itembottom - view->marginBottom(), _visibleBottom - userpicMinBottomSkip);
// Do not let the userpic go above the attached messages pack top line.
userpicBottom = qMax(userpicBottom, lowestAttachedItemTop + st::msgPhotoSize);
@ -146,7 +147,7 @@ void InnerWidget::enumerateUserpics(Method method) {
}
// Forget the found top of the pack, search for the next one from scratch.
if (!message->isAttachedToNext()) {
if (!view->isAttachedToNext()) {
lowestAttachedItemTop = -1;
}
@ -165,14 +166,14 @@ void InnerWidget::enumerateDates(Method method) {
auto dateCallback = [&](not_null<Element*> view, int itemtop, int itembottom) {
const auto item = view->data();
if (lowestInOneDayItemBottom < 0 && item->isInOneDayWithPrevious()) {
lowestInOneDayItemBottom = itembottom - item->marginBottom();
lowestInOneDayItemBottom = itembottom - view->marginBottom();
}
// Call method on a date for all messages that have it and for those who are not showing it
// because they are in a one day together with the previous message if they are top-most visible.
if (item->displayDate() || (!item->isEmpty() && itemtop <= _visibleTop)) {
if (lowestInOneDayItemBottom < 0) {
lowestInOneDayItemBottom = itembottom - item->marginBottom();
lowestInOneDayItemBottom = itembottom - view->marginBottom();
}
// Attach date to the top of the visible area with the same margin as it has in service message.
auto dateTop = qMax(itemtop, _visibleTop) + st::msgServiceMargin.top();
@ -224,7 +225,7 @@ InnerWidget::InnerWidget(
}
if (const auto view = viewForItem(query.item)) {
auto top = itemTop(view);
if (top >= 0 && top + query.item->height() > _visibleTop && top < _visibleBottom) {
if (top >= 0 && top + view->height() > _visibleTop && top < _visibleBottom) {
*query.isVisible = true;
}
}
@ -257,7 +258,7 @@ void InnerWidget::updateVisibleTopItem() {
} else {
auto begin = std::rbegin(_items), end = std::rend(_items);
auto from = std::lower_bound(begin, end, _visibleTop, [this](auto &&elem, int top) {
return this->itemTop(elem) + elem->data()->height() <= top;
return this->itemTop(elem) + elem->height() <= top;
});
if (from != end) {
_visibleTopItem = *from;
@ -589,15 +590,15 @@ void InnerWidget::itemsAdded(Direction direction, int addedCount) {
auto checkTo = (direction == Direction::Up) ? (_items.size() + 1) : (addedCount + 1);
for (auto i = checkFrom; i != checkTo; ++i) {
if (i > 0) {
const auto item = _items[i - 1]->data();
const auto view = _items[i - 1].get();
if (i < _items.size()) {
const auto previous = _items[i]->data();
item->setLogEntryDisplayDate(item->date.date() != previous->date.date());
auto attachToPrevious = item->computeIsAttachToPrevious(previous);
item->setLogEntryAttachToPrevious(attachToPrevious);
previous->setLogEntryAttachToNext(attachToPrevious);
const auto previous = _items[i].get();
view->setDisplayDate(view->data()->date.date() != previous->data()->date.date());
const auto attach = view->computeIsAttachToPrevious(previous);
view->setAttachToPrevious(attach);
previous->setAttachToNext(attach);
} else {
item->setLogEntryDisplayDate(true);
view->setDisplayDate(true);
}
}
}
@ -617,7 +618,7 @@ int InnerWidget::resizeGetHeight(int newWidth) {
auto newHeight = 0;
for (auto &item : base::reversed(_items)) {
item->setY(newHeight);
newHeight += item->data()->resizeGetHeight(newWidth);
newHeight += item->resizeGetHeight(newWidth);
}
_itemsHeight = newHeight;
_itemsTop = (_minHeight > _itemsHeight + st::historyPaddingBottom) ? (_minHeight - _itemsHeight - st::historyPaddingBottom) : 0;
@ -646,7 +647,7 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
} else {
auto begin = std::rbegin(_items), end = std::rend(_items);
auto from = std::lower_bound(begin, end, clip.top(), [this](auto &elem, int top) {
return this->itemTop(elem) + elem->data()->height() <= top;
return this->itemTop(elem) + elem->height() <= top;
});
auto to = std::lower_bound(begin, end, clip.top() + clip.height(), [this](auto &elem, int bottom) {
return this->itemTop(elem) < bottom;
@ -659,9 +660,9 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
const auto selection = (view == _selectedItem)
? _selectedText
: TextSelection();
view->draw(p, clip.translated(0, -top), selection, ms);
const auto item = view->data();
item->draw(p, clip.translated(0, -top), selection, ms);
auto height = item->height();
auto height = view->height();
top += height;
p.translate(0, height);
}
@ -678,7 +679,7 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
const auto message = view->data()->toHistoryMessage();
Assert(message != nullptr);
message->from()->paintUserpicLeft(p, st::historyPhotoLeft, userpicTop, message->width(), st::msgPhotoSize);
message->from()->paintUserpicLeft(p, st::historyPhotoLeft, userpicTop, view->width(), st::msgPhotoSize);
}
return true;
});
@ -711,7 +712,7 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
if (opacity > 0.) {
p.setOpacity(opacity);
int dateY = /*noFloatingDate ? itemtop :*/ (dateTop - st::msgServiceMargin.top());
int width = item->width();
int width = view->width();
if (auto date = item->Get<HistoryMessageDate>()) {
date->paint(p, dateY, width);
} else {
@ -797,7 +798,7 @@ void InnerWidget::mouseDoubleClickEvent(QMouseEvent *e) {
if (((_mouseAction == MouseAction::Selecting && _selectedItem != nullptr) || (_mouseAction == MouseAction::None)) && _mouseSelectType == TextSelectType::Letters && _mouseActionItem) {
HistoryStateRequest request;
request.flags |= Text::StateRequest::Flag::LookupSymbol;
auto dragState = _mouseActionItem->data()->getState(_dragStartPosition, request);
auto dragState = _mouseActionItem->getState(_dragStartPosition, request);
if (dragState.cursor == HistoryInTextCursorState) {
_mouseTextSymbol = dragState.symbol;
_mouseSelectType = TextSelectType::Words;
@ -839,7 +840,7 @@ void InnerWidget::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
App::mousedItem());
HistoryStateRequest request;
request.flags |= Text::StateRequest::Flag::LookupSymbol;
auto dragState = App::mousedItem()->data()->getState(mousePos, request);
auto dragState = App::mousedItem()->getState(mousePos, request);
if (dragState.cursor == HistoryInTextCursorState && dragState.symbol >= selFrom && dragState.symbol < selTo) {
isUponSelected = 1;
}
@ -1214,7 +1215,7 @@ void InnerWidget::mouseActionStart(const QPoint &screenPos, Qt::MouseButton butt
if (_trippleClickTimer.isActive() && (screenPos - _trippleClickPoint).manhattanLength() < QApplication::startDragDistance()) {
HistoryStateRequest request;
request.flags = Text::StateRequest::Flag::LookupSymbol;
dragState = _mouseActionItem->data()->getState(_dragStartPosition, request);
dragState = _mouseActionItem->getState(_dragStartPosition, request);
if (dragState.cursor == HistoryInTextCursorState) {
auto selection = TextSelection { dragState.symbol, dragState.symbol };
repaintItem(std::exchange(_selectedItem, _mouseActionItem));
@ -1228,7 +1229,7 @@ void InnerWidget::mouseActionStart(const QPoint &screenPos, Qt::MouseButton butt
} else if (App::pressedItem()) {
HistoryStateRequest request;
request.flags = Text::StateRequest::Flag::LookupSymbol;
dragState = _mouseActionItem->data()->getState(_dragStartPosition, request);
dragState = _mouseActionItem->getState(_dragStartPosition, request);
}
if (_mouseSelectType != TextSelectType::Paragraphs) {
if (App::pressedItem()) {
@ -1324,7 +1325,7 @@ void InnerWidget::updateSelected() {
auto begin = std::rbegin(_items), end = std::rend(_items);
auto from = (point.y() >= _itemsTop && point.y() < _itemsTop + _itemsHeight)
? std::lower_bound(begin, end, point.y(), [this](auto &elem, int top) {
return this->itemTop(elem) + elem->data()->height() <= top;
return this->itemTop(elem) + elem->height() <= top;
})
: end;
const auto view = (from != end) ? from->get() : nullptr;
@ -1332,7 +1333,7 @@ void InnerWidget::updateSelected() {
if (item) {
App::mousedItem(view);
itemPoint = mapPointToItem(point, view);
if (item->hasPoint(itemPoint)) {
if (view->hasPoint(itemPoint)) {
if (App::hoveredItem() != view) {
repaintItem(App::hoveredItem());
App::hoveredItem(view);
@ -1362,11 +1363,11 @@ void InnerWidget::updateSelected() {
} else {
selectingText = false;
}
dragState = item->getState(itemPoint, request);
dragState = view->getState(itemPoint, request);
lnkhost = view;
if (!dragState.link && itemPoint.x() >= st::historyPhotoLeft && itemPoint.x() < st::historyPhotoLeft + st::msgPhotoSize) {
if (auto message = item->toHistoryMessage()) {
if (message->hasFromPhoto()) {
if (view->hasFromPhoto()) {
enumerateUserpics([&](not_null<Element*> view, int userpicTop) {
// stop enumeration if the userpic is below our point
if (userpicTop > point.y()) {
@ -1441,7 +1442,7 @@ void InnerWidget::updateSelected() {
// Voice message seek support.
if (const auto pressedView = App::pressedLinkItem()) {
const auto adjustedPoint = mapPointToItem(point, pressedView);
pressedView->data()->updatePressed(adjustedPoint);
pressedView->updatePressed(adjustedPoint);
}
//if (_mouseAction == MouseAction::Selecting) {
@ -1557,7 +1558,7 @@ void InnerWidget::repaintItem(const Element *view) {
if (!view) {
return;
}
update(0, itemTop(view), width(), view->data()->height());
update(0, itemTop(view), width(), view->height());
}
QPoint InnerWidget::mapPointToItem(QPoint point, const Element *view) const {

1
Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
View File

@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "history/view/history_view_element.h"
#include "history/history_service.h"
#include "history/history_message.h"
#include "history/history.h"
#include "lang/lang_keys.h"
#include "boxes/sticker_set_box.h"
#include "core/tl_help.h"

49
Telegram/SourceFiles/history/history.cpp
View File

@ -65,8 +65,10 @@ History::History(const PeerId &peerId)
, cloudDraftTextCache(st::dialogsTextWidthMin)
, _mute(peer->isMuted())
, _sendActionText(st::dialogsTextWidthMin) {
if (peer->isUser() && peer->asUser()->botInfo) {
outboxReadBefore = INT_MAX;
if (const auto user = peer->asUser()) {
if (user->botInfo) {
outboxReadBefore = INT_MAX;
}
}
}
@ -1391,8 +1393,9 @@ void History::addItemToBlock(not_null<HistoryItem*> item) {
block->messages.push_back(item->createView(
App::wnd()->controller(),
HistoryView::Context::History));
block->messages.back()->attachToBlock(block, block->messages.size() - 1);
item->previousItemChanged();
const auto view = block->messages.back().get();
view->attachToBlock(block, block->messages.size() - 1);
view->previousInBlocksChanged();
if (isBuildingFrontBlock() && _buildingFrontBlock->expectedItemsCount > 0) {
--_buildingFrontBlock->expectedItemsCount;
@ -1969,16 +1972,16 @@ not_null<HistoryItem*> History::addNewInTheMiddle(
App::wnd()->controller(),
HistoryView::Context::History));
(*it)->attachToBlock(block.get(), itemIndex);
newItem->previousItemChanged();
(*it)->previousInBlocksChanged();
if (itemIndex + 1 < block->messages.size()) {
for (auto i = itemIndex + 1, l = int(block->messages.size()); i != l; ++i) {
block->messages[i]->setIndexInBlock(i);
}
block->messages[itemIndex + 1]->data()->previousItemChanged();
block->messages[itemIndex + 1]->previousInBlocksChanged();
} else if (blockIndex + 1 < blocks.size() && !blocks[blockIndex + 1]->messages.empty()) {
blocks[blockIndex + 1]->messages.front()->data()->previousItemChanged();
blocks[blockIndex + 1]->messages.front()->previousInBlocksChanged();
} else {
newItem->nextItemChanged();
(*it)->nextInBlocksChanged();
}
const auto [groupFrom, groupTill] = recountGroupingFromTill(newItem);
@ -2155,14 +2158,15 @@ HistoryBlock *History::finishBuildingFrontBlock() {
auto block = _buildingFrontBlock->block;
if (block) {
if (blocks.size() > 1) {
const auto last = block->messages.back()->data(); // ... item, item, item, last ], [ first, item, item ...
const auto first = blocks[1]->messages.front()->data();
// ... item, item, item, last ], [ first, item, item ...
const auto last = block->messages.back().get();
const auto first = blocks[1]->messages.front().get();
// we've added a new front block, so previous item for
// the old first item of a first block was changed
first->previousItemChanged();
first->previousInBlocksChanged();
} else {
block->messages.back()->data()->nextItemChanged();
block->messages.back()->nextInBlocksChanged();
}
}
@ -2509,9 +2513,6 @@ void History::changedChatListPinHook() {
Notify::PeerUpdate::Flag::PinnedChanged);
}
void History::changeMsgId(MsgId oldId, MsgId newId) {
}
void History::removeBlock(not_null<HistoryBlock*> block) {
Expects(block->messages.empty());
@ -2525,9 +2526,9 @@ void History::removeBlock(not_null<HistoryBlock*> block) {
for (int i = index, l = blocks.size(); i < l; ++i) {
blocks[i]->setIndexInHistory(i);
}
blocks[index]->messages.front()->data()->previousItemChanged();
blocks[index]->messages.front()->previousInBlocksChanged();
} else if (!blocks.empty() && !blocks.back()->messages.empty()) {
blocks.back()->messages.back()->data()->nextItemChanged();
blocks.back()->messages.back()->nextInBlocksChanged();
}
}
@ -2543,12 +2544,10 @@ int HistoryBlock::resizeGetHeight(int newWidth, bool resizeAllItems) {
auto y = 0;
for (const auto &message : messages) {
message->setY(y);
const auto item = message->data();
if (resizeAllItems || item->pendingResize()) {
y += item->resizeGetHeight(newWidth);
if (resizeAllItems || message->pendingResize()) {
y += message->resizeGetHeight(newWidth);
} else {
y += item->height();
y += message->height();
}
}
_height = y;
@ -2606,11 +2605,11 @@ void HistoryBlock::remove(not_null<Element*> view) {
// Deletes this.
_history->removeBlock(this);
} else if (itemIndex < messages.size()) {
messages[itemIndex]->data()->previousItemChanged();
messages[itemIndex]->previousInBlocksChanged();
} else if (blockIndex + 1 < _history->blocks.size()) {
_history->blocks[blockIndex + 1]->messages.front()->data()->previousItemChanged();
_history->blocks[blockIndex + 1]->messages.front()->previousInBlocksChanged();
} else if (!_history->blocks.empty() && !_history->blocks.back()->messages.empty()) {
_history->blocks.back()->messages.back()->data()->nextItemChanged();
_history->blocks.back()->messages.back()->nextInBlocksChanged();
}
if (needGroupRecount) {

52
Telegram/SourceFiles/history/history.h
View File

@ -18,10 +18,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "base/flags.h"
class History;
class HistoryItem;
using HistoryItemsList = std::vector<not_null<HistoryItem*>>;
enum NewMessageType {
enum NewMessageType : char {
NewMessageUnread,
NewMessageLast,
NewMessageExisting,
@ -104,50 +102,6 @@ private:
class HistoryBlock;
enum HistoryMediaType {
MediaTypePhoto,
MediaTypeVideo,
MediaTypeContact,
MediaTypeCall,
MediaTypeFile,
MediaTypeGif,
MediaTypeSticker,
MediaTypeLocation,
MediaTypeWebPage,
MediaTypeMusicFile,
MediaTypeVoiceFile,
MediaTypeGame,
MediaTypeInvoice,
MediaTypeGrouped,
MediaTypeCount
};
struct TextWithTags {
struct Tag {
int offset, length;
QString id;
};
using Tags = QVector<Tag>;
QString text;
Tags tags;
};
inline bool operator==(const TextWithTags::Tag &a, const TextWithTags::Tag &b) {
return (a.offset == b.offset) && (a.length == b.length) && (a.id == b.id);
}
inline bool operator!=(const TextWithTags::Tag &a, const TextWithTags::Tag &b) {
return !(a == b);
}
inline bool operator==(const TextWithTags &a, const TextWithTags &b) {
return (a.text == b.text) && (a.tags == b.tags);
}
inline bool operator!=(const TextWithTags &a, const TextWithTags &b) {
return !(a == b);
}
namespace Data {
struct Draft;
} // namespace Data
@ -334,7 +288,7 @@ public:
HistoryItem *showFrom = nullptr;
HistoryItem *unreadBar = nullptr;
PeerData *peer;
not_null<PeerData*> peer;
bool oldLoaded = false;
bool newLoaded = true;
HistoryItem *lastMsg = nullptr;
@ -426,8 +380,6 @@ public:
mtpRequestId sendRequestId = 0;
void changeMsgId(MsgId oldId, MsgId newId);
Text cloudDraftTextCache;
protected:

103
Telegram/SourceFiles/history/history_inner_widget.cpp
View File

@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <rpl/merge.h>
#include "styles/style_history.h"
#include "core/file_utilities.h"
#include "history/history.h"
#include "history/history_message.h"
#include "history/history_media_types.h"
#include "history/history_item_components.h"
@ -198,7 +199,7 @@ void HistoryInner::repaintItem(const Element *view) {
if (view) {
const auto top = itemTop(view);
if (top >= 0) {
update(0, top, width(), view->data()->height());
update(0, top, width(), view->height());
}
}
}
@ -228,7 +229,7 @@ void HistoryInner::enumerateItemsInHistory(History *history, int historytop, Met
while (true) {
auto view = block->messages[itemIndex].get();
auto itemtop = blocktop + view->y();
auto itembottom = itemtop + view->data()->height();
auto itembottom = itemtop + view->height();
// Binary search should've skipped all the items that are above / below the visible area.
if (TopToBottom) {
@ -310,19 +311,19 @@ void HistoryInner::enumerateUserpics(Method method) {
const auto message = item->toHistoryMessage();
if (!message) return true;
if (lowestAttachedItemTop < 0 && message->isAttachedToNext()) {
lowestAttachedItemTop = itemtop + message->marginTop();
if (lowestAttachedItemTop < 0 && view->isAttachedToNext()) {
lowestAttachedItemTop = itemtop + view->marginTop();
}
// Call method on a userpic for all messages that have it and for those who are not showing it
// because of their attachment to the next message if they are bottom-most visible.
if (message->displayFromPhoto() || (message->hasFromPhoto() && itembottom >= _visibleAreaBottom)) {
if (view->displayFromPhoto() || (view->hasFromPhoto() && itembottom >= _visibleAreaBottom)) {
if (lowestAttachedItemTop < 0) {
lowestAttachedItemTop = itemtop + message->marginTop();
lowestAttachedItemTop = itemtop + view->marginTop();
}
// Attach userpic to the bottom of the visible area with the same margin as the last message.
auto userpicMinBottomSkip = st::historyPaddingBottom + st::msgMargin.bottom();
auto userpicBottom = qMin(itembottom - message->marginBottom(), _visibleAreaBottom - userpicMinBottomSkip);
auto userpicBottom = qMin(itembottom - view->marginBottom(), _visibleAreaBottom - userpicMinBottomSkip);
// Do not let the userpic go above the attached messages pack top line.
userpicBottom = qMax(userpicBottom, lowestAttachedItemTop + st::msgPhotoSize);
@ -335,7 +336,7 @@ void HistoryInner::enumerateUserpics(Method method) {
}
// Forget the found top of the pack, search for the next one from scratch.
if (!message->isAttachedToNext()) {
if (!view->isAttachedToNext()) {
lowestAttachedItemTop = -1;
}
@ -356,7 +357,7 @@ void HistoryInner::enumerateDates(Method method) {
auto dateCallback = [&](not_null<Element*> view, int itemtop, int itembottom) {
const auto item = view->data();
if (lowestInOneDayItemBottom < 0 && item->isInOneDayWithPrevious()) {
lowestInOneDayItemBottom = itembottom - item->marginBottom();
lowestInOneDayItemBottom = itembottom - view->marginBottom();
}
// Call method on a date for all messages that have it and for those who are not showing it
@ -375,7 +376,7 @@ void HistoryInner::enumerateDates(Method method) {
}
if (lowestInOneDayItemBottom < 0) {
lowestInOneDayItemBottom = itembottom - item->marginBottom();
lowestInOneDayItemBottom = itembottom - view->marginBottom();
}
// Attach date to the top of the visible area with the same margin as it has in service message.
int dateTop = qMax(itemtop, _visibleAreaTop) + st::msgServiceMargin.top();
@ -499,7 +500,7 @@ void HistoryInner::paintEvent(QPaintEvent *e) {
if (selfromy < 0 || seltoy < 0) {
selfromy = seltoy = -1;
} else {
seltoy += _dragSelTo->data()->height();
seltoy += _dragSelTo->height();
}
auto mtop = migratedTop();
@ -515,12 +516,12 @@ void HistoryInner::paintEvent(QPaintEvent *e) {
auto y = mtop + block->y() + view->y();
p.save();
p.translate(0, y);
if (clip.y() < y + item->height()) while (y < drawToY) {
if (clip.y() < y + view->height()) while (y < drawToY) {
const auto selection = itemRenderSelection(
view,
selfromy - mtop,
seltoy - mtop);
item->draw(p, clip.translated(0, -y), selection, ms);
view->draw(p, clip.translated(0, -y), selection, ms);
if (item->hasViews()) {
App::main()->scheduleViewIncrement(item);
@ -530,7 +531,7 @@ void HistoryInner::paintEvent(QPaintEvent *e) {
_widget->enqueueMessageHighlight(item);
}
int32 h = item->height();
int32 h = view->height();
p.translate(0, h);
y += h;
@ -560,13 +561,13 @@ void HistoryInner::paintEvent(QPaintEvent *e) {
p.save();
p.translate(0, y);
while (y < drawToY) {
auto h = item->height();
auto h = view->height();
if (hclip.y() < y + h && hdrawtop < y + h) {
const auto selection = itemRenderSelection(
view,
selfromy - htop,
seltoy - htop);
item->draw(p, hclip.translated(0, -y), selection, ms);
view->draw(p, hclip.translated(0, -y), selection, ms);
if (item->hasViews()) {
App::main()->scheduleViewIncrement(item);
@ -916,11 +917,12 @@ void HistoryInner::mouseActionStart(const QPoint &screenPos, Qt::MouseButton but
repaintItem(App::pressedItem());
}
const auto mouseActionView = App::mousedItem();
_mouseAction = MouseAction::None;
_mouseActionItem = App::mousedItem()
? App::mousedItem()->data().get()
_mouseActionItem = mouseActionView
? mouseActionView->data().get()
: nullptr;
_dragStartPosition = mapPointToItem(mapFromGlobal(screenPos), _mouseActionItem);
_dragStartPosition = mapPointToItem(mapFromGlobal(screenPos), mouseActionView);
_pressWasInactive = _controller->window()->wasInactivePress();
if (_pressWasInactive) _controller->window()->setInactivePress(false);
@ -937,12 +939,12 @@ void HistoryInner::mouseActionStart(const QPoint &screenPos, Qt::MouseButton but
}
}
}
if (_mouseAction == MouseAction::None && _mouseActionItem) {
if (_mouseAction == MouseAction::None && mouseActionView) {
HistoryTextState dragState;
if (_trippleClickTimer.isActive() && (screenPos - _trippleClickPoint).manhattanLength() < QApplication::startDragDistance()) {
HistoryStateRequest request;
request.flags = Text::StateRequest::Flag::LookupSymbol;
dragState = _mouseActionItem->getState(_dragStartPosition, request);
dragState = mouseActionView->getState(_dragStartPosition, request);
if (dragState.cursor == HistoryInTextCursorState) {
TextSelection selStatus = { dragState.symbol, dragState.symbol };
if (selStatus != FullSelection && (_selected.empty() || _selected.cbegin()->second != FullSelection)) {
@ -961,7 +963,7 @@ void HistoryInner::mouseActionStart(const QPoint &screenPos, Qt::MouseButton but
} else if (App::pressedItem()) {
HistoryStateRequest request;
request.flags = Text::StateRequest::Flag::LookupSymbol;
dragState = _mouseActionItem->getState(_dragStartPosition, request);
dragState = mouseActionView->getState(_dragStartPosition, request);
}
if (_mouseSelectType != TextSelectType::Paragraphs) {
if (App::pressedItem()) {
@ -1026,15 +1028,18 @@ void HistoryInner::mouseActionCancel() {
void HistoryInner::performDrag() {
if (_mouseAction != MouseAction::Dragging) return;
const auto mouseActionView = _mouseActionItem
? _mouseActionItem->mainView()
: nullptr;
bool uponSelected = false;
if (_mouseActionItem) {
if (mouseActionView) {
if (!_selected.empty() && _selected.cbegin()->second == FullSelection) {
uponSelected = _dragStateItem
&& (_selected.find(_dragStateItem) != _selected.cend());
} else {
HistoryStateRequest request;
request.flags |= Text::StateRequest::Flag::LookupSymbol;
auto dragState = _mouseActionItem->getState(_dragStartPosition, request);
auto dragState = mouseActionView->getState(_dragStartPosition, request);
uponSelected = (dragState.cursor == HistoryInTextCursorState);
if (uponSelected) {
if (_selected.empty()
@ -1243,10 +1248,21 @@ void HistoryInner::mouseDoubleClickEvent(QMouseEvent *e) {
if (!_history) return;
mouseActionStart(e->globalPos(), e->button());
if (((_mouseAction == MouseAction::Selecting && !_selected.empty() && _selected.cbegin()->second != FullSelection) || (_mouseAction == MouseAction::None && (_selected.empty() || _selected.cbegin()->second != FullSelection))) && _mouseSelectType == TextSelectType::Letters && _mouseActionItem) {
const auto mouseActionView = _mouseActionItem
? _mouseActionItem->mainView()
: nullptr;
if (_mouseSelectType == TextSelectType::Letters
&& mouseActionView
&& ((_mouseAction == MouseAction::Selecting
&& !_selected.empty()
&& _selected.cbegin()->second != FullSelection)
|| (_mouseAction == MouseAction::None
&& (_selected.empty()
|| _selected.cbegin()->second != FullSelection)))) {
HistoryStateRequest request;
request.flags |= Text::StateRequest::Flag::LookupSymbol;
auto dragState = _mouseActionItem->getState(_dragStartPosition, request);
auto dragState = mouseActionView->getState(_dragStartPosition, request);
if (dragState.cursor == HistoryInTextCursorState) {
_mouseTextSymbol = dragState.symbol;
_mouseSelectType = TextSelectType::Words;
@ -1298,7 +1314,7 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
auto mousePos = mapPointToItem(mapFromGlobal(_mousePosition), App::mousedItem());
HistoryStateRequest request;
request.flags |= Text::StateRequest::Flag::LookupSymbol;
auto dragState = App::mousedItem()->data()->getState(mousePos, request);
auto dragState = App::mousedItem()->getState(mousePos, request);
if (dragState.cursor == HistoryInTextCursorState && dragState.symbol >= selFrom && dragState.symbol < selTo) {
isUponSelected = 1;
}
@ -1809,7 +1825,7 @@ void HistoryInner::recountHistoryGeometry() {
if (!_migrated->isEmpty() && !_history->isEmpty() && _migrated->loadedAtBottom() && _history->loadedAtTop()) {
if (_migrated->blocks.back()->messages.back()->data()->date.date() == _history->blocks.front()->messages.front()->data()->date.date()) {
if (_migrated->blocks.back()->messages.back()->data()->isGroupMigrate() && _history->blocks.front()->messages.front()->data()->isGroupMigrate()) {
_historySkipHeight += _history->blocks.front()->messages.front()->data()->height();
_historySkipHeight += _history->blocks.front()->messages.front()->height();
} else {
_historySkipHeight += _history->blocks.front()->messages.front()->data()->displayedDateHeight();
}
@ -2105,7 +2121,7 @@ void HistoryInner::adjustCurrent(int32 y, History *history) const {
while (block->messages[_curItem]->y() + by > y && _curItem > 0) {
--_curItem;
}
while (block->messages[_curItem]->y() + block->messages[_curItem]->data()->height() + by <= y && _curItem + 1 < block->messages.size()) {
while (block->messages[_curItem]->y() + block->messages[_curItem]->height() + by <= y && _curItem + 1 < block->messages.size()) {
++_curItem;
}
}
@ -2237,7 +2253,7 @@ void HistoryInner::onUpdateSelected() {
App::mousedItem(view);
m = mapPointToItem(point, view);
if (item->hasPoint(m)) {
if (view->hasPoint(m)) {
if (App::hoveredItem() != view) {
repaintItem(App::hoveredItem());
App::hoveredItem(view);
@ -2336,12 +2352,12 @@ void HistoryInner::onUpdateSelected() {
} else {
selectingText = false;
}
dragState = item->getState(m, request);
dragState = view->getState(m, request);
_dragStateItem = App::histItemById(dragState.itemId);
lnkhost = view;
if (!dragState.link && m.x() >= st::historyPhotoLeft && m.x() < st::historyPhotoLeft + st::msgPhotoSize) {
if (auto msg = item->toHistoryMessage()) {
if (msg->hasFromPhoto()) {
if (view->hasFromPhoto()) {
enumerateUserpics([&](not_null<Element*> view, int userpicTop) -> bool {
// stop enumeration if the userpic is below our point
if (userpicTop > point.y()) {
@ -2410,15 +2426,15 @@ void HistoryInner::onUpdateSelected() {
auto selectingDown = (itemTop(_mouseActionItem) < itemTop(item)) || (_mouseActionItem == item && _dragStartPosition.y() < m.y());
auto dragSelFrom = _mouseActionItem->mainView();
auto dragSelTo = view;
if (!dragSelFrom->data()->hasPoint(_dragStartPosition)) { // maybe exclude dragSelFrom
if (!dragSelFrom->hasPoint(_dragStartPosition)) { // maybe exclude dragSelFrom
if (selectingDown) {
if (_dragStartPosition.y() >= dragSelFrom->data()->height() - dragSelFrom->data()->marginBottom() || ((view == dragSelFrom) && (m.y() < _dragStartPosition.y() + QApplication::startDragDistance() || m.y() < dragSelFrom->data()->marginTop()))) {
if (_dragStartPosition.y() >= dragSelFrom->height() - dragSelFrom->marginBottom() || ((view == dragSelFrom) && (m.y() < _dragStartPosition.y() + QApplication::startDragDistance() || m.y() < dragSelFrom->marginTop()))) {
dragSelFrom = (dragSelFrom != dragSelTo)
? nextItem(dragSelFrom)
: nullptr;
}
} else {
if (_dragStartPosition.y() < dragSelFrom->data()->marginTop() || ((view == dragSelFrom) && (m.y() >= _dragStartPosition.y() - QApplication::startDragDistance() || m.y() >= dragSelFrom->data()->height() - dragSelFrom->data()->marginBottom()))) {
if (_dragStartPosition.y() < dragSelFrom->marginTop() || ((view == dragSelFrom) && (m.y() >= _dragStartPosition.y() - QApplication::startDragDistance() || m.y() >= dragSelFrom->height() - dragSelFrom->marginBottom()))) {
dragSelFrom = (dragSelFrom != dragSelTo)
? prevItem(dragSelFrom)
: nullptr;
@ -2427,13 +2443,13 @@ void HistoryInner::onUpdateSelected() {
}
if (_mouseActionItem != item) { // maybe exclude dragSelTo
if (selectingDown) {
if (m.y() < dragSelTo->data()->marginTop()) {
if (m.y() < dragSelTo->marginTop()) {
dragSelTo = (dragSelFrom != dragSelTo)
? prevItem(dragSelFrom)
: nullptr;
}
} else {
if (m.y() >= dragSelTo->data()->height() - dragSelTo->data()->marginBottom()) {
if (m.y() >= dragSelTo->height() - dragSelTo->marginBottom()) {
dragSelTo = (dragSelFrom != dragSelTo)
? nextItem(dragSelFrom)
: nullptr;
@ -2471,10 +2487,10 @@ void HistoryInner::onUpdateSelected() {
// Voice message seek support.
if (const auto pressedItem = _dragStateItem) {
if (pressedItem->mainView()) {
if (const auto pressedView = pressedItem->mainView()) {
if (pressedItem->history() == _history || pressedItem->history() == _migrated) {
auto adjustedPoint = mapPointToItem(point, pressedItem);
pressedItem->updatePressed(adjustedPoint);
auto adjustedPoint = mapPointToItem(point, pressedView);
pressedView->updatePressed(adjustedPoint);
}
}
}
@ -2756,6 +2772,11 @@ void HistoryInner::deleteItem(not_null<HistoryItem*> item) {
Ui::show(Box<DeleteMessagesBox>(item, suggestModerateActions));
}
bool HistoryInner::hasPendingResizedItems() const {
return (_history && _history->hasPendingResizedItems())
|| (_migrated && _migrated->hasPendingResizedItems());
}
void HistoryInner::deleteAsGroup(FullMsgId itemId) {
if (const auto item = App::histItemById(itemId)) {
const auto group = item->getFullGroup();
@ -2793,7 +2814,7 @@ void HistoryInner::applyDragSelection(
const auto selfromy = itemTop(_dragSelFrom);
const auto seltoy = [&] {
auto result = itemTop(_dragSelTo);
return (result < 0) ? result : (result + _dragSelTo->data()->height());
return (result < 0) ? result : (result + _dragSelTo->height());
}();
if (selfromy < 0 || seltoy < 0) {
return;

4
Telegram/SourceFiles/history/history_inner_widget.h
View File

@ -262,9 +262,7 @@ private:
void deleteAsGroup(FullMsgId itemId);
// Does any of the shown histories has this flag set.
bool hasPendingResizedItems() const {
return (_history && _history->hasPendingResizedItems()) || (_migrated && _migrated->hasPendingResizedItems());
}
bool hasPendingResizedItems() const;
not_null<Window::Controller*> _controller;

218
Telegram/SourceFiles/history/history_item.cpp
View File

@ -16,6 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "history/history_media_types.h"
#include "history/history_media_grouped.h"
#include "history/history_message.h"
#include "history/history.h"
#include "media/media_clip_reader.h"
#include "styles/style_dialogs.h"
#include "styles/style_history.h"
@ -35,13 +36,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "data/data_messages.h"
#include "data/data_feed.h"
namespace {
// a new message from the same sender is attached to previous within 15 minutes
constexpr int kAttachMessageToPreviousSecondsDelta = 900;
} // namespace
namespace internal {
TextSelection unshiftSelection(TextSelection selection, uint16 byLength) {
@ -65,12 +59,12 @@ HistoryItem::HistoryItem(
MsgId id,
MTPDmessage::Flags flags,
QDateTime date,
UserId from) : HistoryElement()
, id(id)
UserId from)
: id(id)
, date(date)
, _history(history)
, _from(from ? App::user(from) : history->peer)
, _flags(flags | MTPDmessage_ClientFlag::f_pending_init_dimensions | MTPDmessage_ClientFlag::f_pending_resize) {
, _flags(flags) {
}
void HistoryItem::finishCreate() {
@ -78,23 +72,23 @@ void HistoryItem::finishCreate() {
}
void HistoryItem::finishEdition(int oldKeyboardTop) {
setPendingInitDimensions();
Auth().data().requestItemViewRefresh(this);
invalidateChatsListEntry();
//if (groupId()) {
// history()->fixGroupAfterEdition(this);
//}
if (isHiddenByGroup()) {
// Perhaps caption was changed, we should refresh the group.
const auto group = Get<HistoryMessageGroup>();
group->leader->setPendingInitDimensions();
group->leader->invalidateChatsListEntry();
}
//if (isHiddenByGroup()) { // #TODO group views
// // Perhaps caption was changed, we should refresh the group.
// const auto group = Get<HistoryMessageGroup>();
// group->leader->setPendingInitDimensions();
// group->leader->invalidateChatsListEntry();
//}
if (oldKeyboardTop >= 0) {
if (auto keyboard = Get<HistoryMessageReplyMarkup>()) {
keyboard->oldTop = oldKeyboardTop;
}
}
//if (oldKeyboardTop >= 0) { // #TODO edit bot message
// if (auto keyboard = Get<HistoryMessageReplyMarkup>()) {
// keyboard->oldTop = oldKeyboardTop;
// }
//}
App::historyUpdateDependent(this);
}
@ -134,7 +128,6 @@ void HistoryItem::invalidateChatsListEntry() {
}
void HistoryItem::finishEditionToEmpty() {
recountDisplayDate();
finishEdition(-1);
_history->removeNotification(this);
@ -149,13 +142,6 @@ void HistoryItem::finishEditionToEmpty() {
if ((!out() || isPost()) && unread() && history()->unreadCount() > 0) {
history()->setUnreadCount(history()->unreadCount() - 1);
}
if (auto next = nextItem()) {
next->previousItemChanged();
}
if (auto previous = previousItem()) {
previous->nextItemChanged();
}
}
bool HistoryItem::isMediaUnread() const {
@ -218,6 +204,17 @@ UserData *HistoryItem::viaBot() const {
return nullptr;
}
UserData *HistoryItem::getMessageBot() const {
if (const auto bot = viaBot()) {
return bot;
}
auto bot = from()->asUser();
if (!bot) {
bot = history()->peer->asUser();
}
return (bot && bot->botInfo) ? bot : nullptr;
};
void HistoryItem::destroy() {
const auto history = this->history();
if (isLogEntry()) {
@ -286,6 +283,9 @@ void HistoryItem::clearMainView() {
}
}
void HistoryItem::addToUnreadMentions(UnreadMentionType type) {
}
Storage::SharedMediaTypesMask HistoryItem::sharedMediaTypes() const {
return {};
}
@ -304,71 +304,9 @@ void HistoryItem::indexAsNewItem() {
}
}
void HistoryItem::previousItemChanged() {
Expects(!isLogEntry());
void HistoryItem::setRealId(MsgId newId) {
Expects(!IsServerMsgId(id));
recountDisplayDate();
recountAttachToPrevious();
}
// Called only if there is no more next item! Not always when it changes!
void HistoryItem::nextItemChanged() {
Expects(!isLogEntry());
setAttachToNext(false);
}
bool HistoryItem::computeIsAttachToPrevious(not_null<HistoryItem*> previous) {
if (!Has<HistoryMessageDate>() && !Has<HistoryMessageUnreadBar>()) {
const auto possible = !isPost() && !previous->isPost()
&& !serviceMsg() && !previous->serviceMsg()
&& !isEmpty() && !previous->isEmpty()
&& (qAbs(previous->date.secsTo(date)) < kAttachMessageToPreviousSecondsDelta);
if (possible) {
if (history()->peer->isSelf()) {
return previous->senderOriginal() == senderOriginal()
&& (previous->Has<HistoryMessageForwarded>() == Has<HistoryMessageForwarded>());
} else {
return previous->from() == from();
}
}
}
return false;
}
void HistoryItem::recountAttachToPrevious() {
Expects(!isLogEntry());
auto attachToPrevious = false;
if (auto previous = previousItem()) {
attachToPrevious = computeIsAttachToPrevious(previous);
previous->setAttachToNext(attachToPrevious);
}
setAttachToPrevious(attachToPrevious);
}
void HistoryItem::setAttachToNext(bool attachToNext) {
if (attachToNext && !(_flags & MTPDmessage_ClientFlag::f_attach_to_next)) {
_flags |= MTPDmessage_ClientFlag::f_attach_to_next;
Global::RefPendingRepaintItems().insert(this);
} else if (!attachToNext && (_flags & MTPDmessage_ClientFlag::f_attach_to_next)) {
_flags &= ~MTPDmessage_ClientFlag::f_attach_to_next;
Global::RefPendingRepaintItems().insert(this);
}
}
void HistoryItem::setAttachToPrevious(bool attachToPrevious) {
if (attachToPrevious && !(_flags & MTPDmessage_ClientFlag::f_attach_to_previous)) {
_flags |= MTPDmessage_ClientFlag::f_attach_to_previous;
setPendingInitDimensions();
} else if (!attachToPrevious && (_flags & MTPDmessage_ClientFlag::f_attach_to_previous)) {
_flags &= ~MTPDmessage_ClientFlag::f_attach_to_previous;
setPendingInitDimensions();
}
}
void HistoryItem::setId(MsgId newId) {
history()->changeMsgId(id, newId);
id = newId;
// We don't need to call Notify::replyMarkupUpdated(this) and update keyboard
@ -568,6 +506,10 @@ QString HistoryItem::directLink() const {
return QString();
}
ChannelId HistoryItem::channelId() const {
return _history->channelId();
}
Data::MessagePosition HistoryItem::position() const {
return Data::MessagePosition(toServerTime(date.toTime_t()).v, fullId());
}
@ -579,6 +521,10 @@ MsgId HistoryItem::replyToId() const {
return 0;
}
not_null<PeerData*> HistoryItem::author() const {
return isPost() ? history()->peer : from();
}
QDateTime HistoryItem::dateOriginal() const {
if (const auto forwarded = Get<HistoryMessageForwarded>()) {
return forwarded->originalDate;
@ -586,7 +532,7 @@ QDateTime HistoryItem::dateOriginal() const {
return date;
}
PeerData *HistoryItem::senderOriginal() const {
not_null<PeerData*> HistoryItem::senderOriginal() const {
if (const auto forwarded = Get<HistoryMessageForwarded>()) {
return forwarded->originalSender;
}
@ -594,7 +540,7 @@ PeerData *HistoryItem::senderOriginal() const {
return (peer->isChannel() && !peer->isMegagroup()) ? peer : from();
}
PeerData *HistoryItem::fromOriginal() const {
not_null<PeerData*> HistoryItem::fromOriginal() const {
if (const auto forwarded = Get<HistoryMessageForwarded>()) {
if (const auto user = forwarded->originalSender->asUser()) {
return user;
@ -626,6 +572,10 @@ bool HistoryItem::hasOutLayout() const {
return out() && !isPost();
}
bool HistoryItem::needCheck() const {
return out() || (id < 0 && history()->peer->isSelf());
}
bool HistoryItem::unread() const {
// Messages from myself are always read.
if (history()->peer->isSelf()) return false;
@ -667,24 +617,23 @@ void HistoryItem::destroyUnreadBar() {
Assert(!isLogEntry());
RemoveComponents(HistoryMessageUnreadBar::Bit());
setPendingInitDimensions();
Auth().data().requestItemViewResize(this);
if (_history->unreadBar == this) {
_history->unreadBar = nullptr;
}
recountAttachToPrevious();
// #TODO recount attach to previous
}
}
void HistoryItem::setUnreadBarCount(int count) {
Expects(!isLogEntry());
if (count > 0) {
HistoryMessageUnreadBar *bar;
if (!Has<HistoryMessageUnreadBar>()) {
AddComponents(HistoryMessageUnreadBar::Bit());
setPendingInitDimensions();
recountAttachToPrevious();
Auth().data().requestItemViewResize(this);
// #TODO recount attach to previous
bar = Get<HistoryMessageUnreadBar>();
} else {
@ -721,7 +670,7 @@ bool HistoryItem::groupIdValidityChanged() {
return false;
}
RemoveComponents(HistoryMessageGroup::Bit());
setPendingInitDimensions();
Auth().data().requestItemViewResize(this);
return true;
}
return false;
@ -737,7 +686,7 @@ void HistoryItem::makeGroupMember(not_null<HistoryItem*> leader) {
_media = std::move(single);
}
_flags |= MTPDmessage_ClientFlag::f_hidden_by_group;
setPendingInitDimensions();
Auth().data().requestItemViewResize(this);
group->leader = leader;
base::take(group->others);
@ -758,7 +707,7 @@ void HistoryItem::makeGroupLeader(
if (leaderChanged) {
group->leader = this;
_flags &= ~MTPDmessage_ClientFlag::f_hidden_by_group;
setPendingInitDimensions();
Auth().data().requestItemViewResize(this);
}
group->others = std::move(others);
if (!_media || !_media->applyGroup(group->others)) {
@ -786,7 +735,7 @@ void HistoryItem::resetGroupMedia(
} else if (_media) {
_media = _media->takeLastFromGroup();
}
setPendingInitDimensions();
Auth().data().requestItemViewResize(this);
}
int HistoryItem::displayedDateHeight() const {
@ -796,22 +745,6 @@ int HistoryItem::displayedDateHeight() const {
return 0;
}
int HistoryItem::marginTop() const {
auto result = 0;
if (!isHiddenByGroup()) {
if (isAttachedToPrevious()) {
result += st::msgMarginTopAttached;
} else {
result += st::msgMargin.top();
}
}
result += displayedDateHeight();
if (const auto unreadbar = Get<HistoryMessageUnreadBar>()) {
result += unreadbar->height();
}
return result;
}
bool HistoryItem::displayDate() const {
return Has<HistoryMessageDate>();
}
@ -822,10 +755,6 @@ bool HistoryItem::isEmpty() const {
&& !Has<HistoryMessageLogEntryOriginal>();
}
int HistoryItem::marginBottom() const {
return isHiddenByGroup() ? 0 : st::msgMargin.bottom();
}
void HistoryItem::clipCallback(Media::Clip::Notification notification) {
using namespace Media::Clip;
@ -857,7 +786,7 @@ void HistoryItem::clipCallback(Media::Clip::Notification notification) {
media->stopInline();
}
if (!stopped) {
setPendingInitDimensions();
Auth().data().requestItemViewResize(this);
Auth().data().markItemLayoutChanged(this);
Global::RefPendingRepaintItems().insert(this);
}
@ -922,31 +851,6 @@ HistoryItem *HistoryItem::nextItem() const {
return nullptr;
}
void HistoryItem::recountDisplayDate() {
Expects(!isLogEntry());
setDisplayDate([&] {
if (isEmpty()) {
return false;
}
if (auto previous = previousItem()) {
return previous->isEmpty() || (previous->date.date() != date.date());
}
return true;
}());
}
void HistoryItem::setDisplayDate(bool displayDate) {
if (displayDate && !Has<HistoryMessageDate>()) {
AddComponents(HistoryMessageDate::Bit());
Get<HistoryMessageDate>()->init(date);
setPendingInitDimensions();
} else if (!displayDate && Has<HistoryMessageDate>()) {
RemoveComponents(HistoryMessageDate::Bit());
setPendingInitDimensions();
}
}
QString HistoryItem::notificationText() const {
auto getText = [this]() {
if (emptyText()) {
@ -1016,8 +920,10 @@ HistoryItem::~HistoryItem() {
}
}
ClickHandlerPtr goToMessageClickHandler(PeerData *peer, MsgId msgId) {
return std::make_shared<LambdaClickHandler>([peer, msgId] {
ClickHandlerPtr goToMessageClickHandler(
not_null<PeerData*> peer,
MsgId msgId) {
return std::make_shared<LambdaClickHandler>([=] {
if (App::main()) {
auto view = App::mousedItem();
if (view && view->data()->history()->peer == peer) {
@ -1030,3 +936,7 @@ ClickHandlerPtr goToMessageClickHandler(PeerData *peer, MsgId msgId) {
}
});
}
ClickHandlerPtr goToMessageClickHandler(not_null<HistoryItem*> item) {
return goToMessageClickHandler(item->history()->peer, item->id);
}

170
Telegram/SourceFiles/history/history_item.h
View File

@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "history/history_media_pointer.h"
#include "history/view/history_view_cursor_state.h"
enum class UnreadMentionType;
struct MessageGroupId;
struct HistoryMessageGroup;
struct HistoryMessageReplyMarkup;
@ -51,35 +52,6 @@ namespace HistoryView {
enum class Context : char;
} // namespace HistoryView
class HistoryElement {
public:
HistoryElement() = default;
HistoryElement(const HistoryElement &other) = delete;
HistoryElement &operator=(const HistoryElement &other) = delete;
int maxWidth() const {
return _maxw;
}
int minHeight() const {
return _minh;
}
int width() const {
return _width;
}
int height() const {
return _height;
}
virtual ~HistoryElement() = default;
protected:
mutable int _maxw = 0;
mutable int _minh = 0;
mutable int _width = 0;
mutable int _height = 0;
};
namespace internal {
TextSelection unshiftSelection(TextSelection selection, uint16 byLength);
@ -93,23 +65,8 @@ inline TextSelection shiftSelection(TextSelection selection, const Text &byText)
} // namespace internal
class HistoryItem
: public HistoryElement
, public RuntimeComposer {
class HistoryItem : public RuntimeComposer {
public:
int resizeGetHeight(int newWidth) {
if (_flags & MTPDmessage_ClientFlag::f_pending_init_dimensions) {
_flags &= ~MTPDmessage_ClientFlag::f_pending_init_dimensions;
initDimensions();
}
if (_flags & MTPDmessage_ClientFlag::f_pending_resize) {
_flags &= ~MTPDmessage_ClientFlag::f_pending_resize;
}
_width = newWidth;
return resizeContentGetHeight();
}
virtual void draw(Painter &p, QRect clip, TextSelection selection, TimeMs ms) const = 0;
virtual void dependencyItemRemoved(HistoryItem *dependency) {
}
virtual bool updateDependencyItem() {
@ -126,16 +83,7 @@ public:
}
UserData *viaBot() const;
UserData *getMessageBot() const {
if (auto bot = viaBot()) {
return bot;
}
auto bot = from()->asUser();
if (!bot) {
bot = history()->peer->asUser();
}
return (bot && bot->botInfo) ? bot : nullptr;
};
UserData *getMessageBot() const;
bool isLogEntry() const {
return (id > ServerMaxMsgId);
@ -148,7 +96,7 @@ public:
not_null<History*> history() const {
return _history;
}
PeerData *from() const {
not_null<PeerData*> from() const {
return _from;
}
HistoryView::Element *mainView() const {
@ -202,18 +150,7 @@ public:
return hasViews() ? 1 : -1;
}
virtual bool needCheck() const {
return out() || (id < 0 && history()->peer->isSelf());
}
virtual bool hasPoint(QPoint point) const {
return false;
}
[[nodiscard]] virtual HistoryTextState getState(
QPoint point,
HistoryStateRequest request) const = 0;
virtual void updatePressed(QPoint point) {
}
virtual bool needCheck() const;
[[nodiscard]] virtual TextSelection adjustSelection(
TextSelection selection,
@ -233,8 +170,7 @@ public:
virtual void updateReplyMarkup(const MTPReplyMarkup *markup) {
}
virtual void addToUnreadMentions(UnreadMentionType type) {
}
virtual void addToUnreadMentions(UnreadMentionType type);
virtual void eraseFromUnreadMentions() {
}
virtual Storage::SharedMediaTypesMask sharedMediaTypes() const;
@ -244,9 +180,6 @@ public:
return false;
}
void previousItemChanged();
void nextItemChanged();
virtual TextWithEntities selectedText(TextSelection selection) const {
return { qsl("[-]"), EntitiesInText() };
}
@ -283,7 +216,7 @@ public:
}
virtual void setViewsCount(int32 count) {
}
virtual void setId(MsgId newId);
virtual void setRealId(MsgId newId);
virtual bool displayEditedBadge() const {
return false;
@ -322,9 +255,7 @@ public:
MsgId id;
QDateTime date;
ChannelId channelId() const {
return _history->channelId();
}
ChannelId channelId() const;
FullMsgId fullId() const {
return FullMsgId(channelId(), id);
}
@ -370,13 +301,11 @@ public:
}
MsgId replyToId() const;
PeerData *author() const {
return isPost() ? history()->peer : from();
}
not_null<PeerData*> author() const;
QDateTime dateOriginal() const;
PeerData *senderOriginal() const;
PeerData *fromOriginal() const;
not_null<PeerData*> senderOriginal() const;
not_null<PeerData*> fromOriginal() const;
QString authorOriginal() const;
MsgId idOriginal() const;
@ -391,30 +320,7 @@ public:
// when the new messages arrive in this chat history
void setUnreadBarFreezed();
bool pendingResize() const {
return _flags & MTPDmessage_ClientFlag::f_pending_resize;
}
void setPendingResize() {
_flags |= MTPDmessage_ClientFlag::f_pending_resize;
_history->setHasPendingResizedItems();
}
bool pendingInitDimensions() const {
return _flags & MTPDmessage_ClientFlag::f_pending_init_dimensions;
}
void setPendingInitDimensions() {
_flags |= MTPDmessage_ClientFlag::f_pending_init_dimensions;
setPendingResize();
}
int displayedDateHeight() const;
int marginTop() const;
int marginBottom() const;
bool isAttachedToPrevious() const {
return _flags & MTPDmessage_ClientFlag::f_attach_to_previous;
}
bool isAttachedToNext() const {
return _flags & MTPDmessage_ClientFlag::f_attach_to_next;
}
bool displayDate() const;
bool isInOneDayWithPrevious() const {
@ -439,20 +345,6 @@ public:
void clipCallback(Media::Clip::Notification notification);
void audioTrackUpdated();
bool computeIsAttachToPrevious(not_null<HistoryItem*> previous);
void setLogEntryDisplayDate(bool displayDate) {
Expects(isLogEntry());
setDisplayDate(displayDate);
}
void setLogEntryAttachToPrevious(bool attachToPrevious) {
Expects(isLogEntry());
setAttachToPrevious(attachToPrevious);
}
void setLogEntryAttachToNext(bool attachToNext) {
Expects(isLogEntry());
setAttachToNext(attachToNext);
}
bool isUnderCursor() const;
HistoryItem *previousItem() const;
@ -462,7 +354,7 @@ public:
not_null<Window::Controller*> controller,
HistoryView::Context context) = 0;
~HistoryItem();
virtual ~HistoryItem();
protected:
HistoryItem(
@ -476,14 +368,9 @@ protected:
// a virtual method, it can not be done from constructor.
virtual void finishCreate();
// Called from resizeGetHeight() when MTPDmessage_ClientFlag::f_pending_init_dimensions is set.
virtual void initDimensions() = 0;
virtual void markMediaAsReadHook() {
}
virtual int resizeContentGetHeight() = 0;
void finishEdition(int oldKeyboardTop);
void finishEditionToEmpty();
@ -491,29 +378,6 @@ protected:
not_null<PeerData*> _from;
MTPDmessage::Flags _flags = 0;
// This should be called only from previousItemChanged()
// to add required bits to the Composer mask
// after that always use Has<HistoryMessageDate>().
void recountDisplayDate();
// This should be called only from previousItemChanged() or when
// HistoryMessageDate or HistoryMessageUnreadBar bit is changed in the Composer mask
// then the result should be cached in a client side flag MTPDmessage_ClientFlag::f_attach_to_previous.
void recountAttachToPrevious();
// This should be called only from recountDisplayDate().
// Also this is called from setLogEntryDisplayDate() for channel log entries.
void setDisplayDate(bool displayDate);
// This should be called only from recountAttachToPrevious().
// Also this is called from setLogEntryAttachToPrevious() for channel log entries.
void setAttachToPrevious(bool attachToNext);
// This should be called only from recountAttachToPrevious() of the next item
// or when the next item is removed through nextItemChanged() call.
// Also this is called from setLogEntryAttachToNext() for channel log entries.
void setAttachToNext(bool attachToNext);
const HistoryMessageReplyMarkup *inlineReplyMarkup() const {
return const_cast<HistoryItem*>(this)->inlineReplyMarkup();
}
@ -543,6 +407,7 @@ private:
void resetGroupMedia(const std::vector<not_null<HistoryItem*>> &others);
HistoryView::Element *_mainView = nullptr;
friend class HistoryView::Element;
};
@ -562,8 +427,7 @@ public:
};
ClickHandlerPtr goToMessageClickHandler(PeerData *peer, MsgId msgId);
inline ClickHandlerPtr goToMessageClickHandler(HistoryItem *item) {
return goToMessageClickHandler(item->history()->peer, item->id);
}
ClickHandlerPtr goToMessageClickHandler(
not_null<PeerData*> peer,
MsgId msgId);
ClickHandlerPtr goToMessageClickHandler(not_null<HistoryItem*> item);

10
Telegram/SourceFiles/history/history_item_components.cpp
View File

@ -16,6 +16,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "history/view/history_view_service_message.h"
#include "media/media_audio.h"
#include "media/player/media_player_instance.h"
#include "auth_session.h"
#include "data/data_session.h"
#include "styles/style_widgets.h"
#include "styles/style_history.h"
@ -160,7 +162,7 @@ bool HistoryMessageReply::updateData(HistoryMessage *holder, bool force) {
replyToMsgId = 0;
}
if (force) {
holder->setPendingInitDimensions();
Auth().data().requestItemViewResize(holder);
}
return (replyToMsg || !replyToMsgId);
}
@ -211,10 +213,12 @@ void HistoryMessageReply::resize(int width) const {
}
}
void HistoryMessageReply::itemRemoved(HistoryMessage *holder, HistoryItem *removed) {
void HistoryMessageReply::itemRemoved(
HistoryMessage *holder,
HistoryItem *removed) {
if (replyToMsg == removed) {
clearData(holder);
holder->setPendingInitDimensions();
Auth().data().requestItemViewResize(holder);
}
}

24
Telegram/SourceFiles/history/history_media.cpp
View File

@ -7,8 +7,32 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/
#include "history/history_media.h"
#include "history/history_item.h"
#include "storage/storage_shared_media.h"
Storage::SharedMediaTypesMask HistoryMedia::sharedMediaTypes() const {
return {};
}
bool HistoryMedia::isDisplayed() const {
return !_parent->isHiddenByGroup();
}
QSize HistoryMedia::countCurrentSize(int newWidth) {
return QSize(qMin(newWidth, maxWidth()), minHeight());
}
TextSelection HistoryMedia::skipSelection(TextSelection selection) const {
return internal::unshiftSelection(selection, fullSelectionLength());
}
TextSelection HistoryMedia::unskipSelection(TextSelection selection) const {
return internal::shiftSelection(selection, fullSelectionLength());
}
HistoryTextState HistoryMedia::getStateGrouped(
const QRect &geometry,
QPoint point,
HistoryStateRequest request) const {
Unexpected("Grouping method call.");
}

66
Telegram/SourceFiles/history/history_media.h
View File

@ -7,9 +7,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/
#pragma once
#include "history/history_item.h"
#include "history/view/history_view_object.h"
struct HistoryMessageEdited;
struct HistoryTextState;
struct HistoryStateRequest;
struct TextSelection;
namespace base {
template <typename Enum>
@ -28,7 +31,26 @@ enum class MediaInBubbleState {
Bottom,
};
class HistoryMedia : public HistoryElement {
enum HistoryMediaType : char {
MediaTypePhoto,
MediaTypeVideo,
MediaTypeContact,
MediaTypeCall,
MediaTypeFile,
MediaTypeGif,
MediaTypeSticker,
MediaTypeLocation,
MediaTypeWebPage,
MediaTypeMusicFile,
MediaTypeVoiceFile,
MediaTypeGame,
MediaTypeInvoice,
MediaTypeGrouped,
MediaTypeCount
};
class HistoryMedia : public HistoryView::Object {
public:
HistoryMedia(not_null<HistoryItem*> parent) : _parent(parent) {
}
@ -48,12 +70,10 @@ public:
virtual TextWithEntities selectedText(TextSelection selection) const = 0;
bool hasPoint(QPoint point) const {
return QRect(0, 0, _width, _height).contains(point);
return QRect(0, 0, width(), height()).contains(point);
}
virtual bool isDisplayed() const {
return !_parent->isHiddenByGroup();
}
virtual bool isDisplayed() const;
virtual void updateNeedBubbleState() {
}
virtual bool isAboveMessage() const {
@ -65,13 +85,8 @@ public:
virtual bool allowsFastShare() const {
return false;
}
virtual void initDimensions() = 0;
virtual void refreshParentId(not_null<HistoryItem*> realParent) {
}
virtual int resizeGetHeight(int width) {
_width = qMin(width, _maxw);
return _height;
}
virtual void draw(Painter &p, const QRect &r, TextSelection selection, TimeMs ms) const = 0;
virtual HistoryTextState getState(QPoint point, HistoryStateRequest request) const = 0;
virtual void updatePressed(QPoint point) {
@ -102,17 +117,9 @@ public:
return 0;
}
[[nodiscard]] TextSelection skipSelection(
TextSelection selection) const {
return internal::unshiftSelection(
selection,
fullSelectionLength());
}
TextSelection selection) const;
[[nodiscard]] TextSelection unskipSelection(
TextSelection selection) const {
return internal::shiftSelection(
selection,
fullSelectionLength());
}
TextSelection selection) const;
// if we press and drag this link should we drag the item
virtual bool dragItemByHandler(const ClickHandlerPtr &p) const = 0;
@ -174,11 +181,9 @@ public:
Unexpected("Grouping method call.");
}
virtual HistoryTextState getStateGrouped(
const QRect &geometry,
QPoint point,
HistoryStateRequest request) const {
Unexpected("Grouping method call.");
}
const QRect &geometry,
QPoint point,
HistoryStateRequest request) const;
virtual std::unique_ptr<HistoryMedia> takeLastFromGroup() {
return nullptr;
}
@ -252,18 +257,21 @@ public:
return false;
}
// Sometimes click on media in message is overloaded by the messsage:
// Sometimes click on media in message is overloaded by the message:
// (for example it can open a link or a game instead of opening media)
// But the overloading click handler should be used only when media
// is already loaded (not a photo or gif waiting for load with auto
// is already loaded (not a photo or GIF waiting for load with auto
// load being disabled - in such case media should handle the click).
virtual bool isReadyForOpen() const {
return true;
}
virtual ~HistoryMedia() = default;
protected:
QSize countCurrentSize(int newWidth) override;
not_null<HistoryItem*> _parent;
MediaInBubbleState _inBubbleState = MediaInBubbleState::None;
};

65
Telegram/SourceFiles/history/history_media_grouped.cpp
View File

@ -38,7 +38,7 @@ std::unique_ptr<HistoryMedia> HistoryGroupedMedia::clone(
return main()->clone(newParent, realParent);
}
void HistoryGroupedMedia::initDimensions() {
QSize HistoryGroupedMedia::countOptimalSize() {
if (_caption.hasSkipBlock()) {
_caption.setSkipBlock(
_parent->skipBlockWidth(),
@ -60,33 +60,35 @@ void HistoryGroupedMedia::initDimensions() {
st::historyGroupSkip);
Assert(layout.size() == _elements.size());
_maxw = _minh = 0;
auto maxWidth = 0;
auto minHeight = 0;
for (auto i = 0, count = int(layout.size()); i != count; ++i) {
const auto &item = layout[i];
accumulate_max(_maxw, item.geometry.x() + item.geometry.width());
accumulate_max(_minh, item.geometry.y() + item.geometry.height());
accumulate_max(maxWidth, item.geometry.x() + item.geometry.width());
accumulate_max(minHeight, item.geometry.y() + item.geometry.height());
_elements[i].initialGeometry = item.geometry;
_elements[i].sides = item.sides;
}
if (!_caption.isEmpty()) {
auto captionw = _maxw - st::msgPadding.left() - st::msgPadding.right();
_minh += st::mediaCaptionSkip + _caption.countHeight(captionw);
auto captionw = maxWidth - st::msgPadding.left() - st::msgPadding.right();
minHeight += st::mediaCaptionSkip + _caption.countHeight(captionw);
if (isBubbleBottom()) {
_minh += st::msgPadding.bottom();
minHeight += st::msgPadding.bottom();
}
}
return { maxWidth, minHeight };
}
int HistoryGroupedMedia::resizeGetHeight(int width) {
_width = std::min(width, _maxw);
_height = 0;
if (_width < st::historyGroupWidthMin) {
return _height;
QSize HistoryGroupedMedia::countCurrentSize(int newWidth) {
accumulate_min(newWidth, maxWidth());
auto newHeight = 0;
if (newWidth < st::historyGroupWidthMin) {
return { newWidth, newHeight };
}
const auto initialSpacing = st::historyGroupSkip;
const auto factor = _width / float64(_maxw);
const auto factor = newWidth / float64(maxWidth());
const auto scale = [&](int value) {
return int(std::round(value * factor));
};
@ -114,18 +116,18 @@ int HistoryGroupedMedia::resizeGetHeight(int width) {
- (needBottomSkip ? spacing : 0);
element.geometry = QRect(left, top, width, height);
accumulate_max(_height, top + height);
accumulate_max(newHeight, top + height);
}
if (!_caption.isEmpty()) {
const auto captionw = _width - st::msgPadding.left() - st::msgPadding.right();
_height += st::mediaCaptionSkip + _caption.countHeight(captionw);
const auto captionw = newWidth - st::msgPadding.left() - st::msgPadding.right();
newHeight += st::mediaCaptionSkip + _caption.countHeight(captionw);
if (isBubbleBottom()) {
_height += st::msgPadding.bottom();
newHeight += st::msgPadding.bottom();
}
}
return _height;
return { newWidth, newHeight };
}
void HistoryGroupedMedia::refreshParentId(
@ -168,23 +170,23 @@ void HistoryGroupedMedia::draw(
// date
const auto selected = (selection == FullSelection);
if (!_caption.isEmpty()) {
const auto captionw = _width - st::msgPadding.left() - st::msgPadding.right();
const auto captionw = width() - st::msgPadding.left() - st::msgPadding.right();
const auto outbg = _parent->hasOutLayout();
const auto captiony = _height
const auto captiony = height()
- (isBubbleBottom() ? st::msgPadding.bottom() : 0)
- _caption.countHeight(captionw);
p.setPen(outbg ? (selected ? st::historyTextOutFgSelected : st::historyTextOutFg) : (selected ? st::historyTextInFgSelected : st::historyTextInFg));
_caption.draw(p, st::msgPadding.left(), captiony, captionw, style::al_left, 0, -1, selection);
} else if (_parent->getMedia() == this) {
auto fullRight = _width;
auto fullBottom = _height;
auto fullRight = width();
auto fullBottom = height();
if (needInfoDisplay()) {
_parent->drawInfo(p, fullRight, fullBottom, _width, selected, InfoDisplayOverImage);
_parent->drawInfo(p, fullRight, fullBottom, width(), selected, InfoDisplayOverImage);
}
if (!_parent->hasBubble() && _parent->displayRightAction()) {
auto fastShareLeft = (fullRight + st::historyFastShareLeft);
auto fastShareTop = (fullBottom - st::historyFastShareBottom - st::historyFastShareSize);
_parent->drawRightAction(p, fastShareLeft, fastShareTop, _width);
_parent->drawRightAction(p, fastShareLeft, fastShareTop, width());
}
}
}
@ -210,19 +212,19 @@ HistoryTextState HistoryGroupedMedia::getState(
HistoryStateRequest request) const {
auto result = getElementState(point, request);
if (!result.link && !_caption.isEmpty()) {
const auto captionw = _width - st::msgPadding.left() - st::msgPadding.right();
const auto captiony = _height
const auto captionw = width() - st::msgPadding.left() - st::msgPadding.right();
const auto captiony = height()
- (isBubbleBottom() ? st::msgPadding.bottom() : 0)
- _caption.countHeight(captionw);
if (QRect(st::msgPadding.left(), captiony, captionw, _height - captiony).contains(point)) {
if (QRect(st::msgPadding.left(), captiony, captionw, height() - captiony).contains(point)) {
return HistoryTextState(_parent, _caption.getState(
point - QPoint(st::msgPadding.left(), captiony),
captionw,
request.forText()));
}
} else if (_parent->getMedia() == this) {
auto fullRight = _width;
auto fullBottom = _height;
auto fullRight = width();
auto fullBottom = height();
if (_parent->pointInTime(fullRight, fullBottom, point, InfoDisplayOverImage)) {
result.cursor = HistoryInDateCursorState;
}
@ -347,7 +349,7 @@ bool HistoryGroupedMedia::applyGroup(
pushElement(item);
}
_elements.push_back(std::move(mainElement));
_parent->setPendingInitDimensions();
//_parent->setPendingInitDimensions(); // #TODO group view
return true;
}
@ -452,7 +454,8 @@ bool HistoryGroupedMedia::computeNeedBubble() const {
if (message->viaBot()
|| message->Has<HistoryMessageReply>()
|| message->displayForwardedFrom()
|| message->displayFromName()) {
// || message->displayFromName() // #TODO media views
) {
return true;
}
}

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

@ -24,8 +24,6 @@ public:
not_null<HistoryItem*> newParent,
not_null<HistoryItem*> realParent) const override;
void initDimensions() override;
int resizeGetHeight(int width) override;
void refreshParentId(not_null<HistoryItem*> realParent) override;
void updateSentMedia(const MTPMessageMedia &media) override;
bool needReSetInlineResultMedia(const MTPMessageMedia &media) override;
@ -115,6 +113,9 @@ private:
};
QSize countOptimalSize() override;
QSize countCurrentSize(int newWidth) override;
bool needInfoDisplay() const;
bool computeNeedBubble() const;
not_null<HistoryMedia*> main() const;

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

File diff suppressed because it is too large Load Diff

152
Telegram/SourceFiles/history/history_media_types.h
View File

@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/
#pragma once
#include "base/runtime_composer.h"
#include "history/history_media.h"
#include "ui/effects/radial_animation.h"
#include "data/data_document.h"
@ -72,39 +73,20 @@ protected:
FileClickHandlerPtr &&savel,
FileClickHandlerPtr &&cancell);
void setDocumentLinks(
not_null<DocumentData*> document,
not_null<HistoryItem*> realParent,
bool inlinegif = false) {
FileClickHandlerPtr open, save;
const auto context = realParent->fullId();
if (inlinegif) {
open = std::make_shared<GifOpenClickHandler>(document, context);
} else {
open = std::make_shared<DocumentOpenClickHandler>(document, context);
}
if (inlinegif) {
save = std::make_shared<GifOpenClickHandler>(document, context);
} else if (document->isVoiceMessage()) {
save = std::make_shared<DocumentOpenClickHandler>(document, context);
} else {
save = std::make_shared<DocumentSaveClickHandler>(document, context);
}
setLinks(
std::move(open),
std::move(save),
std::make_shared<DocumentCancelClickHandler>(document, context));
}
not_null<DocumentData*> document,
not_null<HistoryItem*> realParent,
bool inlinegif = false);
// >= 0 will contain download / upload string, _statusSize = loaded bytes
// < 0 will contain played string, _statusSize = -(seconds + 1) played
// 0x7FFFFFF0 will contain status for not yet downloaded file
// 0x7FFFFFF1 will contain status for already downloaded file
// 0x7FFFFFF2 will contain status for failed to download / upload file
mutable int32 _statusSize;
mutable int _statusSize;
mutable QString _statusText;
// duration = -1 - no duration, duration = -2 - "GIF" duration
void setStatusSize(int32 newSize, int32 fullSize, int32 duration, qint64 realDuration) const;
void setStatusSize(int newSize, int fullSize, int duration, qint64 realDuration) const;
void step_radial(TimeMs ms, bool timer);
void thumbAnimationCallback();
@ -174,9 +156,6 @@ public:
return std::make_unique<HistoryPhoto>(newParent, realParent, *this);
}
void initDimensions() override;
int resizeGetHeight(int width) override;
void draw(Painter &p, const QRect &clip, TextSelection selection, TimeMs ms) const override;
HistoryTextState getState(QPoint point, HistoryStateRequest request) const override;
@ -254,6 +233,9 @@ protected:
bool dataLoaded() const override;
private:
QSize countOptimalSize() override;
QSize countCurrentSize(int newWidth) override;
bool needInfoDisplay() const;
void validateGroupedCache(
const QRect &geometry,
@ -262,8 +244,9 @@ private:
not_null<QPixmap*> cache) const;
not_null<PhotoData*> _data;
int16 _pixw = 1;
int16 _pixh = 1;
int _serviceWidth = 0;
int _pixw = 1;
int _pixh = 1;
Text _caption;
};
@ -288,9 +271,6 @@ public:
return std::make_unique<HistoryVideo>(newParent, realParent, *this);
}
void initDimensions() override;
int resizeGetHeight(int width) override;
void draw(Painter &p, const QRect &r, TextSelection selection, TimeMs ms) const override;
HistoryTextState getState(QPoint point, HistoryStateRequest request) const override;
@ -369,16 +349,19 @@ protected:
bool dataLoaded() const override;
private:
QSize countOptimalSize() override;
QSize countCurrentSize(int newWidth) override;
void validateGroupedCache(
const QRect &geometry,
RectParts corners,
not_null<uint64*> cacheKey,
not_null<QPixmap*> cache) const;
void setStatusSize(int32 newSize) const;
void setStatusSize(int newSize) const;
void updateStatusText() const;
not_null<DocumentData*> _data;
int32 _thumbw;
int _thumbw;
Text _caption;
};
@ -408,9 +391,6 @@ public:
return std::make_unique<HistoryDocument>(newParent, *this);
}
void initDimensions() override;
int resizeGetHeight(int width) override;
void draw(Painter &p, const QRect &r, TextSelection selection, TimeMs ms) const override;
HistoryTextState getState(QPoint point, HistoryStateRequest request) const override;
void updatePressed(QPoint point) override;
@ -475,10 +455,13 @@ protected:
bool dataLoaded() const override;
private:
QSize countOptimalSize() override;
QSize countCurrentSize(int newWidth) override;
void createComponents(bool caption);
void fillNamedFromData(HistoryDocumentNamed *named);
void setStatusSize(int32 newSize, qint64 realDuration = 0) const;
void setStatusSize(int newSize, qint64 realDuration = 0) const;
bool updateStatusText() const; // returns showPause
// Callback is a void(const QString &, const QString &, const Text &) functor.
@ -509,9 +492,6 @@ public:
return std::make_unique<HistoryGif>(newParent, *this);
}
void initDimensions() override;
int resizeGetHeight(int width) override;
void draw(Painter &p, const QRect &r, TextSelection selection, TimeMs ms) const override;
HistoryTextState getState(QPoint point, HistoryStateRequest request) const override;
@ -591,6 +571,9 @@ protected:
}
private:
QSize countOptimalSize() override;
QSize countCurrentSize(int newWidth) override;
bool needInfoDisplay() const;
int additionalWidth(
const HistoryMessageVia *via,
@ -602,14 +585,14 @@ private:
not_null<DocumentData*> _data;
ClickHandlerPtr _openInMediaviewLink;
int32 _thumbw = 1;
int32 _thumbh = 1;
int _thumbw = 1;
int _thumbh = 1;
Text _caption;
mutable std::unique_ptr<Media::Clip::Playback> _roundPlayback;
Media::Clip::ReaderPointer _gif;
void setStatusSize(int32 newSize) const;
void setStatusSize(int newSize) const;
void updateStatusText() const;
};
@ -631,9 +614,6 @@ public:
return std::make_unique<HistorySticker>(newParent, _data);
}
void initDimensions() override;
int resizeGetHeight(int width) override;
void draw(Painter &p, const QRect &r, TextSelection selection, TimeMs ms) const override;
HistoryTextState getState(QPoint point, HistoryStateRequest request) const override;
@ -676,12 +656,15 @@ public:
}
private:
QSize countOptimalSize() override;
QSize countCurrentSize(int newWidth) override;
int additionalWidth(const HistoryMessageVia *via, const HistoryMessageReply *reply) const;
int additionalWidth() const;
QString toString() const;
int16 _pixw = 1;
int16 _pixh = 1;
int _pixw = 1;
int _pixh = 1;
ClickHandlerPtr _packLink;
not_null<DocumentData*> _data;
QString _emoji;
@ -713,8 +696,6 @@ public:
_phone);
}
void initDimensions() override;
void draw(Painter &p, const QRect &r, TextSelection selection, TimeMs ms) const override;
HistoryTextState getState(QPoint point, HistoryStateRequest request) const override;
@ -753,6 +734,8 @@ public:
~HistoryContact();
private:
QSize countOptimalSize() override;
int32 _userId = 0;
UserData *_contact = nullptr;
@ -782,8 +765,6 @@ public:
Unexpected("Clone HistoryCall.");
}
void initDimensions() override;
void draw(Painter &p, const QRect &r, TextSelection selection, TimeMs ms) const override;
HistoryTextState getState(QPoint point, HistoryStateRequest request) const override;
@ -815,6 +796,8 @@ public:
}
private:
QSize countOptimalSize() override;
static FinishReason GetReason(const MTPDmessageActionPhoneCall &call);
FinishReason _reason = FinishReason::Missed;
@ -847,8 +830,6 @@ public:
return std::make_unique<HistoryWebPage>(newParent, *this);
}
void initDimensions() override;
int resizeGetHeight(int width) override;
void refreshParentId(not_null<HistoryItem*> realParent) override;
void draw(Painter &p, const QRect &r, TextSelection selection, TimeMs ms) const override;
@ -918,12 +899,11 @@ public:
}
private:
TextSelection toDescriptionSelection(TextSelection selection) const {
return internal::unshiftSelection(selection, _title);
}
TextSelection fromDescriptionSelection(TextSelection selection) const {
return internal::shiftSelection(selection, _title);
}
QSize countOptimalSize() override;
QSize countCurrentSize(int newWidth) override;
TextSelection toDescriptionSelection(TextSelection selection) const;
TextSelection fromDescriptionSelection(TextSelection selection) const;
QMargins inBubblePadding() const;
int bottomInfoPadding() const;
bool isLogEntryOriginal() const;
@ -943,8 +923,8 @@ private:
QString _duration;
int _durationWidth = 0;
int16 _pixw = 0;
int16 _pixh = 0;
int _pixw = 0;
int _pixh = 0;
};
@ -964,8 +944,6 @@ public:
return std::make_unique<HistoryGame>(newParent, *this);
}
void initDimensions() override;
int resizeGetHeight(int width) override;
void refreshParentId(not_null<HistoryItem*> realParent) override;
void draw(Painter &p, const QRect &r, TextSelection selection, TimeMs ms) const override;
@ -1044,12 +1022,11 @@ public:
}
private:
TextSelection toDescriptionSelection(TextSelection selection) const {
return internal::unshiftSelection(selection, _title);
}
TextSelection fromDescriptionSelection(TextSelection selection) const {
return internal::shiftSelection(selection, _title);
}
QSize countOptimalSize() override;
QSize countCurrentSize(int newWidth) override;
TextSelection toDescriptionSelection(TextSelection selection) const;
TextSelection fromDescriptionSelection(TextSelection selection) const;
QMargins inBubblePadding() const;
int bottomInfoPadding() const;
@ -1057,7 +1034,7 @@ private:
std::shared_ptr<ReplyMarkupClickHandler> _openl;
std::unique_ptr<HistoryMedia> _attach;
int32 _titleLines, _descriptionLines;
int _titleLines, _descriptionLines;
Text _title, _description;
@ -1085,8 +1062,6 @@ public:
return std::make_unique<HistoryInvoice>(newParent, *this);
}
void initDimensions() override;
int resizeGetHeight(int width) override;
void refreshParentId(not_null<HistoryItem*> realParent) override;
MsgId getReceiptMsgId() const {
@ -1145,14 +1120,13 @@ public:
}
private:
QSize countOptimalSize() override;
QSize countCurrentSize(int newWidth) override;
void fillFromData(const MTPDmessageMediaInvoice &data);
TextSelection toDescriptionSelection(TextSelection selection) const {
return internal::unshiftSelection(selection, _title);
}
TextSelection fromDescriptionSelection(TextSelection selection) const {
return internal::shiftSelection(selection, _title);
}
TextSelection toDescriptionSelection(TextSelection selection) const;
TextSelection fromDescriptionSelection(TextSelection selection) const;
QMargins inBubblePadding() const;
int bottomInfoPadding() const;
@ -1193,9 +1167,6 @@ public:
return std::make_unique<HistoryLocation>(newParent, *this);
}
void initDimensions() override;
int resizeGetHeight(int32 width) override;
void draw(Painter &p, const QRect &r, TextSelection selection, TimeMs ms) const override;
HistoryTextState getState(QPoint point, HistoryStateRequest request) const override;
@ -1230,18 +1201,17 @@ public:
}
private:
TextSelection toDescriptionSelection(TextSelection selection) const {
return internal::unshiftSelection(selection, _title);
}
TextSelection fromDescriptionSelection(TextSelection selection) const {
return internal::shiftSelection(selection, _title);
}
QSize countOptimalSize() override;
QSize countCurrentSize(int newWidth) override;
TextSelection toDescriptionSelection(TextSelection selection) const;
TextSelection fromDescriptionSelection(TextSelection selection) const;
LocationData *_data;
Text _title, _description;
ClickHandlerPtr _link;
int32 fullWidth() const;
int32 fullHeight() const;
int fullWidth() const;
int fullHeight() const;
};

1105
Telegram/SourceFiles/history/history_message.cpp
View File

File diff suppressed because it is too large Load Diff

64
Telegram/SourceFiles/history/history_message.h
View File

@ -9,6 +9,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "history/history_item.h"
namespace HistoryView {
class Message;
} // namespace HistoryView
struct HistoryMessageEdited;
base::lambda<void(ChannelData*, MsgId)> HistoryDependentItemCallback(
@ -141,21 +145,13 @@ public:
void initTime();
void initMedia(const MTPMessageMedia *media);
void initMediaFromDocument(DocumentData *doc, const QString &caption);
void fromNameUpdated(int32 width) const;
int32 plainMaxWidth() const;
QRect countGeometry() const;
bool drawBubble() const;
bool hasBubble() const override {
return drawBubble();
}
bool hasFromName() const;
bool displayFromName() const {
if (!hasFromName()) return false;
if (isAttachedToPrevious()) return false;
return true;
}
bool hasFastReply() const;
bool displayFastReply() const;
bool displayForwardedFrom() const;
@ -168,18 +164,13 @@ public:
void drawInfo(Painter &p, int32 right, int32 bottom, int32 width, bool selected, InfoDisplayType type) const override;
void drawRightAction(Painter &p, int left, int top, int outerWidth) const override;
void setViewsCount(int32 count) override;
void setId(MsgId newId) override;
void draw(Painter &p, QRect clip, TextSelection selection, TimeMs ms) const override;
void setRealId(MsgId newId) override;
ClickHandlerPtr rightActionLink() const override;
void dependencyItemRemoved(HistoryItem *dependency) override;
bool hasPoint(QPoint point) const override;
bool pointInTime(int right, int bottom, QPoint point, InfoDisplayType type) const override;
HistoryTextState getState(QPoint point, HistoryStateRequest request) const override;
void updatePressed(QPoint point) override;
TextSelection adjustSelection(TextSelection selection, TextSelectType type) const override;
QString notificationHeader() const override;
@ -223,11 +214,6 @@ public:
return this;
}
// hasFromPhoto() returns true even if we don't display the photo
// but we need to skip a place at the left side for this photo
bool displayFromPhoto() const;
bool hasFromPhoto() const;
std::unique_ptr<HistoryView::Element> createView(
not_null<Window::Controller*> controller,
HistoryView::Context context) override;
@ -300,49 +286,19 @@ private:
friend class HistoryItemInstantiated<HistoryMessage>;
void setEmptyText();
bool hasAdminBadge() const {
return _flags & MTPDmessage_ClientFlag::f_has_admin_badge;
}
// For an invoice button we replace the button text with a "Receipt" key.
// It should show the receipt for the payed invoice. Still let mobile apps do that.
void replaceBuyWithReceiptInMarkup();
void initDimensions() override;
int resizeContentGetHeight() override;
int performResizeGetHeight();
void applyEditionToEmpty();
QDateTime displayedEditDate(bool hasViaBotOrInlineMarkup) const;
const HistoryMessageEdited *displayedEditBadge() const;
HistoryMessageEdited *displayedEditBadge();
void paintFromName(Painter &p, QRect &trect, bool selected) const;
void paintForwardedInfo(Painter &p, QRect &trect, bool selected) const;
void paintReplyInfo(Painter &p, QRect &trect, bool selected) const;
// this method draws "via @bot" if it is not painted in forwarded info or in from name
void paintViaBotIdInfo(Painter &p, QRect &trect, bool selected) const;
void paintText(Painter &p, QRect &trect, TextSelection selection) const;
bool getStateFromName(
QPoint point,
QRect &trect,
not_null<HistoryTextState*> outResult) const;
bool getStateForwardedInfo(
QPoint point,
QRect &trect,
not_null<HistoryTextState*> outResult,
HistoryStateRequest request) const;
bool getStateReplyInfo(
QPoint point,
QRect &trect,
not_null<HistoryTextState*> outResult) const;
bool getStateViaBotIdInfo(
QPoint point,
QRect &trect,
not_null<HistoryTextState*> outResult) const;
bool getStateText(
QPoint point,
QRect &trect,
not_null<HistoryTextState*> outResult,
HistoryStateRequest request) const;
void setMedia(const MTPMessageMedia *media);
void setReplyMarkup(const MTPReplyMarkup *markup);
@ -353,7 +309,6 @@ private:
void createComponentsHelper(MTPDmessage::Flags flags, MsgId replyTo, UserId viaBotId, const QString &postAuthor, const MTPReplyMarkup &markup);
void createComponents(const CreateConfig &config);
void updateMediaInBubbleState();
void updateAdminBadgeState();
ClickHandlerPtr fastReplyLink() const;
@ -364,4 +319,7 @@ private:
mutable ClickHandlerPtr _fastReplyLink;
mutable int32 _fromNameVersion = 0;
friend class HistoryView::Element;
friend class HistoryView::Message;
};

150
Telegram/SourceFiles/history/history_service.cpp
View File

@ -9,14 +9,16 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "lang/lang_keys.h"
#include "mainwidget.h"
#include "auth_session.h"
#include "apiwrap.h"
#include "layout.h"
#include "history/history.h"
#include "history/history_media_types.h"
#include "history/history_message.h"
#include "history/history_item_components.h"
#include "history/view/history_view_service_message.h"
#include "data/data_feed.h"
#include "auth_session.h"
#include "data/data_session.h"
#include "window/notifications_manager.h"
#include "window/window_controller.h"
#include "storage/storage_shared_media.h"
@ -442,14 +444,6 @@ HistoryService::HistoryService(not_null<History*> history, MsgId msgId, QDateTim
}
}
void HistoryService::initDimensions() {
_maxw = _text.maxWidth() + st::msgServicePadding.left() + st::msgServicePadding.right();
_minh = _text.minHeight();
if (_media) {
_media->initDimensions();
}
}
bool HistoryService::updateDependencyItem() {
if (GetDependentData()) {
return updateDependent(true);
@ -457,14 +451,6 @@ bool HistoryService::updateDependencyItem() {
return HistoryItem::updateDependencyItem();
}
QRect HistoryService::countGeometry() const {
auto result = QRect(0, 0, width(), _height);
if (Adaptive::ChatWide()) {
result.setWidth(qMin(result.width(), st::msgMaxWidth + 2 * st::msgPhotoSkip + 2 * st::msgMargin.left()));
}
return result.marginsRemoved(st::msgServiceMargin);
}
TextWithEntities HistoryService::selectedText(TextSelection selection) const {
return _text.originalTextWithEntities((selection == FullSelection) ? AllTextSelection : selection);
}
@ -494,77 +480,10 @@ void HistoryService::setServiceText(const PreparedText &prepared) {
// Link indices start with 1.
_text.setLink(++linkIndex, link);
}
setPendingInitDimensions();
_textWidth = -1;
_textHeight = 0;
}
void HistoryService::draw(Painter &p, QRect clip, TextSelection selection, TimeMs ms) const {
auto height = _height - st::msgServiceMargin.top() - st::msgServiceMargin.bottom();
auto dateh = 0;
auto unreadbarh = 0;
if (auto date = Get<HistoryMessageDate>()) {
dateh = date->height();
p.translate(0, dateh);
clip.translate(0, -dateh);
height -= dateh;
}
if (auto unreadbar = Get<HistoryMessageUnreadBar>()) {
unreadbarh = unreadbar->height();
if (clip.intersects(QRect(0, 0, width(), unreadbarh))) {
unreadbar->paint(p, 0, width());
}
p.translate(0, unreadbarh);
clip.translate(0, -unreadbarh);
height -= unreadbarh;
}
HistoryView::PaintContext context(ms, clip, selection);
HistoryView::ServiceMessagePainter::paint(p, this, context, height);
if (auto skiph = dateh + unreadbarh) {
p.translate(0, -skiph);
}
}
int HistoryService::resizeContentGetHeight() {
_height = displayedDateHeight();
if (auto unreadbar = Get<HistoryMessageUnreadBar>()) {
_height += unreadbar->height();
}
if (_text.isEmpty()) {
_textHeight = 0;
} else {
auto contentWidth = width();
if (Adaptive::ChatWide()) {
accumulate_min(contentWidth, st::msgMaxWidth + 2 * st::msgPhotoSkip + 2 * st::msgMargin.left());
}
contentWidth -= st::msgServiceMargin.left() + st::msgServiceMargin.left(); // two small margins
if (contentWidth < st::msgServicePadding.left() + st::msgServicePadding.right() + 1) {
contentWidth = st::msgServicePadding.left() + st::msgServicePadding.right() + 1;
}
auto nwidth = qMax(contentWidth - st::msgServicePadding.left() - st::msgServicePadding.right(), 0);
if (nwidth != _textWidth) {
_textWidth = nwidth;
_textHeight = _text.countHeight(nwidth);
}
if (contentWidth >= _maxw) {
_height += _minh;
} else {
_height += _textHeight;
}
_height += st::msgServicePadding.top() + st::msgServicePadding.bottom() + st::msgServiceMargin.top() + st::msgServiceMargin.bottom();
if (_media) {
_height += st::msgServiceMargin.top() + _media->resizeGetHeight(_media->width());
}
}
return _height;
}
void HistoryService::markMediaAsReadHook() {
if (auto selfdestruct = Get<HistoryServiceSelfDestruct>()) {
if (!selfdestruct->destructAt) {
@ -594,68 +513,6 @@ TimeMs HistoryService::getSelfDestructIn(TimeMs now) {
return 0;
}
bool HistoryService::hasPoint(QPoint point) const {
auto g = countGeometry();
if (g.width() < 1) {
return false;
}
if (auto dateh = displayedDateHeight()) {
g.setTop(g.top() + dateh);
}
if (auto unreadbar = Get<HistoryMessageUnreadBar>()) {
g.setTop(g.top() + unreadbar->height());
}
if (_media) {
g.setHeight(g.height() - (st::msgServiceMargin.top() + _media->height()));
}
return g.contains(point);
}
HistoryTextState HistoryService::getState(QPoint point, HistoryStateRequest request) const {
auto result = HistoryTextState(this);
auto g = countGeometry();
if (g.width() < 1) {
return result;
}
if (auto dateh = displayedDateHeight()) {
point.setY(point.y() - dateh);
g.setHeight(g.height() - dateh);
}
if (auto unreadbar = Get<HistoryMessageUnreadBar>()) {
auto unreadbarh = unreadbar->height();
point.setY(point.y() - unreadbarh);
g.setHeight(g.height() - unreadbarh);
}
if (_media) {
g.setHeight(g.height() - (st::msgServiceMargin.top() + _media->height()));
}
auto trect = g.marginsAdded(-st::msgServicePadding);
if (trect.contains(point)) {
auto textRequest = request.forText();
textRequest.align = style::al_center;
result = HistoryTextState(this, _text.getState(
point - trect.topLeft(),
trect.width(),
textRequest));
if (auto gamescore = Get<HistoryServiceGameScore>()) {
if (!result.link && result.cursor == HistoryInTextCursorState && g.contains(point)) {
result.link = gamescore->lnk;
}
} else if (auto payment = Get<HistoryServicePayment>()) {
if (!result.link && result.cursor == HistoryInTextCursorState && g.contains(point)) {
result.link = payment->lnk;
}
}
} else if (_media) {
result = _media->getState(point - QPoint(st::msgServiceMargin.left() + (g.width() - _media->maxWidth()) / 2, st::msgServiceMargin.top() + g.height() + st::msgServiceMargin.top()), request);
}
return result;
}
void HistoryService::createFromMtp(const MTPDmessage &message) {
auto mediaType = message.vmedia.type();
switch (mediaType) {
@ -770,6 +627,7 @@ void HistoryService::updateDependentText() {
}
setServiceText(text);
Auth().data().requestItemViewResize(this);
if (history()->textCachedFor == this) {
history()->textCachedFor = nullptr;
}

15
Telegram/SourceFiles/history/history_service.h
View File

@ -9,6 +9,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "history/history_item.h"
namespace HistoryView {
class Service;
} // namespace HistoryView
struct HistoryServiceDependentData {
MsgId msgId = 0;
HistoryItem *msg = nullptr;
@ -78,12 +82,6 @@ public:
return true;
}
QRect countGeometry() const;
void draw(Painter &p, QRect clip, TextSelection selection, TimeMs ms) const override;
bool hasPoint(QPoint point) const override;
HistoryTextState getState(QPoint point, HistoryStateRequest request) const override;
[[nodiscard]] TextSelection adjustSelection(
TextSelection selection,
TextSelectType type) const override {
@ -119,9 +117,6 @@ protected:
HistoryService(not_null<History*> history, MsgId msgId, QDateTime date, const PreparedText &message, MTPDmessage::Flags flags = 0, UserId from = 0, PhotoData *photo = 0);
friend class HistoryItemInstantiated<HistoryService>;
void initDimensions() override;
int resizeContentGetHeight() override;
void markMediaAsReadHook() override;
void setServiceText(const PreparedText &prepared);
@ -162,6 +157,8 @@ private:
PreparedText prepareGameScoreText();
PreparedText preparePaymentSentText();
friend class HistoryView::Service;
};
class HistoryJoined : public HistoryService, private HistoryItemInstantiated<HistoryJoined> {

66
Telegram/SourceFiles/history/history_widget.cpp
View File

@ -23,6 +23,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "inline_bots/inline_bot_result.h"
#include "data/data_drafts.h"
#include "data/data_session.h"
#include "history/history.h"
#include "history/history_item.h"
#include "history/history_message.h"
#include "history/history_media_types.h"
#include "history/history_drag_area.h"
@ -628,14 +630,18 @@ HistoryWidget::HistoryWidget(QWidget *parent, not_null<Window::Controller*> cont
}));
subscribe(Auth().data().pendingHistoryResize(), [this] { handlePendingHistoryUpdate(); });
subscribe(Auth().data().queryItemVisibility(), [this](const Data::Session::ItemVisibilityQuery &query) {
if (_a_show.animating() || _history != query.item->history() || !query.item->mainView() || !isVisible()) {
if (_a_show.animating()
|| _history != query.item->history()
|| !query.item->mainView() || !isVisible()) {
return;
}
auto top = _list->itemTop(query.item);
if (top >= 0) {
auto scrollTop = _scroll->scrollTop();
if (top + query.item->height() > scrollTop && top < scrollTop + _scroll->height()) {
*query.isVisible = true;
if (const auto view = query.item->mainView()) {
auto top = _list->itemTop(view);
if (top >= 0) {
auto scrollTop = _scroll->scrollTop();
if (top + view->height() > scrollTop && top < scrollTop + _scroll->height()) {
*query.isVisible = true;
}
}
}
});
@ -684,13 +690,15 @@ void HistoryWidget::scrollToCurrentVoiceMessage(FullMsgId fromId, FullMsgId toId
// And the scrollTop will be reset back to scrollTopItem + scrollTopOffset.
handlePendingHistoryUpdate();
auto toTop = _list->itemTop(to);
if (toTop >= 0 && !isItemCompletelyHidden(from)) {
auto scrollTop = _scroll->scrollTop();
auto scrollBottom = scrollTop + _scroll->height();
auto toBottom = toTop + to->height();
if ((toTop < scrollTop && toBottom < scrollBottom) || (toTop > scrollTop && toBottom > scrollBottom)) {
animatedScrollToItem(to->id);
if (const auto toView = to->mainView()) {
auto toTop = _list->itemTop(toView);
if (toTop >= 0 && !isItemCompletelyHidden(from)) {
auto scrollTop = _scroll->scrollTop();
auto scrollBottom = scrollTop + _scroll->height();
auto toBottom = toTop + toView->height();
if ((toTop < scrollTop && toBottom < scrollBottom) || (toTop > scrollTop && toBottom > scrollBottom)) {
animatedScrollToItem(to->id);
}
}
}
}
@ -867,13 +875,16 @@ void HistoryWidget::clearHighlightMessages() {
}
int HistoryWidget::itemTopForHighlight(not_null<HistoryItem*> item) const {
const auto view = item->mainView();
Assert(view != nullptr);
if (const auto group = item->getFullGroup()) {
item = group->leader;
}
auto itemTop = _list->itemTop(item);
auto itemTop = _list->itemTop(view);
Assert(itemTop >= 0);
auto heightLeft = (_scroll->height() - item->height());
auto heightLeft = (_scroll->height() - view->height());
if (heightLeft <= 0) {
return itemTop;
}
@ -1367,7 +1378,7 @@ void HistoryWidget::notify_migrateUpdated(PeerData *peer) {
if (_peer == peer) {
if (peer->migrateTo()) {
showHistory(peer->migrateTo()->id, (_showAtMsgId > 0) ? (-_showAtMsgId) : _showAtMsgId, true);
} else if ((_migrated ? _migrated->peer : 0) != peer->migrateFrom()) {
} else if ((_migrated ? _migrated->peer.get() : nullptr) != peer->migrateFrom()) {
auto migrated = _history->migrateFrom();
if (_migrated || (migrated && migrated->unreadCount() > 0)) {
showHistory(peer->id, peer->migrateFrom() ? _showAtMsgId : ((_showAtMsgId < 0 && -_showAtMsgId < ServerMaxMsgId) ? ShowAtUnreadMsgId : _showAtMsgId), true);
@ -2537,7 +2548,7 @@ void HistoryWidget::loadMessages() {
MTP_int(maxId),
MTP_int(minId),
MTP_int(historyHash)),
rpcDone(&HistoryWidget::messagesReceived, from->peer),
rpcDone(&HistoryWidget::messagesReceived, from->peer.get()),
rpcFail(&HistoryWidget::messagesFailed));
}
@ -2581,7 +2592,7 @@ void HistoryWidget::loadMessagesDown() {
MTP_int(maxId),
MTP_int(minId),
MTP_int(historyHash)),
rpcDone(&HistoryWidget::messagesReceived, from->peer),
rpcDone(&HistoryWidget::messagesReceived, from->peer.get()),
rpcFail(&HistoryWidget::messagesFailed));
}
@ -2647,12 +2658,16 @@ void HistoryWidget::onScroll() {
}
bool HistoryWidget::isItemCompletelyHidden(HistoryItem *item) const {
const auto view = item ? item->mainView() : nullptr;
if (!view) {
return true;
}
auto top = _list ? _list->itemTop(item) : -2;
if (top < 0) {
return true;
}
auto bottom = top + item->height();
auto bottom = top + view->height();
auto scrollTop = _scroll->scrollTop();
auto scrollBottom = scrollTop + _scroll->height();
return (top >= scrollBottom || bottom <= scrollTop);
@ -3414,7 +3429,11 @@ bool HistoryWidget::insertBotCommand(const QString &cmd) {
auto insertingInlineBot = !cmd.isEmpty() && (cmd.at(0) == '@');
auto toInsert = cmd;
if (!toInsert.isEmpty() && !insertingInlineBot) {
auto bot = _peer->isUser() ? _peer : (App::hoveredLinkItem() ? App::hoveredLinkItem()->data()->fromOriginal() : nullptr);
auto bot = _peer->isUser()
? _peer
: (App::hoveredLinkItem()
? App::hoveredLinkItem()->data()->fromOriginal().get()
: nullptr);
if (bot && (!bot->isUser() || !bot->asUser()->botInfo)) {
bot = nullptr;
}
@ -3940,7 +3959,7 @@ void HistoryWidget::updateFieldPlaceholder() {
auto text = _inlineBot->botInfo->inlinePlaceholder.mid(1);
_field->setPlaceholder([text] { return text; }, _inlineBot->username.size() + 2);
} else {
const auto peer = _history ? _history->peer : nullptr;
const auto peer = _history ? _history->peer.get() : nullptr;
_field->setPlaceholder(langFactory(
(peer && peer->isChannel() && !peer->isMegagroup())
? (peer->notifySilentPosts()
@ -4790,6 +4809,11 @@ void HistoryWidget::updateListSize() {
_updateHistoryGeometryRequired = true;
}
bool HistoryWidget::hasPendingResizedItems() const {
return (_history && _history->hasPendingResizedItems())
|| (_migrated && _migrated->hasPendingResizedItems());
}
int HistoryWidget::unreadBarTop() const {
auto getUnreadBar = [this]() -> HistoryItem* {
if (_migrated && _migrated->unreadBar) {

8
Telegram/SourceFiles/history/history_widget.h
View File

@ -31,6 +31,10 @@ class Widget;
class Result;
} // namespace InlineBots
namespace Data {
struct Draft;
} // namespace Data
namespace Ui {
class AbstractButton;
class InnerDropdown;
@ -664,9 +668,7 @@ private:
void updateListSize();
// Does any of the shown histories has this flag set.
bool hasPendingResizedItems() const {
return (_history && _history->hasPendingResizedItems()) || (_migrated && _migrated->hasPendingResizedItems());
}
bool hasPendingResizedItems() const;
// Counts scrollTop for placing the scroll right at the unread
// messages bar, choosing from _history and _migrated unreadBar.

196
Telegram/SourceFiles/history/view/history_view_element.cpp
View File

@ -9,11 +9,17 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "history/history_item_components.h"
#include "history/history_media.h"
#include "history/history.h"
#include "data/data_session.h"
#include "auth_session.h"
namespace HistoryView {
namespace {
// A new message from the same sender is attached to previous within 15 minutes.
constexpr int kAttachMessageToPreviousSecondsDelta = 900;
} // namespace
Element::Element(not_null<HistoryItem*> data, Context context)
: _data(data)
, _context(context) {
@ -23,6 +29,181 @@ not_null<HistoryItem*> Element::data() const {
return _data;
}
Context Element::context() const {
return _context;
}
int Element::y() const {
return _y;
}
void Element::setY(int y) {
_y = y;
}
int Element::marginTop() const {
const auto item = data();
auto result = 0;
if (!item->isHiddenByGroup()) {
if (isAttachedToPrevious()) {
result += st::msgMarginTopAttached;
} else {
result += st::msgMargin.top();
}
}
result += item->displayedDateHeight();
if (const auto unreadbar = item->Get<HistoryMessageUnreadBar>()) {
result += unreadbar->height();
}
return result;
}
int Element::marginBottom() const {
const auto item = data();
return item->isHiddenByGroup() ? 0 : st::msgMargin.bottom();
}
void Element::setPendingResize() {
_flags |= Flag::NeedsResize;
if (_context == Context::History) {
data()->_history->setHasPendingResizedItems();
}
}
bool Element::pendingResize() const {
return _flags & Flag::NeedsResize;
}
bool Element::isAttachedToPrevious() const {
return _flags & Flag::AttachedToPrevious;
}
bool Element::isAttachedToNext() const {
return _flags & Flag::AttachedToNext;
}
void Element::previousInBlocksChanged() {
recountDisplayDateInBlocks();
recountAttachToPreviousInBlocks();
}
// Called only if there is no more next item! Not always when it changes!
void Element::nextInBlocksChanged() {
setAttachToNext(false);
}
bool Element::computeIsAttachToPrevious(not_null<Element*> previous) {
const auto item = data();
if (!item->Has<HistoryMessageDate>() && !item->Has<HistoryMessageUnreadBar>()) {
const auto prev = previous->data();
const auto possible = !item->isPost() && !prev->isPost()
&& !item->serviceMsg() && !prev->serviceMsg()
&& !item->isEmpty() && !prev->isEmpty()
&& (qAbs(prev->date.secsTo(item->date)) < kAttachMessageToPreviousSecondsDelta);
if (possible) {
if (item->history()->peer->isSelf()) {
return prev->senderOriginal() == item->senderOriginal()
&& (prev->Has<HistoryMessageForwarded>() == item->Has<HistoryMessageForwarded>());
} else {
return prev->from() == item->from();
}
}
}
return false;
}
void Element::recountAttachToPreviousInBlocks() {
auto attachToPrevious = false;
if (const auto previous = previousInBlocks()) {
attachToPrevious = computeIsAttachToPrevious(previous);
previous->setAttachToNext(attachToPrevious);
}
setAttachToPrevious(attachToPrevious);
}
void Element::recountDisplayDateInBlocks() {
setDisplayDate([&] {
const auto item = data();
if (item->isEmpty()) {
return false;
}
if (auto previous = previousInBlocks()) {
const auto prev = previous->data();
return prev->isEmpty() || (prev->date.date() != item->date.date());
}
return true;
}());
}
QSize Element::countOptimalSize() {
return performCountOptimalSize();
}
QSize Element::countCurrentSize(int newWidth) {
if (_flags & Flag::NeedsResize) {
_flags &= ~Flag::NeedsResize;
initDimensions();
}
return performCountCurrentSize(newWidth);
}
void Element::setDisplayDate(bool displayDate) {
const auto item = data();
if (displayDate && !item->Has<HistoryMessageDate>()) {
item->AddComponents(HistoryMessageDate::Bit());
item->Get<HistoryMessageDate>()->init(item->date);
setPendingResize();
} else if (!displayDate && item->Has<HistoryMessageDate>()) {
item->RemoveComponents(HistoryMessageDate::Bit());
setPendingResize();
}
}
void Element::setAttachToNext(bool attachToNext) {
if (attachToNext && !(_flags & Flag::AttachedToNext)) {
_flags |= Flag::AttachedToNext;
Auth().data().requestItemRepaint(data());
} else if (!attachToNext && (_flags & Flag::AttachedToNext)) {
_flags &= ~Flag::AttachedToNext;
Auth().data().requestItemRepaint(data());
}
}
void Element::setAttachToPrevious(bool attachToPrevious) {
if (attachToPrevious && !(_flags & Flag::AttachedToPrevious)) {
_flags |= Flag::AttachedToPrevious;
setPendingResize();
} else if (!attachToPrevious && (_flags & Flag::AttachedToPrevious)) {
_flags &= ~Flag::AttachedToPrevious;
setPendingResize();
}
}
bool Element::displayFromPhoto() const {
return false;
}
bool Element::hasFromPhoto() const {
return false;
}
bool Element::hasFromName() const {
return false;
}
bool Element::displayFromName() const {
return false;
}
HistoryBlock *Element::block() {
return _block;
}
const HistoryBlock *Element::block() const {
return _block;
}
void Element::attachToBlock(not_null<HistoryBlock*> block, int index) {
Expects(!_data->isLogEntry());
Expects(_block == nullptr);
@ -32,7 +213,6 @@ void Element::attachToBlock(not_null<HistoryBlock*> block, int index) {
_block = block;
_indexInBlock = index;
_data->setMainView(this);
_data->setPendingResize();
}
void Element::removeFromBlock() {
@ -41,6 +221,20 @@ void Element::removeFromBlock() {
_block->remove(this);
}
void Element::setIndexInBlock(int index) {
Expects(_block != nullptr);
Expects(index >= 0);
_indexInBlock = index;
}
int Element::indexInBlock() const {
Expects((_indexInBlock >= 0) == (_block != nullptr));
Expects((_block == nullptr) || (_block->messages[_indexInBlock].get() == this));
return _indexInBlock;
}
Element *Element::previousInBlocks() const {
if (_block && _indexInBlock >= 0) {
if (_indexInBlock > 0) {

116
Telegram/SourceFiles/history/view/history_view_element.h
View File

@ -7,9 +7,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/
#pragma once
#include "history/view/history_view_object.h"
#include "base/runtime_composer.h"
#include "base/flags.h"
class HistoryBlock;
class HistoryItem;
struct HistoryTextState;
struct HistoryStateRequest;
namespace HistoryView {
@ -20,44 +25,58 @@ enum class Context : char {
};
class Element
: public RuntimeComposer
: public Object
// , public RuntimeComposer
, public ClickHandlerHost {
public:
Element(not_null<HistoryItem*> data, Context context);
enum class Flag : uchar {
NeedsResize = 0x01,
AttachedToPrevious = 0x02,
AttachedToNext = 0x04,
};
using Flags = base::flags<Flag>;
friend inline constexpr auto is_flag_type(Flag) { return true; }
not_null<HistoryItem*> data() const;
Context context() const;
int y() const {
return _y;
}
void setY(int y) {
_y = y;
}
int y() const;
void setY(int y);
HistoryBlock *block() {
return _block;
}
const HistoryBlock *block() const {
return _block;
}
void attachToBlock(not_null<HistoryBlock*> block, int index);
void removeFromBlock();
void setIndexInBlock(int index) {
Expects(_block != nullptr);
Expects(index >= 0);
int marginTop() const;
int marginBottom() const;
void setPendingResize();
bool pendingResize() const;
_indexInBlock = index;
}
int indexInBlock() const {
Expects((_indexInBlock >= 0) == (_block != nullptr));
Expects((_block == nullptr) || (_block->messages[_indexInBlock].get() == this));
bool isAttachedToPrevious() const;
bool isAttachedToNext() const;
return _indexInBlock;
}
Element *previousInBlocks() const;
Element *nextInBlocks() const;
// For blocks context this should be called only from recountAttachToPreviousInBlocks().
void setAttachToPrevious(bool attachToNext);
// ClickHandlerHost interface
// For blocks context this should be called only from recountAttachToPreviousInBlocks()
// of the next item or when the next item is removed through nextInBlocksChanged() call.
void setAttachToNext(bool attachToNext);
// For blocks context this should be called only from recountDisplayDate().
void setDisplayDate(bool displayDate);
bool computeIsAttachToPrevious(not_null<Element*> previous);
virtual void draw(
Painter &p,
QRect clip,
TextSelection selection,
TimeMs ms) const = 0;
[[nodiscard]] virtual bool hasPoint(QPoint point) const = 0;
[[nodiscard]] virtual HistoryTextState getState(
QPoint point,
HistoryStateRequest request) const = 0;
virtual void updatePressed(QPoint point) = 0;
// ClickHandlerHost interface.
void clickHandlerActiveChanged(
const ClickHandlerPtr &handler,
bool active) override;
@ -65,13 +84,54 @@ public:
const ClickHandlerPtr &handler,
bool pressed) override;
// hasFromPhoto() returns true even if we don't display the photo
// but we need to skip a place at the left side for this photo
virtual bool displayFromPhoto() const;
virtual bool hasFromPhoto() const;
virtual bool hasFromName() const;
virtual bool displayFromName() const;
// Legacy blocks structure.
HistoryBlock *block();
const HistoryBlock *block() const;
void attachToBlock(not_null<HistoryBlock*> block, int index);
void removeFromBlock();
void setIndexInBlock(int index);
int indexInBlock() const;
Element *previousInBlocks() const;
Element *nextInBlocks() const;
void previousInBlocksChanged();
void nextInBlocksChanged();
virtual ~Element();
protected:
void setInitialSize(int maxWidth, int minHeight);
void setCurrentSize(int width, int height);
private:
// This should be called only from previousInBlocksChanged()
// to add required bits to the Composer mask
// after that always use Has<HistoryMessageDate>().
void recountDisplayDateInBlocks();
// This should be called only from previousInBlocksChanged() or when
// HistoryMessageDate or HistoryMessageUnreadBar bit is changed in the Composer mask
// then the result should be cached in a client side flag MTPDmessage_ClientFlag::f_attach_to_previous.
void recountAttachToPreviousInBlocks();
QSize countOptimalSize() final override;
QSize countCurrentSize(int newWidth) final override;
virtual QSize performCountOptimalSize() = 0;
virtual QSize performCountCurrentSize(int newWidth) = 0;
const not_null<HistoryItem*> _data;
int _y = 0;
Context _context;
Flags _flags = Flag::NeedsResize;
HistoryBlock *_block = nullptr;
int _indexInBlock = -1;

81
Telegram/SourceFiles/history/view/history_view_list_widget.cpp
View File

@ -61,21 +61,21 @@ void ListWidget::enumerateItems(Method method) {
ending,
_visibleTop,
[this](auto &elem, int top) {
return this->itemTop(elem) + elem->data()->height() <= top;
return this->itemTop(elem) + elem->height() <= top;
})
: std::upper_bound(
beginning,
ending,
_visibleBottom,
[this](int bottom, auto &elem) {
return this->itemTop(elem) + elem->data()->height() >= bottom;
return this->itemTop(elem) + elem->height() >= bottom;
});
auto wasEnd = (from == ending);
if (wasEnd) {
--from;
}
if (TopToBottom) {
Assert(itemTop(from->get()) + from->get()->data()->height() > _visibleTop);
Assert(itemTop(from->get()) + from->get()->height() > _visibleTop);
} else {
Assert(itemTop(from->get()) < _visibleBottom);
}
@ -83,7 +83,7 @@ void ListWidget::enumerateItems(Method method) {
while (true) {
auto view = from->get();
auto itemtop = itemTop(view);
auto itembottom = itemtop + view->data()->height();
auto itembottom = itemtop + view->height();
// Binary search should've skipped all the items that are above / below the visible area.
if (TopToBottom) {
@ -131,19 +131,19 @@ void ListWidget::enumerateUserpics(Method method) {
auto message = view->data()->toHistoryMessage();
if (!message) return true;
if (lowestAttachedItemTop < 0 && message->isAttachedToNext()) {
lowestAttachedItemTop = itemtop + message->marginTop();
if (lowestAttachedItemTop < 0 && view->isAttachedToNext()) {
lowestAttachedItemTop = itemtop + view->marginTop();
}
// Call method on a userpic for all messages that have it and for those who are not showing it
// because of their attachment to the next message if they are bottom-most visible.
if (message->displayFromPhoto() || (message->hasFromPhoto() && itembottom >= _visibleBottom)) {
if (view->displayFromPhoto() || (view->hasFromPhoto() && itembottom >= _visibleBottom)) {
if (lowestAttachedItemTop < 0) {
lowestAttachedItemTop = itemtop + message->marginTop();
lowestAttachedItemTop = itemtop + view->marginTop();
}
// Attach userpic to the bottom of the visible area with the same margin as the last message.
auto userpicMinBottomSkip = st::historyPaddingBottom + st::msgMargin.bottom();
auto userpicBottom = qMin(itembottom - message->marginBottom(), _visibleBottom - userpicMinBottomSkip);
auto userpicBottom = qMin(itembottom - view->marginBottom(), _visibleBottom - userpicMinBottomSkip);
// Do not let the userpic go above the attached messages pack top line.
userpicBottom = qMax(userpicBottom, lowestAttachedItemTop + st::msgPhotoSize);
@ -156,7 +156,7 @@ void ListWidget::enumerateUserpics(Method method) {
}
// Forget the found top of the pack, search for the next one from scratch.
if (!message->isAttachedToNext()) {
if (!view->isAttachedToNext()) {
lowestAttachedItemTop = -1;
}
@ -175,14 +175,14 @@ void ListWidget::enumerateDates(Method method) {
auto dateCallback = [&](not_null<Element*> view, int itemtop, int itembottom) {
const auto item = view->data();
if (lowestInOneDayItemBottom < 0 && item->isInOneDayWithPrevious()) {
lowestInOneDayItemBottom = itembottom - item->marginBottom();
lowestInOneDayItemBottom = itembottom - view->marginBottom();
}
// Call method on a date for all messages that have it and for those who are not showing it
// because they are in a one day together with the previous message if they are top-most visible.
if (item->displayDate() || (!item->isEmpty() && itemtop <= _visibleTop)) {
if (lowestInOneDayItemBottom < 0) {
lowestInOneDayItemBottom = itembottom - item->marginBottom();
lowestInOneDayItemBottom = itembottom - view->marginBottom();
}
// Attach date to the top of the visible area with the same margin as it has in service message.
auto dateTop = qMax(itemtop, _visibleTop) + st::msgServiceMargin.top();
@ -231,7 +231,7 @@ ListWidget::ListWidget(
if (const auto view = viewForItem(query.item)) {
const auto top = itemTop(view);
if (top >= 0
&& top + query.item->height() > _visibleTop
&& top + view->height() > _visibleTop
&& top < _visibleBottom) {
*query.isVisible = true;
}
@ -517,16 +517,16 @@ void ListWidget::itemsAdded(Direction direction, int addedCount) {
: (addedCount + 1);
for (auto i = checkFrom; i != checkTo; ++i) {
if (i > 0) {
const auto item = _items[i - 1]->data();
const auto view = _items[i - 1].get();
if (i < _items.size()) {
// #TODO feeds show
auto previous = _items[i]->data();
item->setLogEntryDisplayDate(item->date.date() != previous->date.date());
auto attachToPrevious = item->computeIsAttachToPrevious(previous);
item->setLogEntryAttachToPrevious(attachToPrevious);
previous->setLogEntryAttachToNext(attachToPrevious);
auto previous = _items[i].get();
view->setDisplayDate(view->data()->date.date() != previous->data()->date.date());
auto attachToPrevious = view->computeIsAttachToPrevious(previous);
view->setAttachToPrevious(attachToPrevious);
previous->setAttachToNext(attachToPrevious);
} else {
item->setLogEntryDisplayDate(true);
view->setDisplayDate(true);
}
}
}
@ -543,9 +543,9 @@ int ListWidget::resizeGetHeight(int newWidth) {
update();
auto newHeight = 0;
for (auto &item : _items) {
item->setY(newHeight);
newHeight += item->data()->resizeGetHeight(newWidth);
for (auto &view : _items) {
view->setY(newHeight);
newHeight += view->resizeGetHeight(newWidth);
}
_itemsHeight = newHeight;
_itemsTop = (_minHeight > _itemsHeight + st::historyPaddingBottom) ? (_minHeight - _itemsHeight - st::historyPaddingBottom) : 0;
@ -570,7 +570,7 @@ void ListWidget::paintEvent(QPaintEvent *e) {
auto clip = e->rect();
auto from = std::lower_bound(begin(_items), end(_items), clip.top(), [this](auto &elem, int top) {
return this->itemTop(elem) + elem->data()->height() <= top;
return this->itemTop(elem) + elem->height() <= top;
});
auto to = std::lower_bound(begin(_items), end(_items), clip.top() + clip.height(), [this](auto &elem, int bottom) {
return this->itemTop(elem) < bottom;
@ -579,9 +579,12 @@ void ListWidget::paintEvent(QPaintEvent *e) {
auto top = itemTop(from->get());
p.translate(0, top);
for (auto i = from; i != to; ++i) {
auto selection = (*i == _selectedItem) ? _selectedText : TextSelection();
(*i)->data()->draw(p, clip.translated(0, -top), selection, ms);
auto height = (*i)->data()->height();
const auto view = *i;
const auto selection = (view == _selectedItem)
? _selectedText
: TextSelection();
view->draw(p, clip.translated(0, -top), selection, ms);
const auto height = view->height();
top += height;
p.translate(0, height);
}
@ -602,7 +605,7 @@ void ListWidget::paintEvent(QPaintEvent *e) {
p,
st::historyPhotoLeft,
userpicTop,
message->width(),
view->width(),
st::msgPhotoSize);
}
return true;
@ -636,7 +639,7 @@ void ListWidget::paintEvent(QPaintEvent *e) {
if (opacity > 0.) {
p.setOpacity(opacity);
int dateY = /*noFloatingDate ? itemtop :*/ (dateTop - st::msgServiceMargin.top());
int width = item->width();
int width = view->width();
if (const auto date = item->Get<HistoryMessageDate>()) {
date->paint(p, dateY, width);
} else {
@ -667,7 +670,7 @@ not_null<Element*> ListWidget::findItemByY(int y) const {
end(_items),
y,
[this](auto &elem, int top) {
return this->itemTop(elem) + elem->data()->height() <= top;
return this->itemTop(elem) + elem->height() <= top;
});
return (i != end(_items)) ? i->get() : _items.back().get();
}
@ -711,7 +714,7 @@ void ListWidget::mouseDoubleClickEvent(QMouseEvent *e) {
if (((_mouseAction == MouseAction::Selecting && _selectedItem != nullptr) || (_mouseAction == MouseAction::None)) && _mouseSelectType == TextSelectType::Letters && _mouseActionItem) {
HistoryStateRequest request;
request.flags |= Text::StateRequest::Flag::LookupSymbol;
auto dragState = _mouseActionItem->data()->getState(_dragStartPosition, request);
auto dragState = _mouseActionItem->getState(_dragStartPosition, request);
if (dragState.cursor == HistoryInTextCursorState) {
_mouseTextSymbol = dragState.symbol;
_mouseSelectType = TextSelectType::Words;
@ -753,7 +756,7 @@ void ListWidget::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
App::mousedItem());
HistoryStateRequest request;
request.flags |= Text::StateRequest::Flag::LookupSymbol;
auto dragState = App::mousedItem()->data()->getState(mousePos, request);
auto dragState = App::mousedItem()->getState(mousePos, request);
if (dragState.cursor == HistoryInTextCursorState && dragState.symbol >= selFrom && dragState.symbol < selTo) {
isUponSelected = 1;
}
@ -1045,7 +1048,7 @@ void ListWidget::mouseActionStart(const QPoint &screenPos, Qt::MouseButton butto
if (_trippleClickTimer.isActive() && (screenPos - _trippleClickPoint).manhattanLength() < QApplication::startDragDistance()) {
HistoryStateRequest request;
request.flags = Text::StateRequest::Flag::LookupSymbol;
dragState = _mouseActionItem->data()->getState(_dragStartPosition, request);
dragState = _mouseActionItem->getState(_dragStartPosition, request);
if (dragState.cursor == HistoryInTextCursorState) {
auto selection = TextSelection { dragState.symbol, dragState.symbol };
repaintItem(std::exchange(_selectedItem, _mouseActionItem));
@ -1059,7 +1062,7 @@ void ListWidget::mouseActionStart(const QPoint &screenPos, Qt::MouseButton butto
} else if (App::pressedItem()) {
HistoryStateRequest request;
request.flags = Text::StateRequest::Flag::LookupSymbol;
dragState = _mouseActionItem->data()->getState(_dragStartPosition, request);
dragState = _mouseActionItem->getState(_dragStartPosition, request);
}
if (_mouseSelectType != TextSelectType::Paragraphs) {
if (App::pressedItem()) {
@ -1157,7 +1160,7 @@ void ListWidget::updateSelected() {
if (view) {
App::mousedItem(view);
itemPoint = mapPointToItem(point, view);
if (item->hasPoint(itemPoint)) {
if (view->hasPoint(itemPoint)) {
if (App::hoveredItem() != view) {
repaintItem(App::hoveredItem());
App::hoveredItem(view);
@ -1187,11 +1190,11 @@ void ListWidget::updateSelected() {
} else {
selectingText = false;
}
dragState = item->getState(itemPoint, request);
dragState = view->getState(itemPoint, request);
lnkhost = view;
if (!dragState.link && itemPoint.x() >= st::historyPhotoLeft && itemPoint.x() < st::historyPhotoLeft + st::msgPhotoSize) {
if (auto message = item->toHistoryMessage()) {
if (message->hasFromPhoto()) {
if (view->hasFromPhoto()) {
enumerateUserpics([&](not_null<Element*> view, int userpicTop) -> bool {
// stop enumeration if the userpic is below our point
if (userpicTop > point.y()) {
@ -1264,7 +1267,7 @@ void ListWidget::updateSelected() {
// Voice message seek support.
if (const auto pressedView = App::pressedLinkItem()) {
auto adjustedPoint = mapPointToItem(point, pressedView);
pressedView->data()->updatePressed(adjustedPoint);
pressedView->updatePressed(adjustedPoint);
}
//if (_mouseAction == MouseAction::Selecting) {
@ -1380,7 +1383,7 @@ void ListWidget::repaintItem(const Element *view) {
if (!view) {
return;
}
update(0, itemTop(view), width(), view->data()->height());
update(0, itemTop(view), width(), view->height());
}
QPoint ListWidget::mapPointToItem(

1169
Telegram/SourceFiles/history/view/history_view_message.cpp
View File

File diff suppressed because it is too large Load Diff

58
Telegram/SourceFiles/history/view/history_view_message.h
View File

@ -17,9 +17,67 @@ class Message : public Element {
public:
Message(not_null<HistoryMessage*> data, Context context);
void draw(
Painter &p,
QRect clip,
TextSelection selection,
TimeMs ms) const override;
bool hasPoint(QPoint point) const override;
HistoryTextState getState(
QPoint point,
HistoryStateRequest request) const override;
void updatePressed(QPoint point) override;
// hasFromPhoto() returns true even if we don't display the photo
// but we need to skip a place at the left side for this photo
bool displayFromPhoto() const override;
bool hasFromPhoto() const override;
bool hasFromName() const override;
bool displayFromName() const override;
private:
not_null<HistoryMessage*> message() const;
void fromNameUpdated(int width) const;
void paintFromName(Painter &p, QRect &trect, bool selected) const;
void paintForwardedInfo(Painter &p, QRect &trect, bool selected) const;
void paintReplyInfo(Painter &p, QRect &trect, bool selected) const;
// this method draws "via @bot" if it is not painted in forwarded info or in from name
void paintViaBotIdInfo(Painter &p, QRect &trect, bool selected) const;
void paintText(Painter &p, QRect &trect, TextSelection selection) const;
bool getStateFromName(
QPoint point,
QRect &trect,
not_null<HistoryTextState*> outResult) const;
bool getStateForwardedInfo(
QPoint point,
QRect &trect,
not_null<HistoryTextState*> outResult,
HistoryStateRequest request) const;
bool getStateReplyInfo(
QPoint point,
QRect &trect,
not_null<HistoryTextState*> outResult) const;
bool getStateViaBotIdInfo(
QPoint point,
QRect &trect,
not_null<HistoryTextState*> outResult) const;
bool getStateText(
QPoint point,
QRect &trect,
not_null<HistoryTextState*> outResult,
HistoryStateRequest request) const;
void updateMediaInBubbleState();
QRect countGeometry() const;
int resizeContentGetHeight(int newWidth);
QSize performCountOptimalSize() override;
QSize performCountCurrentSize(int newWidth) override;
};
} // namespace HistoryView

62
Telegram/SourceFiles/history/view/history_view_object.h Normal file
View File

@ -0,0 +1,62 @@
/*
This file is part of Telegram Desktop,
the official desktop application for the Telegram messaging service.
For license and copyright information please follow this link:
https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/
#pragma once
namespace HistoryView {
class Object {
public:
Object() = default;
Object(const Object &other) = delete;
Object &operator=(const Object &other) = delete;
void initDimensions() {
setOptimalSize(countOptimalSize());
}
int resizeGetHeight(int newWidth) {
setCurrentSize(countCurrentSize(newWidth));
return _height;
}
int maxWidth() const {
return _maxWidth;
}
int minHeight() const {
return _minHeight;
}
int width() const {
return _width;
}
int height() const {
return _height;
}
virtual ~Object() = default;
protected:
void setOptimalSize(QSize size) {
_maxWidth = size.width();
_minHeight = size.height();
}
void setCurrentSize(QSize size) {
_width = size.width();
_height = size.height();
}
private:
virtual QSize countOptimalSize() = 0;
virtual QSize countCurrentSize(int newWidth) = 0;
int _maxWidth = 0;
int _minHeight = 0;
int _width = 0;
int _height = 0;
};
} // namespace HistoryView

289
Telegram/SourceFiles/history/view/history_view_service_message.cpp
View File

@ -7,8 +7,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/
#include "history/view/history_view_service_message.h"
#include "history/history.h"
#include "history/history_service.h"
#include "history/history_media.h"
#include "history/history_item_components.h"
#include "history/view/history_view_cursor_state.h"
#include "data/data_abstract_structure.h"
#include "styles/style_history.h"
#include "mainwidget.h"
@ -171,66 +174,10 @@ void paintPreparedDate(Painter &p, const QString &dateText, int dateTextWidth, i
} // namepsace
Service::Service(not_null<HistoryService*> data, Context context)
: Element(data, context) {
}
not_null<HistoryService*> Service::message() const {
return static_cast<HistoryService*>(data().get());
}
int WideChatWidth() {
return st::msgMaxWidth + 2 * st::msgPhotoSkip + 2 * st::msgMargin.left();
}
void ServiceMessagePainter::paint(
Painter &p,
not_null<const HistoryService*> message,
const PaintContext &context,
int height) {
auto g = message->countGeometry();
if (g.width() < 1) return;
auto fullAnimMs = App::main() ? App::main()->highlightStartTime(message) : 0LL;
if (fullAnimMs > 0 && fullAnimMs <= context.ms) {
auto animms = context.ms - fullAnimMs;
if (animms < st::activeFadeInDuration + st::activeFadeOutDuration) {
auto top = st::msgServiceMargin.top();
auto bottom = st::msgServiceMargin.bottom();
auto fill = qMin(top, bottom);
auto skiptop = top - fill;
auto fillheight = fill + height + fill;
auto dt = (animms > st::activeFadeInDuration) ? (1. - (animms - st::activeFadeInDuration) / float64(st::activeFadeOutDuration)) : (animms / float64(st::activeFadeInDuration));
auto o = p.opacity();
p.setOpacity(o * dt);
p.fillRect(0, skiptop, message->history()->width, fillheight, st::defaultTextPalette.selectOverlay);
p.setOpacity(o);
}
}
p.setTextPalette(st::serviceTextPalette);
if (auto media = message->getMedia()) {
height -= st::msgServiceMargin.top() + media->height();
auto left = st::msgServiceMargin.left() + (g.width() - media->maxWidth()) / 2, top = st::msgServiceMargin.top() + height + st::msgServiceMargin.top();
p.translate(left, top);
media->draw(p, context.clip.translated(-left, -top), message->skipTextSelection(context.selection), context.ms);
p.translate(-left, -top);
}
auto trect = QRect(g.left(), st::msgServiceMargin.top(), g.width(), height).marginsAdded(-st::msgServicePadding);
paintComplexBubble(p, g.left(), g.width(), message->_text, trect);
p.setBrush(Qt::NoBrush);
p.setPen(st::msgServiceFg);
p.setFont(st::msgServiceFont);
message->_text.draw(p, trect.x(), trect.y(), trect.width(), Qt::AlignCenter, 0, -1, context.selection, false);
p.restoreTextPalette();
}
void ServiceMessagePainter::paintDate(Painter &p, const QDateTime &date, int y, int w) {
auto dateText = langDayOfMonthFull(date.date());
auto dateTextWidth = st::msgServiceFont->width(dateText);
@ -344,27 +291,217 @@ void serviceColorsUpdated() {
}
}
void paintBubble(Painter &p, QRect rect, int outerWidth, bool selected, bool outbg, RectPart tailSide) {
auto &bg = selected ? (outbg ? st::msgOutBgSelected : st::msgInBgSelected) : (outbg ? st::msgOutBg : st::msgInBg);
auto &sh = selected ? (outbg ? st::msgOutShadowSelected : st::msgInShadowSelected) : (outbg ? st::msgOutShadow : st::msgInShadow);
auto cors = selected ? (outbg ? MessageOutSelectedCorners : MessageInSelectedCorners) : (outbg ? MessageOutCorners : MessageInCorners);
auto parts = RectPart::FullTop | RectPart::NoTopBottom | RectPart::Bottom;
if (tailSide == RectPart::Right) {
parts |= RectPart::BottomLeft;
p.fillRect(rect.x() + rect.width() - st::historyMessageRadius, rect.y() + rect.height() - st::historyMessageRadius, st::historyMessageRadius, st::historyMessageRadius, bg);
auto &tail = selected ? st::historyBubbleTailOutRightSelected : st::historyBubbleTailOutRight;
tail.paint(p, rect.x() + rect.width(), rect.y() + rect.height() - tail.height(), outerWidth);
p.fillRect(rect.x() + rect.width() - st::historyMessageRadius, rect.y() + rect.height(), st::historyMessageRadius + tail.width(), st::msgShadow, sh);
} else if (tailSide == RectPart::Left) {
parts |= RectPart::BottomRight;
p.fillRect(rect.x(), rect.y() + rect.height() - st::historyMessageRadius, st::historyMessageRadius, st::historyMessageRadius, bg);
auto &tail = selected ? (outbg ? st::historyBubbleTailOutLeftSelected : st::historyBubbleTailInLeftSelected) : (outbg ? st::historyBubbleTailOutLeft : st::historyBubbleTailInLeft);
tail.paint(p, rect.x() - tail.width(), rect.y() + rect.height() - tail.height(), outerWidth);
p.fillRect(rect.x() - tail.width(), rect.y() + rect.height(), st::historyMessageRadius + tail.width(), st::msgShadow, sh);
} else {
parts |= RectPart::FullBottom;
Service::Service(not_null<HistoryService*> data, Context context)
: Element(data, context) {
}
not_null<HistoryService*> Service::message() const {
return static_cast<HistoryService*>(data().get());
}
QRect Service::countGeometry() const {
auto result = QRect(0, 0, width(), height());
if (Adaptive::ChatWide()) {
result.setWidth(qMin(result.width(), st::msgMaxWidth + 2 * st::msgPhotoSkip + 2 * st::msgMargin.left()));
}
App::roundRect(p, rect, bg, cors, &sh, parts);
return result.marginsRemoved(st::msgServiceMargin);
}
QSize Service::performCountCurrentSize(int newWidth) {
const auto item = message();
const auto media = item->getMedia();
auto newHeight = item->displayedDateHeight();
if (auto unreadbar = item->Get<HistoryMessageUnreadBar>()) {
newHeight += unreadbar->height();
}
if (item->_text.isEmpty()) {
item->_textHeight = 0;
} else {
auto contentWidth = newWidth;
if (Adaptive::ChatWide()) {
accumulate_min(contentWidth, st::msgMaxWidth + 2 * st::msgPhotoSkip + 2 * st::msgMargin.left());
}
contentWidth -= st::msgServiceMargin.left() + st::msgServiceMargin.left(); // two small margins
if (contentWidth < st::msgServicePadding.left() + st::msgServicePadding.right() + 1) {
contentWidth = st::msgServicePadding.left() + st::msgServicePadding.right() + 1;
}
auto nwidth = qMax(contentWidth - st::msgServicePadding.left() - st::msgServicePadding.right(), 0);
if (nwidth != item->_textWidth) {
item->_textWidth = nwidth;
item->_textHeight = item->_text.countHeight(nwidth);
}
if (contentWidth >= maxWidth()) {
newHeight += minHeight();
} else {
newHeight += item->_textHeight;
}
newHeight += st::msgServicePadding.top() + st::msgServicePadding.bottom() + st::msgServiceMargin.top() + st::msgServiceMargin.bottom();
if (media) {
newHeight += st::msgServiceMargin.top() + media->resizeGetHeight(media->width());
}
}
return { newWidth, newHeight };
}
QSize Service::performCountOptimalSize() {
const auto item = message();
const auto media = item->getMedia();
auto maxWidth = item->_text.maxWidth() + st::msgServicePadding.left() + st::msgServicePadding.right();
auto minHeight = item->_text.minHeight();
if (media) {
media->initDimensions();
}
return { maxWidth, minHeight };
}
void Service::draw(
Painter &p,
QRect clip,
TextSelection selection,
TimeMs ms) const {
const auto item = message();
auto g = countGeometry();
if (g.width() < 1) {
return;
}
auto height = this->height() - st::msgServiceMargin.top() - st::msgServiceMargin.bottom();
auto dateh = 0;
auto unreadbarh = 0;
if (auto date = item->Get<HistoryMessageDate>()) {
dateh = date->height();
p.translate(0, dateh);
clip.translate(0, -dateh);
height -= dateh;
}
if (auto unreadbar = item->Get<HistoryMessageUnreadBar>()) {
unreadbarh = unreadbar->height();
if (clip.intersects(QRect(0, 0, width(), unreadbarh))) {
unreadbar->paint(p, 0, width());
}
p.translate(0, unreadbarh);
clip.translate(0, -unreadbarh);
height -= unreadbarh;
}
auto fullAnimMs = App::main() ? App::main()->highlightStartTime(item) : 0LL;
if (fullAnimMs > 0 && fullAnimMs <= ms) {
auto animms = ms - fullAnimMs;
if (animms < st::activeFadeInDuration + st::activeFadeOutDuration) {
auto top = st::msgServiceMargin.top();
auto bottom = st::msgServiceMargin.bottom();
auto fill = qMin(top, bottom);
auto skiptop = top - fill;
auto fillheight = fill + height + fill;
auto dt = (animms > st::activeFadeInDuration) ? (1. - (animms - st::activeFadeInDuration) / float64(st::activeFadeOutDuration)) : (animms / float64(st::activeFadeInDuration));
auto o = p.opacity();
p.setOpacity(o * dt);
p.fillRect(0, skiptop, item->history()->width, fillheight, st::defaultTextPalette.selectOverlay);
p.setOpacity(o);
}
}
p.setTextPalette(st::serviceTextPalette);
if (auto media = item->getMedia()) {
height -= st::msgServiceMargin.top() + media->height();
auto left = st::msgServiceMargin.left() + (g.width() - media->maxWidth()) / 2, top = st::msgServiceMargin.top() + height + st::msgServiceMargin.top();
p.translate(left, top);
media->draw(p, clip.translated(-left, -top), item->skipTextSelection(selection), ms);
p.translate(-left, -top);
}
auto trect = QRect(g.left(), st::msgServiceMargin.top(), g.width(), height).marginsAdded(-st::msgServicePadding);
ServiceMessagePainter::paintComplexBubble(p, g.left(), g.width(), item->_text, trect);
p.setBrush(Qt::NoBrush);
p.setPen(st::msgServiceFg);
p.setFont(st::msgServiceFont);
item->_text.draw(p, trect.x(), trect.y(), trect.width(), Qt::AlignCenter, 0, -1, selection, false);
p.restoreTextPalette();
if (auto skiph = dateh + unreadbarh) {
p.translate(0, -skiph);
}
}
bool Service::hasPoint(QPoint point) const {
const auto item = message();
const auto media = item->getMedia();
auto g = countGeometry();
if (g.width() < 1) {
return false;
}
if (auto dateh = item->displayedDateHeight()) {
g.setTop(g.top() + dateh);
}
if (auto unreadbar = item->Get<HistoryMessageUnreadBar>()) {
g.setTop(g.top() + unreadbar->height());
}
if (media) {
g.setHeight(g.height() - (st::msgServiceMargin.top() + media->height()));
}
return g.contains(point);
}
HistoryTextState Service::getState(QPoint point, HistoryStateRequest request) const {
const auto item = message();
const auto media = item->getMedia();
auto result = HistoryTextState(item);
auto g = countGeometry();
if (g.width() < 1) {
return result;
}
if (auto dateh = item->displayedDateHeight()) {
point.setY(point.y() - dateh);
g.setHeight(g.height() - dateh);
}
if (auto unreadbar = item->Get<HistoryMessageUnreadBar>()) {
auto unreadbarh = unreadbar->height();
point.setY(point.y() - unreadbarh);
g.setHeight(g.height() - unreadbarh);
}
if (media) {
g.setHeight(g.height() - (st::msgServiceMargin.top() + media->height()));
}
auto trect = g.marginsAdded(-st::msgServicePadding);
if (trect.contains(point)) {
auto textRequest = request.forText();
textRequest.align = style::al_center;
result = HistoryTextState(item, item->_text.getState(
point - trect.topLeft(),
trect.width(),
textRequest));
if (auto gamescore = item->Get<HistoryServiceGameScore>()) {
if (!result.link && result.cursor == HistoryInTextCursorState && g.contains(point)) {
result.link = gamescore->lnk;
}
} else if (auto payment = item->Get<HistoryServicePayment>()) {
if (!result.link && result.cursor == HistoryInTextCursorState && g.contains(point)) {
result.link = payment->lnk;
}
}
} else if (media) {
result = media->getState(point - QPoint(st::msgServiceMargin.left() + (g.width() - media->maxWidth()) / 2, st::msgServiceMargin.top() + g.height() + st::msgServiceMargin.top()), request);
}
return result;
}
void Service::updatePressed(QPoint point) {
}
} // namespace HistoryView

27
Telegram/SourceFiles/history/view/history_view_service_message.h
View File

@ -17,9 +17,25 @@ class Service : public Element {
public:
Service(not_null<HistoryService*> data, Context context);
void draw(
Painter &p,
QRect clip,
TextSelection selection,
TimeMs ms) const override;
bool hasPoint(QPoint point) const override;
HistoryTextState getState(
QPoint point,
HistoryStateRequest request) const override;
void updatePressed(QPoint point) override;
private:
not_null<HistoryService*> message() const;
QRect countGeometry() const;
QSize performCountOptimalSize() override;
QSize performCountCurrentSize(int newWidth) override;
};
int WideChatWidth();
@ -37,19 +53,14 @@ struct PaintContext {
class ServiceMessagePainter {
public:
static void paint(
Painter &p,
not_null<const HistoryService*> message,
const PaintContext &context,
int height);
static void paintDate(Painter &p, const QDateTime &date, int y, int w);
static void paintDate(Painter &p, const QString &dateText, int dateTextWidth, int y, int w);
static void paintBubble(Painter &p, int x, int y, int w, int h);
private:
static void paintComplexBubble(Painter &p, int left, int width, const Text &text, const QRect &textRect);
private:
static QVector<int> countLineWidths(const Text &text, const QRect &textRect);
};
@ -58,6 +69,4 @@ void paintEmpty(Painter &p, int width, int height);
void serviceColorsUpdated();
void paintBubble(Painter &p, QRect rect, int outerWidth, bool selected, bool outbg, RectPart tailSide);
} // namespace HistoryView

9
Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
View File

@ -9,10 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <rpl/combine.h>
#include <rpl/combine_previous.h>
#include "styles/style_window.h"
#include "styles/style_dialogs.h"
#include "styles/style_history.h"
#include "styles/style_info.h"
#include "history/history.h"
#include "boxes/add_contact_box.h"
#include "boxes/confirm_box.h"
#include "info/info_memento.h"
@ -33,6 +30,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "data/data_peer_values.h"
#include "observer_peer.h"
#include "apiwrap.h"
#include "styles/style_window.h"
#include "styles/style_dialogs.h"
#include "styles/style_history.h"
#include "styles/style_info.h"
namespace HistoryView {

1
Telegram/SourceFiles/info/media/info_media_list_widget.cpp
View File

@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "overview/overview_layout.h"
#include "history/history_media_types.h"
#include "history/history_item.h"
#include "history/history.h"
#include "window/themes/window_theme.h"
#include "window/window_controller.h"
#include "window/window_peer_menu.h"

1
Telegram/SourceFiles/inline_bots/inline_bot_send_data.cpp
View File

@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "inline_bots/inline_bot_result.h"
#include "storage/localstorage.h"
#include "lang/lang_keys.h"
#include "history/history.h"
namespace InlineBots {
namespace internal {

7
Telegram/SourceFiles/mainwidget.cpp
View File

@ -35,6 +35,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "apiwrap.h"
#include "dialogs/dialogs_widget.h"
#include "dialogs/dialogs_key.h"
#include "history/history.h"
#include "history/history_widget.h"
#include "history/history_message.h"
#include "history/history_media.h"
@ -705,7 +706,7 @@ void MainWidget::webPagesOrGamesUpdate() {
auto j = items.constFind(App::webPage(webPageId));
if (j != items.cend()) {
for_const (auto item, j.value()) {
item->setPendingInitDimensions();
Auth().data().requestItemViewResize(item);
}
}
}
@ -717,7 +718,7 @@ void MainWidget::webPagesOrGamesUpdate() {
auto j = items.constFind(App::game(gameId));
if (j != items.cend()) {
for_const (auto item, j.value()) {
item->setPendingInitDimensions();
Auth().data().requestItemViewResize(item);
}
}
}
@ -4909,7 +4910,7 @@ void MainWidget::feedUpdate(const MTPUpdate &update) {
}
App::historyUnregItem(local);
Auth().messageIdChanging.notify({ local, newId }, true);
local->setId(d.vid.v);
local->setRealId(d.vid.v);
App::historyRegItem(local);
Auth().data().requestItemRepaint(local);
}

2
Telegram/SourceFiles/mainwidget.h
View File

@ -27,6 +27,8 @@ struct PeerUpdate;
namespace Dialogs {
struct RowDescriptor;
class Row;
class Key;
class IndexedList;
} // namespace Dialogs
namespace Media {

1
Telegram/SourceFiles/mainwindow.cpp
View File

@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "styles/style_dialogs.h"
#include "styles/style_window.h"
#include "styles/style_boxes.h"
#include "history/history.h"
#include "ui/widgets/popup_menu.h"
#include "ui/widgets/buttons.h"
#include "ui/widgets/shadow.h"

1
Telegram/SourceFiles/media/player/media_player_float.cpp
View File

@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "data/data_document.h"
#include "data/data_session.h"
#include "history/history_media.h"
#include "history/history_item.h"
#include "media/media_clip_reader.h"
#include "media/view/media_clip_playback.h"
#include "media/media_audio.h"

6
Telegram/SourceFiles/media/player/media_player_instance.cpp
View File

@ -13,6 +13,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "messenger.h"
#include "auth_session.h"
#include "calls/calls_instance.h"
#include "history/history.h"
#include "history/history_item.h"
#include "history/history_media.h"
namespace Media {
@ -97,7 +99,9 @@ void Instance::setCurrent(const AudioMsgId &audioId) {
auto history = data->history;
auto migrated = data->migrated;
auto item = data->current ? App::histItemById(data->current.contextId()) : nullptr;
auto item = data->current
? App::histItemById(data->current.contextId())
: nullptr;
if (item) {
data->history = item->history()->migrateToOrMe();
data->migrated = data->history->migrateFrom();

2
Telegram/SourceFiles/media/player/media_player_panel.cpp
View File

@ -10,6 +10,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "media/player/media_player_cover.h"
#include "media/player/media_player_instance.h"
#include "info/media/info_media_list_widget.h"
#include "history/history.h"
#include "history/history_item.h"
#include "history/history_media.h"
#include "data/data_document.h"
#include "ui/widgets/shadow.h"

1
Telegram/SourceFiles/media/view/media_view_group_thumbs.cpp
View File

@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "data/data_user_photos.h"
#include "data/data_photo.h"
#include "data/data_document.h"
#include "history/history.h"
#include "history/history_media.h"
#include "styles/style_mediaview.h"

3
Telegram/SourceFiles/mediaview.cpp
View File

@ -19,6 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "media/view/media_clip_controller.h"
#include "media/view/media_view_group_thumbs.h"
#include "media/media_audio.h"
#include "history/history.h"
#include "history/history_message.h"
#include "history/history_media_types.h"
#include "window/themes/window_theme_preview.h"
@ -915,7 +916,7 @@ void MediaView::clipCallback(Media::Clip::Notification notification) {
}
PeerData *MediaView::ui_getPeerForMouseAction() {
return _history ? _history->peer : nullptr;
return _history ? _history->peer.get() : nullptr;
}
void MediaView::onDownload() {

2
Telegram/SourceFiles/messenger.cpp
View File

@ -14,6 +14,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "storage/localstorage.h"
#include "platform/platform_specific.h"
#include "mainwindow.h"
#include "dialogs/dialogs_entry.h"
#include "history/history.h"
#include "application.h"
#include "shortcuts.h"
#include "auth_session.h"

20
Telegram/SourceFiles/mtproto/type_utils.h
View File

@ -41,20 +41,20 @@ enum class MTPDmessage_ClientFlag : uint32 {
// message is a group migrate (group -> supergroup) service message
f_is_group_migrate = (1U << 29),
// message needs initDimensions() + resize() + paint()
f_pending_init_dimensions = (1U << 28),
//// message needs initDimensions() + resize() + paint()
//f_pending_init_dimensions = (1U << 28),
// message needs resize() + paint()
f_pending_resize = (1U << 27),
//// message needs resize() + paint()
//f_pending_resize = (1U << 27),
// message needs paint()
f_pending_paint = (1U << 26),
//// message needs paint()
//f_pending_paint = (1U << 26),
// message is attached to previous one when displaying the history
f_attach_to_previous = (1U << 25),
//// message is attached to previous one when displaying the history
//f_attach_to_previous = (1U << 25),
// message is attached to next one when displaying the history
f_attach_to_next = (1U << 24),
//// message is attached to next one when displaying the history
//f_attach_to_next = (1U << 24),
// message was sent from inline bot, need to re-set media when sent
f_from_inline_bot = (1U << 23),

1
Telegram/SourceFiles/overview/overview_layout.cpp
View File

@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "data/data_document.h"
#include "data/data_session.h"
#include "data/data_web_page.h"
#include "styles/style_overview.h"
#include "styles/style_history.h"
#include "core/file_utilities.h"

1
Telegram/SourceFiles/overview/overview_layout.h
View File

@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
struct HistoryTextState;
struct HistoryStateRequest;
class HistoryMedia;
namespace style {
struct RoundCheckbox;

1
Telegram/SourceFiles/platform/win/main_window_win.cpp
View File

@ -18,6 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "storage/localstorage.h"
#include "ui/widgets/popup_menu.h"
#include "window/themes/window_theme.h"
#include "history/history.h"
#include <qpa/qplatformnativeinterface.h>

1
Telegram/SourceFiles/platform/win/notifications_manager_win.cpp
View File

@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "platform/win/windows_app_user_model_id.h"
#include "platform/win/windows_event_filter.h"
#include "platform/win/windows_dlls.h"
#include "history/history.h"
#include "mainwindow.h"
#include <Shobjidl.h>

1
Telegram/SourceFiles/profile/profile_channel_controllers.cpp
View File

@ -23,6 +23,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "data/data_session.h"
#include "ui/widgets/popup_menu.h"
#include "window/window_controller.h"
#include "history/history.h"
namespace Profile {
namespace {

1
Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
View File

@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "mainwidget.h"
#include "auth_session.h"
#include "storage/localstorage.h"
#include "history/history.h"
#include "boxes/peer_list_controllers.h"
#include "boxes/confirm_box.h"

1
Telegram/SourceFiles/storage/localstorage.cpp
View File

@ -27,6 +27,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "window/window_controller.h"
#include "base/flags.h"
#include "data/data_session.h"
#include "history/history.h"
#include <openssl/evp.h>

1
Telegram/SourceFiles/ui/images.cpp
View File

@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "platform/platform_specific.h"
#include "auth_session.h"
#include "history/history_item.h"
#include "history/history.h"
namespace Images {
namespace {

25
Telegram/SourceFiles/ui/text/text_entity.h
View File

@ -123,6 +123,31 @@ enum {
TextInstagramHashtags = 0x800,
};
struct TextWithTags {
struct Tag {
int offset, length;
QString id;
};
using Tags = QVector<Tag>;
QString text;
Tags tags;
};
inline bool operator==(const TextWithTags::Tag &a, const TextWithTags::Tag &b) {
return (a.offset == b.offset) && (a.length == b.length) && (a.id == b.id);
}
inline bool operator!=(const TextWithTags::Tag &a, const TextWithTags::Tag &b) {
return !(a == b);
}
inline bool operator==(const TextWithTags &a, const TextWithTags &b) {
return (a.text == b.text) && (a.tags == b.tags);
}
inline bool operator!=(const TextWithTags &a, const TextWithTags &b) {
return !(a == b);
}
// Parsing helpers.
namespace TextUtilities {

1
Telegram/SourceFiles/ui/text_options.cpp
View File

@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/text_options.h"
#include "styles/style_window.h"
#include "history/history.h"
#include "history/history_item.h"
namespace Ui {

1
Telegram/SourceFiles/window/main_window.cpp
View File

@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "storage/localstorage.h"
#include "styles/style_window.h"
#include "platform/platform_window_title.h"
#include "history/history.h"
#include "window/themes/window_theme.h"
#include "window/window_controller.h"
#include "mediaview.h"

5
Telegram/SourceFiles/window/notifications_manager.cpp
View File

@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "window/notifications_manager_default.h"
#include "media/media_audio_track.h"
#include "media/media_audio.h"
#include "history/history.h"
#include "history/history_item_components.h"
#include "lang/lang_keys.h"
#include "mainwindow.h"
@ -56,7 +57,9 @@ void System::createManager() {
void System::schedule(History *history, HistoryItem *item) {
if (App::quitting() || !history->currentNotification() || !AuthSession::Exists()) return;
auto notifyByFrom = (!history->peer->isUser() && item->mentionsMe()) ? item->from() : nullptr;
auto notifyByFrom = (!history->peer->isUser() && item->mentionsMe())
? item->from().get()
: nullptr;
if (item->isSilent()) {
history->popNotification(item);

3
Telegram/SourceFiles/window/notifications_manager_default.cpp
View File

@ -20,6 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "styles/style_window.h"
#include "storage/file_download.h"
#include "auth_session.h"
#include "history/history.h"
#include "history/history_item.h"
#include "platform/platform_specific.h"
@ -69,7 +70,7 @@ Manager::QueuedNotification::QueuedNotification(
, int forwardedCount)
: history(item->history())
, peer(history->peer)
, author((!peer->isUser() && !item->isPost()) ? item->author() : nullptr)
, author((!peer->isUser() && !item->isPost()) ? item->author().get() : nullptr)
, item((forwardedCount < 2) ? item.get() : nullptr)
, forwardedCount(forwardedCount) {
}

1
Telegram/SourceFiles/window/window_controller.cpp
View File

@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "history/view/history_view_element.h"
#include "history/view/history_view_message.h"
#include "history/view/history_view_service_message.h"
#include "history/history.h"
#include "history/history_item.h"
#include "mainwidget.h"
#include "mainwindow.h"

1
Telegram/SourceFiles/window/window_peer_menu.cpp
View File

@ -23,6 +23,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "mainwindow.h"
#include "observer_peer.h"
#include "styles/style_boxes.h"
#include "history/history.h"
#include "window/window_controller.h"
#include "data/data_session.h"
#include "data/data_feed.h"

1
Telegram/gyp/telegram_sources.txt
View File

@ -233,6 +233,7 @@
<(src_loc)/history/view/history_view_list_widget.h
<(src_loc)/history/view/history_view_message.cpp
<(src_loc)/history/view/history_view_message.h
<(src_loc)/history/view/history_view_object.h
<(src_loc)/history/view/history_view_service_message.cpp
<(src_loc)/history/view/history_view_service_message.h
<(src_loc)/history/view/history_view_top_bar_widget.cpp