From 512f93d5d3949bdad45ed1bd5d03d8a07801358f Mon Sep 17 00:00:00 2001 From: RadRussianRus Date: Wed, 29 Dec 2021 06:38:06 +0300 Subject: [PATCH] Disable PiP for unsupported cases (such as animated avatars) --- Telegram/Resources/langs/rewrites/en.json | 1 + Telegram/Resources/langs/rewrites/ru.json | 1 + .../SourceFiles/media/view/media_view_overlay_widget.cpp | 6 +++++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Telegram/Resources/langs/rewrites/en.json b/Telegram/Resources/langs/rewrites/en.json index 5ab8346dd..acd31624c 100644 --- a/Telegram/Resources/langs/rewrites/en.json +++ b/Telegram/Resources/langs/rewrites/en.json @@ -257,5 +257,6 @@ "ktg_disable_chat_themes": "Disable chat themes", "ktg_settings_remember_compress_images": "Remember compress images", "ktg_settings_compress_images_default": "Compress images by default", + "ktg_pip_not_supported": "Sorry, Picture-in-Picture mode is not supported here.", "dummy_last_string": "" } diff --git a/Telegram/Resources/langs/rewrites/ru.json b/Telegram/Resources/langs/rewrites/ru.json index b7c2155f3..d00118f69 100644 --- a/Telegram/Resources/langs/rewrites/ru.json +++ b/Telegram/Resources/langs/rewrites/ru.json @@ -257,5 +257,6 @@ "ktg_disable_chat_themes": "Отключить темы чатов", "ktg_settings_remember_compress_images": "Запоминать сжатие изображений", "ktg_settings_compress_images_default": "Сжимать изображения по умолчанию", + "ktg_pip_not_supported": "К сожалению, режим «Картинка-в-картинке» здесь не поддерживается.", "dummy_last_string": "" } diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp index 740a24f82..d60e02775 100644 --- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp +++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp @@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #include "media/view/media_view_overlay_widget.h" +#include "kotato/kotato_lang.h" #include "apiwrap.h" #include "api/api_attached_stickers.h" #include "api/api_peer_photo.h" @@ -3136,8 +3137,11 @@ float64 OverlayWidget::playbackControlsCurrentSpeed() { } void OverlayWidget::switchToPip() { + if (_document == nullptr) { + Ui::Toast::Show(_widget, ktr("ktg_pip_not_supported")); + return; + } Expects(_streamed != nullptr); - Expects(_document != nullptr); const auto document = _document; const auto message = _message;