void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Synchronize capture source chooser's screen detection code with media viewer

Browse source
This commit is contained in:
Ilya Fedin 2022-03-20 08:58:50 +04:00 • committed by John Preston
parent 3967e5d4ff
commit 49e143f84e
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Telegram/SourceFiles/calls/group/ui/desktop_capture_choose_source.cpp
View file

@ -22,6 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <tgcalls/desktop_capturer/DesktopCaptureSourceManager.h> #include <tgcalls/desktop_capturer/DesktopCaptureSourceManager.h>
#include <tgcalls/desktop_capturer/DesktopCaptureSourceHelper.h> #include <tgcalls/desktop_capturer/DesktopCaptureSourceHelper.h>
#include <QtGui/QGuiApplication>
#include <QtGui/QWindow> #include <QtGui/QWindow>
namespace Calls::Group::Ui::DesktopCapture { namespace Calls::Group::Ui::DesktopCapture {
@ -575,7 +576,15 @@ void ChooseSourceProcess::setupGeometryWithParent(
not_null<QWidget*> parent) { not_null<QWidget*> parent) {
if (const auto handle = parent->windowHandle()) { if (const auto handle = parent->windowHandle()) {
_window->createWinId(); _window->createWinId();
const auto parentScreen = handle->screen(); const auto parentScreen = [&] {
if (!::Platform::IsWayland()) {
if (const auto screen = QGuiApplication::screenAt(
parent->geometry().center())) {
return screen;
}
}
return handle->screen();
}();
const auto myScreen = _window->windowHandle()->screen(); const auto myScreen = _window->windowHandle()->screen();
if (parentScreen && myScreen != parentScreen) { if (parentScreen && myScreen != parentScreen) {
_window->windowHandle()->setScreen(parentScreen); _window->windowHandle()->setScreen(parentScreen);