From 1b7777e3a011f49c78d4361a37fafcc8fc24a496 Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 4 Apr 2017 16:43:41 +0300 Subject: [PATCH] Pause other GIFs when playing round video message. --- Telegram/SourceFiles/history/history_media_types.cpp | 4 ++++ Telegram/SourceFiles/window/window_controller.h | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Telegram/SourceFiles/history/history_media_types.cpp b/Telegram/SourceFiles/history/history_media_types.cpp index 55531f6c1..cdf0fa12c 100644 --- a/Telegram/SourceFiles/history/history_media_types.cpp +++ b/Telegram/SourceFiles/history/history_media_types.cpp @@ -2087,6 +2087,7 @@ bool HistoryGif::playInline(bool autoplay) { if (App::main()) { App::main()->mediaMarkRead(_data); } + App::wnd()->controller()->enableGifPauseReason(Window::GifPauseReason::RoundPlaying); } if (_gif && autoplay) { _gif->setAutoplay(); @@ -2096,6 +2097,9 @@ bool HistoryGif::playInline(bool autoplay) { } void HistoryGif::stopInline() { + if (_gif && _gif->mode() == Media::Clip::Reader::Mode::Video) { + App::wnd()->controller()->disableGifPauseReason(Window::GifPauseReason::RoundPlaying); + } clearClipReader(); _parent->setPendingInitDimensions(); diff --git a/Telegram/SourceFiles/window/window_controller.h b/Telegram/SourceFiles/window/window_controller.h index bcdc05812..40465ecc9 100644 --- a/Telegram/SourceFiles/window/window_controller.h +++ b/Telegram/SourceFiles/window/window_controller.h @@ -27,7 +27,8 @@ enum class GifPauseReason { InlineResults = (1 << 0), SavedGifs = (1 << 1), Layer = (1 << 2), - MediaPreview = (1 << 3), + RoundPlaying = (1 << 3), + MediaPreview = (1 << 4), }; Q_DECLARE_FLAGS(GifPauseReasons, GifPauseReason); Q_DECLARE_OPERATORS_FOR_FLAGS(GifPauseReasons);