From 87c07a13a1cb3e92e72996bb79d34bb9f6f73320 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 6 Jun 2018 12:46:17 +0300
Subject: [PATCH] Display sticker date on mouse over.

Fixes #3636.
---
 Telegram/SourceFiles/history/history_media_types.cpp | 12 +++++++++---
 Telegram/SourceFiles/history/history_media_types.h   |  1 +
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_media_types.cpp b/Telegram/SourceFiles/history/history_media_types.cpp
index f2988e889..c21dadcfd 100644
--- a/Telegram/SourceFiles/history/history_media_types.cpp
+++ b/Telegram/SourceFiles/history/history_media_types.cpp
@@ -622,7 +622,7 @@ bool HistoryPhoto::dataLoaded() const {
 }
 
 bool HistoryPhoto::needInfoDisplay() const {
-	return (_data->uploading() || _parent->isUnderCursor());
+	return (_parent->data()->id < 0 || _parent->isUnderCursor());
 }
 
 void HistoryPhoto::validateGroupedCache(
@@ -2725,7 +2725,7 @@ bool HistoryGif::dataLoaded() const {
 }
 
 bool HistoryGif::needInfoDisplay() const {
-	return (_data->uploading() || _parent->isUnderCursor());
+	return (_parent->data()->id < 0 || _parent->isUnderCursor());
 }
 
 HistorySticker::HistorySticker(
@@ -2837,7 +2837,9 @@ void HistorySticker::draw(Painter &p, const QRect &r, TextSelection selection, T
 	if (!inWebPage) {
 		auto fullRight = usex + usew;
 		auto fullBottom = height();
-		_parent->drawInfo(p, fullRight, fullBottom, usex * 2 + usew, selected, InfoDisplayType::Background);
+		if (needInfoDisplay()) {
+			_parent->drawInfo(p, fullRight, fullBottom, usex * 2 + usew, selected, InfoDisplayType::Background);
+		}
 		if (via || reply) {
 			int rectw = width() - usew - st::msgReplyPadding.left();
 			int recth = st::msgReplyPadding.top() + st::msgReplyPadding.bottom();
@@ -2952,6 +2954,10 @@ TextState HistorySticker::textState(QPoint point, StateRequest request) const {
 	return result;
 }
 
+bool HistorySticker::needInfoDisplay() const {
+	return (_parent->data()->id < 0 || _parent->isUnderCursor());
+}
+
 int HistorySticker::additionalWidth(const HistoryMessageVia *via, const HistoryMessageReply *reply) const {
 	int result = 0;
 	if (via) {
diff --git a/Telegram/SourceFiles/history/history_media_types.h b/Telegram/SourceFiles/history/history_media_types.h
index fbc3a17d8..6d8b7f7e2 100644
--- a/Telegram/SourceFiles/history/history_media_types.h
+++ b/Telegram/SourceFiles/history/history_media_types.h
@@ -520,6 +520,7 @@ private:
 	QSize countOptimalSize() override;
 	QSize countCurrentSize(int newWidth) override;
 
+	bool needInfoDisplay() const;
 	int additionalWidth(const HistoryMessageVia *via, const HistoryMessageReply *reply) const;
 	int additionalWidth() const;