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

Use QWidget::setScreen with Qt 6

Browse source
This commit is contained in:
Ilya Fedin 2024-06-21 15:05:27 +04:00 • committed by John Preston
parent 490ec7949f
commit 5180e0ec57
3 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -585,7 +585,6 @@ void ChooseSourceProcess::setupSourcesGeometry() {
void ChooseSourceProcess::setupGeometryWithParent( void ChooseSourceProcess::setupGeometryWithParent(
not_null<QWidget*> parent) { not_null<QWidget*> parent) {
_window->createWinId();
const auto parentScreen = [&] { const auto parentScreen = [&] {
if (const auto screen = QGuiApplication::screenAt( if (const auto screen = QGuiApplication::screenAt(
parent->geometry().center())) { parent->geometry().center())) {
@ -595,7 +594,12 @@ void ChooseSourceProcess::setupGeometryWithParent(
}(); }();
const auto myScreen = _window->screen(); const auto myScreen = _window->screen();
if (parentScreen && myScreen != parentScreen) { if (parentScreen && myScreen != parentScreen) {
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
_window->setScreen(parentScreen);
#else // Qt >= 6.0.0
_window->createWinId();
_window->windowHandle()->setScreen(parentScreen); _window->windowHandle()->setScreen(parentScreen);
#endif // Qt < 6.0.0
} }
_window->setFixedSize(_fixedSize); _window->setFixedSize(_fixedSize);
_window->move( _window->move(

4
Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
View file

@ -804,7 +804,11 @@ void OverlayWidget::moveToScreen(bool inMove) {
DEBUG_LOG(("Viewer Pos: Currently on screen %1, moving to screen %2") DEBUG_LOG(("Viewer Pos: Currently on screen %1, moving to screen %2")
.arg(screenList.indexOf(myScreen)) .arg(screenList.indexOf(myScreen))
.arg(screenList.indexOf(activeWindowScreen))); .arg(screenList.indexOf(activeWindowScreen)));
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
_window->setScreen(activeWindowScreen);
#else // Qt >= 6.0.0
window()->setScreen(activeWindowScreen); window()->setScreen(activeWindowScreen);
#endif // Qt < 6.0.0
DEBUG_LOG(("Viewer Pos: New actual screen: %1") DEBUG_LOG(("Viewer Pos: New actual screen: %1")
.arg(screenList.indexOf(_window->screen()))); .arg(screenList.indexOf(_window->screen())));
} }

4
Telegram/SourceFiles/media/view/media_view_pip.cpp
View file

@ -514,7 +514,11 @@ void PipPanel::setPositionDefault() {
const auto parentScreen = widgetScreen(_parent); const auto parentScreen = widgetScreen(_parent);
const auto myScreen = widget()->screen(); const auto myScreen = widget()->screen();
if (parentScreen && myScreen != parentScreen) { if (parentScreen && myScreen != parentScreen) {
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
widget()->setScreen(parentScreen);
#else // Qt >= 6.0.0
widget()->windowHandle()->setScreen(parentScreen); widget()->windowHandle()->setScreen(parentScreen);
#endif // Qt < 6.0.0
} }
auto position = Position(); auto position = Position();
position.snapped = RectPart::Top | RectPart::Left; position.snapped = RectPart::Top | RectPart::Left;