From fa0e2551838d3aecd12931503292c3143917f084 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 14 Oct 2016 21:44:15 +0300
Subject: [PATCH] Fixed tooltip display when hiding media player panel.

---
 Telegram/SourceFiles/historywidget.cpp        |  7 +++++--
 .../media/player/media_player_panel.cpp       | 20 +++++++++++++------
 .../media/player/media_player_widget.cpp      |  5 ++---
 .../ui/widgets/widget_slide_wrap.h            |  1 -
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/Telegram/SourceFiles/historywidget.cpp b/Telegram/SourceFiles/historywidget.cpp
index 336ed9d9d..a4d63313e 100644
--- a/Telegram/SourceFiles/historywidget.cpp
+++ b/Telegram/SourceFiles/historywidget.cpp
@@ -1752,6 +1752,7 @@ void HistoryInner::leaveEvent(QEvent *e) {
 		App::hoveredItem(nullptr);
 	}
 	ClickHandler::clearActive();
+	PopupTooltip::Hide();
 	if (!ClickHandler::getPressed() && _cursor != style::cur_default) {
 		_cursor = style::cur_default;
 		setCursor(_cursor);
@@ -2292,9 +2293,11 @@ QPoint HistoryInner::tooltipPos() const {
 }
 
 void HistoryInner::onParentGeometryChanged() {
-	bool needToUpdate = (_dragAction != NoDrag || _touchScroll || rect().contains(mapFromGlobal(QCursor::pos())));
+	auto mousePos = QCursor::pos();
+	auto mouseOver = _widget->rect().contains(_widget->mapFromGlobal(mousePos));
+	auto needToUpdate = (_dragAction != NoDrag || _touchScroll || mouseOver);
 	if (needToUpdate) {
-		dragActionUpdate(QCursor::pos());
+		dragActionUpdate(mousePos);
 	}
 }
 
diff --git a/Telegram/SourceFiles/media/player/media_player_panel.cpp b/Telegram/SourceFiles/media/player/media_player_panel.cpp
index 95ab3a971..77cda54d4 100644
--- a/Telegram/SourceFiles/media/player/media_player_panel.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_panel.cpp
@@ -65,7 +65,13 @@ void Panel::resizeEvent(QResizeEvent *e) {
 }
 
 void Panel::onListHeightUpdated() {
-	updateSize();
+	if (auto widget = _scroll->widget()) {
+		if (widget->height() > 0 || _cover) {
+			updateSize();
+		} else {
+			hideIgnoringEnterEvents();
+		}
+	}
 }
 
 void Panel::updateControlsGeometry() {
@@ -108,10 +114,6 @@ void Panel::scrollPlaylistToCurrentTrack() {
 		auto rect = list->getCurrentTrackGeometry();
 		auto top = _scroll->scrollTop(), bottom = top + _scroll->height();
 		_scroll->scrollToY(rect.y());
-		//if (top > rect.y()) {
-		//} else if (bottom < rect.y() + rect.height()) {
-		//	_scroll->scrollToY(rect.y() + rect.height() - _scroll->height());
-		//}
 	}
 }
 
@@ -130,7 +132,7 @@ void Panel::updateSize() {
 		height += _cover->height();
 	}
 	auto listHeight = 0;
-	if (auto widget = static_cast<ScrolledWidget*>(_scroll->widget())) {
+	if (auto widget = _scroll->widget()) {
 		listHeight = widget->height();
 	}
 	auto scrollVisible = (listHeight > 0);
@@ -261,6 +263,12 @@ void Panel::setPinCallback(PinCallback &&callback) {
 
 void Panel::onShowStart() {
 	ensureCreated();
+	if (auto widget = _scroll->widget()) {
+		if (widget->height() <= 0 && !_cover) {
+			return;
+		}
+	}
+
 	if (isHidden()) {
 		scrollPlaylistToCurrentTrack();
 		show();
diff --git a/Telegram/SourceFiles/media/player/media_player_widget.cpp b/Telegram/SourceFiles/media/player/media_player_widget.cpp
index 32f309d4b..6b5e28ed6 100644
--- a/Telegram/SourceFiles/media/player/media_player_widget.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_widget.cpp
@@ -210,14 +210,12 @@ void Widget::handleSeekFinished(float64 progress) {
 }
 
 void Widget::resizeEvent(QResizeEvent *e) {
-	updatePlayPrevNextPositions();
-
 	auto right = st::mediaPlayerCloseRight;
 	_close->moveToRight(right, st::mediaPlayerPlayTop); right += _close->width();
 	_repeatTrack->moveToRight(right, st::mediaPlayerPlayTop); right += _repeatTrack->width();
 	_volumeToggle->moveToRight(right, st::mediaPlayerPlayTop); right += _volumeToggle->width();
 
-	updateLabelsGeometry();
+	updatePlayPrevNextPositions();
 
 	_playback->setGeometry(0, height() - st::mediaPlayerPlayback.fullWidth, width(), st::mediaPlayerPlayback.fullWidth);
 }
@@ -262,6 +260,7 @@ void Widget::updatePlayPrevNextPositions() {
 	} else {
 		_playPause->moveToLeft(left, top);
 	}
+	updateLabelsGeometry();
 }
 
 int Widget::getLabelsLeft() const {
diff --git a/Telegram/SourceFiles/ui/widgets/widget_slide_wrap.h b/Telegram/SourceFiles/ui/widgets/widget_slide_wrap.h
index b7a5cc781..380e65209 100644
--- a/Telegram/SourceFiles/ui/widgets/widget_slide_wrap.h
+++ b/Telegram/SourceFiles/ui/widgets/widget_slide_wrap.h
@@ -139,7 +139,6 @@ private:
 			a_height.finish();
 			_a_height.stop();
 			_forceHeight = _hiding ? 0 : -1;
-			sendSynteticMouseEvent(this, QEvent::MouseMove, Qt::NoButton);
 			if (_hiding) hide();
 		} else {
 			a_height.update(dt, anim::linear);