From 92332b45eacd39bf31702d2e50bdf84c085fe82c Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 7 Mar 2019 14:03:19 +0400 Subject: [PATCH] Don't reset zoom on video seek. --- .../media/streaming/media_streaming_video_track.cpp | 1 - Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_video_track.cpp b/Telegram/SourceFiles/media/streaming/media_streaming_video_track.cpp index 509fb04ed..a79a6e121 100644 --- a/Telegram/SourceFiles/media/streaming/media_streaming_video_track.cpp +++ b/Telegram/SourceFiles/media/streaming/media_streaming_video_track.cpp @@ -90,7 +90,6 @@ private: crl::time _pausedTime = kTimeUnknown; crl::time _resumedTime = kTimeUnknown; mutable TimePoint _syncTimePoint; - mutable crl::time _previousFramePosition = kTimeUnknown; crl::time _framePositionShift = 0; crl::time _nextFrameDisplayTime = kTimeUnknown; rpl::event_stream _nextFrameTimeUpdates; diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp index b3ed2a0f8..4ac92abf6 100644 --- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp +++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp @@ -1933,7 +1933,7 @@ void OverlayWidget::streamingReady(Streaming::Information &&info) { validateStreamedGoodThumbnail(); if (videoShown()) { const auto contentSize = ConvertScale(videoSize()); - if (_w != contentSize.width() || _h != contentSize.height()) { + if (contentSize != QSize(_width, _height)) { update(contentRect()); _w = contentSize.width(); _h = contentSize.height(); @@ -3489,6 +3489,7 @@ void OverlayWidget::setVisibleHook(bool visible) { // before it is hidden without the child widget. if (!isHidden() && _streamed) { _streamed->controls.hide(); + _dropdown->hideFast(); _wasRepainted = false; repaint(); if (!_wasRepainted) {