Move HistoryMessageDate to view elements.

Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp

@@ -166,13 +166,13 @@ 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()) {
+		if (lowestInOneDayItemBottom < 0 && view->isInOneDayWithPrevious()) {
 			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 (view->displayDate() || (!item->isEmpty() && itemtop <= _visibleTop)) {
 			if (lowestInOneDayItemBottom < 0) {
 				lowestInOneDayItemBottom = itembottom - view->marginBottom();
 			}
@@ -191,7 +191,7 @@ void InnerWidget::enumerateDates(Method method) {
 		}
 
 		// Forget the found bottom of the pack, search for the next one from scratch.
-		if (!item->isInOneDayWithPrevious()) {
+		if (!view->isInOneDayWithPrevious()) {
 			lowestInOneDayItemBottom = -1;
 		}
 
@@ -762,8 +762,7 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 					return false;
 				}
 
-				const auto item = view->data();
+				const auto displayDate = view->displayDate();
-				const auto displayDate = item->displayDate();
 				auto dateInPlace = displayDate;
 				if (dateInPlace) {
 					const auto correctDateTop = itemtop + st::msgServiceMargin.top();
@@ -781,14 +780,14 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 					auto opacity = (dateInPlace/* || noFloatingDate*/) ? 1. : scrollDateOpacity;
 					if (opacity > 0.) {
 						p.setOpacity(opacity);
-						int dateY = /*noFloatingDate ? itemtop :*/ (dateTop - st::msgServiceMargin.top());
+						const auto dateY = /*noFloatingDate ? itemtop :*/ (dateTop - st::msgServiceMargin.top());
-						int width = view->width();
+						const auto width = view->width();
-						if (auto date = item->Get<HistoryMessageDate>()) {
+						if (const auto date = view->Get<HistoryView::DateBadge>()) {
 							date->paint(p, dateY, width);
 						} else {
 							HistoryView::ServiceMessagePainter::paintDate(
 								p,
-								item->date,
+								view->data()->date,
 								dateY,
 								width);
 						}

Telegram/SourceFiles/history/history_inner_widget.cpp

@@ -372,13 +372,13 @@ 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()) {
+		if (lowestInOneDayItemBottom < 0 && view->isInOneDayWithPrevious()) {
 			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 <= _visibleAreaTop)) {
+		if (view->displayDate() || (!item->isEmpty() && itemtop <= _visibleAreaTop)) {
 			// skip the date of history migrate item if it will be in migrated
 			if (itemtop < drawtop && item->history() == _history) {
 				if (itemtop > _visibleAreaTop) {
@@ -409,7 +409,7 @@ void HistoryInner::enumerateDates(Method method) {
 		}
 
 		// Forget the found bottom of the pack, search for the next one from scratch.
-		if (!item->isInOneDayWithPrevious()) {
+		if (!view->isInOneDayWithPrevious()) {
 			lowestInOneDayItemBottom = -1;
 		}
 
@@ -652,8 +652,7 @@ void HistoryInner::paintEvent(QPaintEvent *e) {
 					return false;
 				}
 
-				const auto item = view->data();
+				const auto displayDate = view->displayDate();
-				const auto displayDate = item->displayDate();
 				auto dateInPlace = displayDate;
 				if (dateInPlace) {
 					const auto correctDateTop = itemtop + st::msgServiceMargin.top();
@@ -674,12 +673,12 @@ void HistoryInner::paintEvent(QPaintEvent *e) {
 						const auto dateY = false // noFloatingDate
 							? itemtop
 							: (dateTop - st::msgServiceMargin.top());
-						if (const auto date = item->Get<HistoryMessageDate>()) {
+						if (const auto date = view->Get<HistoryView::DateBadge>()) {
 							date->paint(p, dateY, _contentWidth);
 						} else {
 							HistoryView::ServiceMessagePainter::paintDate(
 								p,
-								item->date,
+								view->data()->date,
 								dateY,
 								_contentWidth);
 						}
@@ -1859,7 +1858,7 @@ void HistoryInner::recountHistoryGeometry() {
 				if (_migrated->blocks.back()->messages.back()->data()->isGroupMigrate() && _history->blocks.front()->messages.front()->data()->isGroupMigrate()) {
 					_historySkipHeight += _history->blocks.front()->messages.front()->height();
 				} else {
-					_historySkipHeight += _history->blocks.front()->messages.front()->data()->displayedDateHeight();
+					_historySkipHeight += _history->blocks.front()->messages.front()->displayedDateHeight();
 				}
 			}
 		}
@@ -2332,8 +2331,7 @@ void HistoryInner::onUpdateSelected() {
 				return false;
 			}
 
-			const auto item = view->data();
+			const auto displayDate = view->displayDate();
-			const auto displayDate = item->displayDate();
 			auto dateInPlace = displayDate;
 			if (dateInPlace) {
 				const auto correctDateTop = itemtop + st::msgServiceMargin.top();
@@ -2344,9 +2342,10 @@ void HistoryInner::onUpdateSelected() {
 			if (dateTop <= point.y()) {
 				auto opacity = (dateInPlace/* || noFloatingDate*/) ? 1. : scrollDateOpacity;
 				if (opacity > 0.) {
+					const auto item = view->data();
 					auto dateWidth = 0;
-					if (auto date = item->Get<HistoryMessageDate>()) {
+					if (const auto date = view->Get<HistoryView::DateBadge>()) {
-						dateWidth = date->_width;
+						dateWidth = date->width;
 					} else {
 						dateWidth = st::msgServiceFont->width(langDayOfMonthFull(item->date.date()));
 					}

Telegram/SourceFiles/history/history_item.cpp

@@ -581,17 +581,6 @@ MessageGroupId HistoryItem::groupId() const {
 	return _groupId;
 }
 
-int HistoryItem::displayedDateHeight() const {
-	if (auto date = Get<HistoryMessageDate>()) {
-		return date->height();
-	}
-	return 0;
-}
-
-bool HistoryItem::displayDate() const {
-	return Has<HistoryMessageDate>();
-}
-
 bool HistoryItem::isEmpty() const {
 	return _text.isEmpty()
 		&& !_media

Telegram/SourceFiles/history/history_item.h

@@ -244,13 +244,6 @@ public:
 	QString authorOriginal() const;
 	MsgId idOriginal() const;
 
-	int displayedDateHeight() const;
-	bool displayDate() const;
-
-	bool isInOneDayWithPrevious() const {
-		return !isEmpty() && !displayDate();
-	}
-
 	bool isEmpty() const;
 
 	MessageGroupId groupId() const;

Telegram/SourceFiles/history/history_item_components.cpp

@@ -798,19 +798,6 @@ void HistoryMessageReplyMarkup::create(
 	}
 }
 
-void HistoryMessageDate::init(const QDateTime &date) {
-	_text = langDayOfMonthFull(date.date());
-	_width = st::msgServiceFont->width(_text);
-}
-
-int HistoryMessageDate::height() const {
-	return st::msgServiceMargin.top() + st::msgServicePadding.top() + st::msgServiceFont->height + st::msgServicePadding.bottom() + st::msgServiceMargin.bottom();
-}
-
-void HistoryMessageDate::paint(Painter &p, int y, int w) const {
-	HistoryView::ServiceMessagePainter::paintDate(p, _text, _width, y, w);
-}
-
 HistoryMessageLogEntryOriginal::HistoryMessageLogEntryOriginal() = default;
 
 HistoryMessageLogEntryOriginal::HistoryMessageLogEntryOriginal(

Telegram/SourceFiles/history/history_item_components.h

@@ -323,18 +323,6 @@ private:
 
 };
 
-// Any HistoryItem can have this Component for
-// displaying the day mark above the message.
-struct HistoryMessageDate : public RuntimeComponent<HistoryMessageDate, HistoryItem> {
-	void init(const QDateTime &date);
-
-	int height() const;
-	void paint(Painter &p, int y, int w) const;
-
-	QString _text;
-	int _width = 0;
-};
-
 // Special type of Component for the channel actions log.
 struct HistoryMessageLogEntryOriginal
 	: public RuntimeComponent<HistoryMessageLogEntryOriginal, HistoryItem> {

Telegram/SourceFiles/history/history_widget.cpp

@@ -4857,8 +4857,8 @@ base::optional<int> HistoryWidget::unreadBarTop() const {
 	if (const auto bar = getUnreadBar()) {
 		const auto result = _list->itemTop(bar)
 			+ HistoryView::UnreadBar::marginTop();
-		if (bar->data()->Has<HistoryMessageDate>()) {
+		if (bar->Has<HistoryView::DateBadge>()) {
-			return result + bar->data()->Get<HistoryMessageDate>()->height();
+			return result + bar->Get<HistoryView::DateBadge>()->height();
 		}
 		return result;
 	}

Telegram/SourceFiles/history/view/history_view_element.cpp

@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "history/view/history_view_element.h"
 
+#include "history/view/history_view_service_message.h"
 #include "history/history_item_components.h"
 #include "history/history_item.h"
 #include "history/history_media.h"
@@ -110,6 +111,24 @@ void UnreadBar::paint(Painter &p, int y, int w) const {
 		text);
 }
 
+
+void DateBadge::init(const QDateTime &date) {
+	text = langDayOfMonthFull(date.date());
+	width = st::msgServiceFont->width(text);
+}
+
+int DateBadge::height() const {
+	return st::msgServiceMargin.top()
+		+ st::msgServicePadding.top()
+		+ st::msgServiceFont->height
+		+ st::msgServicePadding.bottom()
+		+ st::msgServiceMargin.bottom();
+}
+
+void DateBadge::paint(Painter &p, int y, int w) const {
+	ServiceMessagePainter::paintDate(p, text, width, y, w);
+}
+
 Element::Element(
 	not_null<ElementDelegate*> delegate,
 	not_null<HistoryItem*> data)
@@ -154,7 +173,7 @@ int Element::marginTop() const {
 			result += st::msgMargin.top();
 		}
 	}
-	result += item->displayedDateHeight();
+	result += displayedDateHeight();
 	if (const auto bar = Get<UnreadBar>()) {
 		result += bar->height();
 	}
@@ -254,7 +273,7 @@ void Element::refreshDataId() {
 
 bool Element::computeIsAttachToPrevious(not_null<Element*> previous) {
 	const auto item = data();
-	if (!item->Has<HistoryMessageDate>() && !Has<UnreadBar>()) {
+	if (!Has<DateBadge>() && !Has<UnreadBar>()) {
 		const auto prev = previous->data();
 		const auto possible = !item->serviceMsg() && !prev->serviceMsg()
 			&& !item->isEmpty() && !prev->isEmpty()
@@ -309,6 +328,21 @@ void Element::setUnreadBarFreezed() {
 	}
 }
 
+int Element::displayedDateHeight() const {
+	if (auto date = Get<DateBadge>()) {
+		return date->height();
+	}
+	return 0;
+}
+
+bool Element::displayDate() const {
+	return Has<DateBadge>();
+}
+
+bool Element::isInOneDayWithPrevious() const {
+	return !data()->isEmpty() && !displayDate();
+}
+
 void Element::recountAttachToPreviousInBlocks() {
 	auto attachToPrevious = false;
 	if (const auto previous = previousInBlocks()) {
@@ -347,12 +381,12 @@ QSize Element::countCurrentSize(int newWidth) {
 
 void Element::setDisplayDate(bool displayDate) {
 	const auto item = data();
-	if (displayDate && !item->Has<HistoryMessageDate>()) {
+	if (displayDate && !Has<DateBadge>()) {
-		item->AddComponents(HistoryMessageDate::Bit());
+		AddComponents(DateBadge::Bit());
-		item->Get<HistoryMessageDate>()->init(item->date);
+		Get<DateBadge>()->init(item->date);
 		setPendingResize();
-	} else if (!displayDate && item->Has<HistoryMessageDate>()) {
+	} else if (!displayDate && Has<DateBadge>()) {
-		item->RemoveComponents(HistoryMessageDate::Bit());
+		RemoveComponents(DateBadge::Bit());
 		setPendingResize();
 	}
 }

Telegram/SourceFiles/history/view/history_view_element.h

@@ -78,6 +78,19 @@ struct UnreadBar : public RuntimeComponent<UnreadBar, Element> {
 
 };
 
+// Any HistoryView::Element can have this Component for
+// displaying the day mark above the message.
+struct DateBadge : public RuntimeComponent<DateBadge, Element> {
+	void init(const QDateTime &date);
+
+	int height() const;
+	void paint(Painter &p, int y, int w) const;
+
+	QString text;
+	int width = 0;
+
+};
+
 class Element
 	: public Object
 	, public RuntimeComposer<Element>
@@ -143,6 +156,10 @@ public:
 	// when the new messages arrive in this chat history
 	void setUnreadBarFreezed();
 
+	int displayedDateHeight() const;
+	bool displayDate() const;
+	bool isInOneDayWithPrevious() const;
+
 	virtual void draw(
 		Painter &p,
 		QRect clip,
@@ -224,12 +241,13 @@ protected:
 private:
 	// This should be called only from previousInBlocksChanged()
 	// to add required bits to the Composer mask
-	// after that always use Has<HistoryMessageDate>().
+	// after that always use Has<DateBadge>().
 	void recountDisplayDateInBlocks();
 
 	// This should be called only from previousInBlocksChanged() or when
-	// HistoryMessageDate or UnreadBar bit is changed in the Composer mask
+	// DateBadge or UnreadBar bit is changed in the Composer mask
-	// then the result should be cached in a client side flag MTPDmessage_ClientFlag::f_attach_to_previous.
+	// then the result should be cached in a client side flag
+	// MTPDmessage_ClientFlag::f_attach_to_previous.
 	void recountAttachToPreviousInBlocks();
 
 	QSize countOptimalSize() final override;

Telegram/SourceFiles/history/view/history_view_list_widget.cpp

@@ -176,13 +176,13 @@ 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()) {
+		if (lowestInOneDayItemBottom < 0 && view->isInOneDayWithPrevious()) {
 			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 (view->displayDate() || (!item->isEmpty() && itemtop <= _visibleTop)) {
 			if (lowestInOneDayItemBottom < 0) {
 				lowestInOneDayItemBottom = itembottom - view->marginBottom();
 			}
@@ -201,7 +201,7 @@ void ListWidget::enumerateDates(Method method) {
 		}
 
 		// Forget the found bottom of the pack, search for the next one from scratch.
-		if (!item->isInOneDayWithPrevious()) {
+		if (!view->isInOneDayWithPrevious()) {
 			lowestInOneDayItemBottom = -1;
 		}
 
@@ -675,8 +675,7 @@ void ListWidget::paintEvent(QPaintEvent *e) {
 				return false;
 			}
 
-			const auto item = view->data();
+			const auto displayDate = view->displayDate();
-			const auto displayDate = item->displayDate();
 			auto dateInPlace = displayDate;
 			if (dateInPlace) {
 				const auto correctDateTop = itemtop + st::msgServiceMargin.top();
@@ -696,11 +695,14 @@ void ListWidget::paintEvent(QPaintEvent *e) {
 					p.setOpacity(opacity);
 					int dateY = /*noFloatingDate ? itemtop :*/ (dateTop - st::msgServiceMargin.top());
 					int width = view->width();
-					if (const auto date = item->Get<HistoryMessageDate>()) {
+					if (const auto date = view->Get<HistoryView::DateBadge>()) {
 						date->paint(p, dateY, width);
 					} else {
 						ServiceMessagePainter::paintDate(
-							p, item->date, dateY, width);
+							p,
+							view->data()->date,
+							dateY,
+							width);
 					}
 				}
 			}

Telegram/SourceFiles/history/view/history_view_message.cpp

@@ -360,7 +360,7 @@ void Message::draw(
 	}
 
 	auto dateh = 0;
-	if (const auto date = item->Get<HistoryMessageDate>()) {
+	if (const auto date = Get<DateBadge>()) {
 		dateh = date->height();
 	}
 	if (const auto bar = Get<UnreadBar>()) {

Telegram/SourceFiles/history/view/history_view_service_message.cpp

@@ -314,7 +314,7 @@ QSize Service::performCountCurrentSize(int newWidth) {
 	const auto item = message();
 	const auto media = this->media();
 
-	auto newHeight = item->displayedDateHeight();
+	auto newHeight = displayedDateHeight();
 	if (const auto bar = Get<UnreadBar>()) {
 		newHeight += bar->height();
 	}
@@ -376,7 +376,7 @@ void Service::draw(
 	auto height = this->height() - st::msgServiceMargin.top() - st::msgServiceMargin.bottom();
 	auto dateh = 0;
 	auto unreadbarh = 0;
-	if (auto date = item->Get<HistoryMessageDate>()) {
+	if (auto date = Get<DateBadge>()) {
 		dateh = date->height();
 		p.translate(0, dateh);
 		clip.translate(0, -dateh);
@@ -445,7 +445,7 @@ bool Service::hasPoint(QPoint point) const {
 		return false;
 	}
 
-	if (auto dateh = item->displayedDateHeight()) {
+	if (const auto dateh = displayedDateHeight()) {
 		g.setTop(g.top() + dateh);
 	}
 	if (const auto bar = Get<UnreadBar>()) {
@@ -468,7 +468,7 @@ HistoryTextState Service::getState(QPoint point, HistoryStateRequest request) co
 		return result;
 	}
 
-	if (auto dateh = item->displayedDateHeight()) {
+	if (const auto dateh = displayedDateHeight()) {
 		point.setY(point.y() - dateh);
 		g.setHeight(g.height() - dateh);
 	}