From d6f549fef6bd6ac4e8387d2d7142594602249854 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 8 Feb 2016 19:04:44 +0300
Subject: [PATCH] no lag in changing normal to wide adaptive mode, files
 overview ext display improved, no inline bot progress while resolving
 username, version 0.9.20.dev

---
 Telegram/Resources/style.txt           |  6 +++---
 Telegram/SourceFiles/history.cpp       | 13 ++++++++++++-
 Telegram/SourceFiles/history.h         |  1 +
 Telegram/SourceFiles/historywidget.cpp |  8 ++++----
 Telegram/SourceFiles/layout.cpp        | 12 ++++++------
 5 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/Telegram/Resources/style.txt b/Telegram/Resources/style.txt
index 0cb9e073e..944fd83ae 100644
--- a/Telegram/Resources/style.txt
+++ b/Telegram/Resources/style.txt
@@ -1285,9 +1285,6 @@ msgFileBlue: sprite(60px, 425px, 20px, 20px);
 msgFileOverDuration: 200;
 msgFileRadialLine: 3px;
 
-msgFileExtPadding: 8px;
-msgFileExtTop: 30px;
-
 msgVideoSize: size(320px, 240px);
 
 sendPadding: 9px;
@@ -2200,6 +2197,9 @@ overviewFileStatusTop: 27px;
 overviewFileDateTop: 49px;
 overviewFileChecked: #2fa9e2;
 overviewFileCheck: #00000066;
+overviewFileExtPadding: 5px;
+overviewFileExtTop: 24px;
+overviewFileExtFont: font(18px semibold);
 
 // Mac specific
 
diff --git a/Telegram/SourceFiles/history.cpp b/Telegram/SourceFiles/history.cpp
index 2f122ebf6..e039dd1b5 100644
--- a/Telegram/SourceFiles/history.cpp
+++ b/Telegram/SourceFiles/history.cpp
@@ -2927,6 +2927,10 @@ bool HistoryItem::displayFromPhoto() const {
 	return Adaptive::Wide() || (!out() && !history()->peer->isUser() && !fromChannel());
 }
 
+bool HistoryItem::shiftFromPhoto() const {
+	return Adaptive::Wide() && !out() && !history()->peer->isUser() && !fromChannel();
+}
+
 void HistoryItem::clipCallback(ClipReaderNotification notification) {
 	HistoryMedia *media = getMedia();
 	if (!media) return;
@@ -6225,7 +6229,14 @@ void HistoryMessage::countPositionAndSize(int32 &left, int32 &width) const {
 	}
 	left += (!fromChannel() && out()) ? st::msgMargin.right() : st::msgMargin.left();
 	if (displayFromPhoto()) {
-		left += (!fromChannel() && out()) ? -st::msgPhotoSkip : st::msgPhotoSkip;
+		if (!fromChannel() && out()) {
+			left -= st::msgPhotoSkip;
+		} else {
+			left += st::msgPhotoSkip;
+			if (shiftFromPhoto()) {
+				left += st::msgPhotoSkip;
+			}
+		}
 	}
 
 	width = hwidth - st::msgMargin.left() - st::msgMargin.right();
diff --git a/Telegram/SourceFiles/history.h b/Telegram/SourceFiles/history.h
index b1a321eb3..8f801be89 100644
--- a/Telegram/SourceFiles/history.h
+++ b/Telegram/SourceFiles/history.h
@@ -1021,6 +1021,7 @@ public:
 		return (!out() || fromChannel()) && !history()->peer->isUser();
 	}
 	bool displayFromPhoto() const;
+	bool shiftFromPhoto() const;
 
 	void clipCallback(ClipReaderNotification notification);
 
