From 925f6df06a203bab000b31b4f37fd50ef143991a Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 13 Aug 2020 13:02:15 +0400 Subject: [PATCH] Fix call panel behaviour on macOS. --- Telegram/SourceFiles/calls/calls_panel.cpp | 5 ++++- Telegram/ThirdParty/tgcalls | 2 +- Telegram/lib_ui | 2 +- docs/building-xcode.md | 4 ++-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Telegram/SourceFiles/calls/calls_panel.cpp b/Telegram/SourceFiles/calls/calls_panel.cpp index 19e5cf1e73..f48d932178 100644 --- a/Telegram/SourceFiles/calls/calls_panel.cpp +++ b/Telegram/SourceFiles/calls/calls_panel.cpp @@ -312,6 +312,10 @@ void Panel::initWindow() { }, _window->lifetime()); _window->setBodyTitleArea([=](QPoint widgetPoint) { + using Flag = Ui::WindowTitleHitTestFlag; + if (!widget()->rect().contains(widgetPoint)) { + return Flag::None | Flag(0); + } const auto buttonWidth = st::callCancel.button.width; const auto buttonsWidth = buttonWidth * 4; const auto inControls = _fingerprintArea.contains(widgetPoint) @@ -322,7 +326,6 @@ void Panel::initWindow() { _answerHangupRedial->height()).contains(widgetPoint) || (!_outgoingPreviewInBody && _outgoingVideoBubble->geometry().contains(widgetPoint)); - using Flag = Ui::WindowTitleHitTestFlag; return inControls ? Flag::None : (Flag::Move | Flag::FullScreen); diff --git a/Telegram/ThirdParty/tgcalls b/Telegram/ThirdParty/tgcalls index 13833e2377..2850efa001 160000 --- a/Telegram/ThirdParty/tgcalls +++ b/Telegram/ThirdParty/tgcalls @@ -1 +1 @@ -Subproject commit 13833e23776ee5ff18a0b9592e9d00572f5faeac +Subproject commit 2850efa0015dc4e6bbd541c0a072497477d75940 diff --git a/Telegram/lib_ui b/Telegram/lib_ui index 3d5108a878..6735ee93dc 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit 3d5108a8787305ba7949659105b7f7490363488e +Subproject commit 6735ee93dc6202d816fe1e3c06187007e2633565 diff --git a/docs/building-xcode.md b/docs/building-xcode.md index 6c26543ee7..361c10d0a3 100644 --- a/docs/building-xcode.md +++ b/docs/building-xcode.md @@ -243,8 +243,8 @@ Go to ***BuildPath*** and run ninja -C out/Release cd .. - git clone git://code.qt.io/qt/qt5.git qt5_12_8 - cd qt5_12_8 + git clone git://code.qt.io/qt/qt5.git qt_5_12_8 + cd qt_5_12_8 perl init-repository --module-subset=qtbase,qtimageformats git checkout v5.12.8 git submodule update qtbase qtimageformats