From 58dd33d8a2ebb288306525fc065e1c776b990ffb Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 28 Jan 2020 20:10:27 +0300 Subject: [PATCH] Fix PiP window on macOS. --- Telegram/SourceFiles/media/view/media_view_overlay_widget.h | 2 +- Telegram/SourceFiles/media/view/media_view_pip.cpp | 2 ++ docs/building-xcode.md | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h index e83ccd6116..f4ed8f4858 100644 --- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h +++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h @@ -174,7 +174,7 @@ private: float64 playbackControlsCurrentVolume() override; void playbackControlsVolumeToggled() override; void playbackControlsVolumeChangeFinished() override; - void playbackControlsSpeedChanged(float64 speed); + void playbackControlsSpeedChanged(float64 speed) override; float64 playbackControlsCurrentSpeed() override; void playbackControlsToFullScreen() override; void playbackControlsFromFullScreen() override; diff --git a/Telegram/SourceFiles/media/view/media_view_pip.cpp b/Telegram/SourceFiles/media/view/media_view_pip.cpp index 73f6e3b3c5..fe9a0240d8 100644 --- a/Telegram/SourceFiles/media/view/media_view_pip.cpp +++ b/Telegram/SourceFiles/media/view/media_view_pip.cpp @@ -211,6 +211,8 @@ PipPanel::PipPanel( | Qt::FramelessWindowHint | Qt::WindowDoesNotAcceptFocus); setAttribute(Qt::WA_ShowWithoutActivating); + setAttribute(Qt::WA_MacAlwaysShowToolWindow); + Ui::Platform::InitOnTopPanel(this); setMouseTracking(true); resize(0, 0); show(); diff --git a/docs/building-xcode.md b/docs/building-xcode.md index f1fb7ae452..d4f3742659 100644 --- a/docs/building-xcode.md +++ b/docs/building-xcode.md @@ -33,7 +33,7 @@ Go to ***BuildPath*** and run git clone https://github.com/desktop-app/patches.git cd patches - git checkout 395b620 + git checkout 4f1cffb cd ../ git clone https://chromium.googlesource.com/external/gyp git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git @@ -50,7 +50,7 @@ Go to ***BuildPath*** and run git clone https://github.com/desktop-app/patches.git cd patches - git checkout 395b620 + git checkout 4f1cffb cd ../ git clone --branch 0.10.0 https://github.com/ericniebler/range-v3