From d557e0f2b7b100b30c2c0346341ebf1aecdc7f25 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 5 Jan 2021 21:10:56 +0400
Subject: [PATCH] Don't set geometry to OverlayWidget (except macOS).

---
 .../SourceFiles/media/view/media_view_overlay_widget.cpp  | 3 +++
 .../SourceFiles/media/view/media_view_overlay_widget.h    | 8 ++++++--
 Telegram/lib_ui                                           | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index caebcab93..b758c3723 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -453,6 +453,9 @@ void OverlayWidget::moveToScreen() {
 }
 
 void OverlayWidget::updateGeometry() {
+	if (!Platform::IsMac()) {
+		return;
+	}
 	const auto screen = windowHandle() && windowHandle()->screen()
 		? windowHandle()->screen()
 		: QApplication::primaryScreen();
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
index 9cab8f0f2..99c2f8467 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
@@ -55,10 +55,14 @@ class Pip;
 #define USE_OPENGL_OVERLAY_WIDGET
 #endif // Q_OS_MAC && !OS_MAC_OLD
 
+struct OverlayParentTraits : Ui::RpWidgetDefaultTraits {
+	static constexpr bool kSetZeroGeometry = false;
+};
+
 #ifdef USE_OPENGL_OVERLAY_WIDGET
-using OverlayParent = Ui::RpWidgetWrap<QOpenGLWidget>;
+using OverlayParent = Ui::RpWidgetWrap<QOpenGLWidget, OverlayParentTraits>;
 #else // USE_OPENGL_OVERLAY_WIDGET
-using OverlayParent = Ui::RpWidget;
+using OverlayParent = Ui::RpWidgetWrap<QWidget, OverlayParentTraits>;
 #endif // USE_OPENGL_OVERLAY_WIDGET
 
 class OverlayWidget final
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index b5fb343d6..120a52c14 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit b5fb343d6cea52df8cde00e8e3ca1008c05e4589
+Subproject commit 120a52c143a9efbcb41d2bf109e82728becf7d6c