diff --git a/Telegram/SourceFiles/historywidget.cpp b/Telegram/SourceFiles/historywidget.cpp
index e8af2e897..05c757ee7 100644
--- a/Telegram/SourceFiles/historywidget.cpp
+++ b/Telegram/SourceFiles/historywidget.cpp
@@ -2838,12 +2838,12 @@ void HistoryWidget::updateInlineBotQuery() {
 	QString query = _field.getInlineBotQuery(_inlineBot, _inlineBotUsername);
 	if (inlineBotUsername != _inlineBotUsername) {
 		if (_inlineBotResolveRequestId) {
-			Notify::inlineBotRequesting(false);
+//			Notify::inlineBotRequesting(false);
 			MTP::cancel(_inlineBotResolveRequestId);
 			_inlineBotResolveRequestId = 0;
 		}
 		if (_inlineBot == InlineBotLookingUpData) {
-			Notify::inlineBotRequesting(true);
+//			Notify::inlineBotRequesting(true);
 			_inlineBotResolveRequestId = MTP::send(MTPcontacts_ResolveUsername(MTP_string(_inlineBotUsername)), rpcDone(&HistoryWidget::inlineBotResolveDone), rpcFail(&HistoryWidget::inlineBotResolveFail, _inlineBotUsername));
 			return;
 		}
@@ -5066,7 +5066,7 @@ bool HistoryWidget::hasBroadcastToggle() const {
 
 void HistoryWidget::inlineBotResolveDone(const MTPcontacts_ResolvedPeer &result) {
 	_inlineBotResolveRequestId = 0;
-	Notify::inlineBotRequesting(false);
+//	Notify::inlineBotRequesting(false);
 	_inlineBotUsername = QString();
 	if (result.type() == mtpc_contacts_resolvedPeer) {
 		const MTPDcontacts_resolvedPeer &d(result.c_contacts_resolvedPeer());
@@ -5080,7 +5080,7 @@ bool HistoryWidget::inlineBotResolveFail(QString name, const RPCError &error) {
 	if (mtpIsFlood(error)) return false;
 
 	_inlineBotResolveRequestId = 0;
-	Notify::inlineBotRequesting(false);
+//	Notify::inlineBotRequesting(false);
 	if (name == _inlineBotUsername) {
 		_inlineBot = 0;
 		onCheckMentionDropdown();
diff --git a/Telegram/SourceFiles/layout.cpp b/Telegram/SourceFiles/layout.cpp
index a82d91700..cf3c71c76 100644
--- a/Telegram/SourceFiles/layout.cpp
+++ b/Telegram/SourceFiles/layout.cpp
@@ -764,10 +764,10 @@ LayoutOverviewDocument::LayoutOverviewDocument(DocumentData *document, HistoryIt
 		_thumbw = 0;
 	}
 
-	_extw = st::semiboldFont->width(_ext);
-	if (_extw > st::overviewFileSize - st::msgFileExtPadding * 2) {
-		_ext = st::semiboldFont->elided(_ext, st::overviewFileSize - st::msgFileExtPadding * 2, Qt::ElideMiddle);
-		_extw = st::semiboldFont->width(_ext);
+	_extw = st::overviewFileExtFont->width(_ext);
+	if (_extw > st::overviewFileSize - st::overviewFileExtPadding * 2) {
+		_ext = st::overviewFileExtFont->elided(_ext, st::overviewFileSize - st::overviewFileExtPadding * 2, Qt::ElideMiddle);
+		_extw = st::overviewFileExtFont->width(_ext);
 	}
 }
 
@@ -872,9 +872,9 @@ void LayoutOverviewDocument::paint(Painter &p, const QRect &clip, uint32 selecti
 			} else {
 				p.fillRect(rthumb, documentColor(_colorIndex));
 				if (!radial && loaded && !_ext.isEmpty()) {
-					p.setFont(st::semiboldFont);
+					p.setFont(st::overviewFileExtFont);
 					p.setPen(st::white);
-					p.drawText(rthumb.left() + (rthumb.width() - _extw) / 2, rthumb.top() + st::msgFileExtTop + st::semiboldFont->ascent, _ext);
+					p.drawText(rthumb.left() + (rthumb.width() - _extw) / 2, rthumb.top() + st::overviewFileExtTop + st::overviewFileExtFont->ascent, _ext);
 				}
 			}
 			if (selected) {