From 3880ae498327135aa05e4d1edf10183a03ae1518 Mon Sep 17 00:00:00 2001 From: Lukas Holecek <hluk@email.cz> Date: Mon, 12 Apr 2021 18:45:02 +0200 Subject: [PATCH] Windows: Fix moving window to another screen Breaks restoring geometry on Wayland, but it did not work well anyway. Fixes #1624 --- src/gui/windowgeometryguard.cpp | 11 ----------- src/gui/windowgeometryguard.h | 4 ---- 2 files changed, 15 deletions(-) diff --git a/src/gui/windowgeometryguard.cpp b/src/gui/windowgeometryguard.cpp index eb4f8261a..849781013 100644 --- a/src/gui/windowgeometryguard.cpp +++ b/src/gui/windowgeometryguard.cpp @@ -55,11 +55,6 @@ bool WindowGeometryGuard::eventFilter(QObject *, QEvent *event) m_timerSaveGeometry.stop(); m_timerRestoreGeometry.start(); } - if (!m_screenChangeConnected && m_window->windowHandle()) { - m_screenChangeConnected = true; - connect(m_window->windowHandle(), &QWindow::screenChanged, - this, &WindowGeometryGuard::onScreenChanged); - } break; case QEvent::Move: @@ -128,9 +123,3 @@ void WindowGeometryGuard::unlockWindowGeometry() { m_timerUnlockGeometry.stop(); } - -void WindowGeometryGuard::onScreenChanged() -{ - m_timerUnlockGeometry.stop(); - restoreWindowGeometry(); -} diff --git a/src/gui/windowgeometryguard.h b/src/gui/windowgeometryguard.h index bd5137107..8720529e5 100644 --- a/src/gui/windowgeometryguard.h +++ b/src/gui/windowgeometryguard.h @@ -41,15 +41,11 @@ private: void restoreWindowGeometry(); void unlockWindowGeometry(); - void onScreenChanged(); - QWidget *m_window; QTimer m_timerSaveGeometry; QTimer m_timerRestoreGeometry; QTimer m_timerUnlockGeometry; - - bool m_screenChangeConnected = false; }; #endif // WINDOWGEOMETRYGUARD_H -- GitLab