Skip to content
Snippets Groups Projects
Commit 3880ae49 authored by hluk's avatar hluk
Browse files

Windows: Fix moving window to another screen

Breaks restoring geometry on Wayland, but it did not work well anyway.

Fixes #1624
parent 5063882c
No related branches found
No related tags found
No related merge requests found
...@@ -55,11 +55,6 @@ bool WindowGeometryGuard::eventFilter(QObject *, QEvent *event) ...@@ -55,11 +55,6 @@ bool WindowGeometryGuard::eventFilter(QObject *, QEvent *event)
m_timerSaveGeometry.stop(); m_timerSaveGeometry.stop();
m_timerRestoreGeometry.start(); m_timerRestoreGeometry.start();
} }
if (!m_screenChangeConnected && m_window->windowHandle()) {
m_screenChangeConnected = true;
connect(m_window->windowHandle(), &QWindow::screenChanged,
this, &WindowGeometryGuard::onScreenChanged);
}
break; break;
case QEvent::Move: case QEvent::Move:
...@@ -128,9 +123,3 @@ void WindowGeometryGuard::unlockWindowGeometry() ...@@ -128,9 +123,3 @@ void WindowGeometryGuard::unlockWindowGeometry()
{ {
m_timerUnlockGeometry.stop(); m_timerUnlockGeometry.stop();
} }
void WindowGeometryGuard::onScreenChanged()
{
m_timerUnlockGeometry.stop();
restoreWindowGeometry();
}
...@@ -41,15 +41,11 @@ private: ...@@ -41,15 +41,11 @@ private:
void restoreWindowGeometry(); void restoreWindowGeometry();
void unlockWindowGeometry(); void unlockWindowGeometry();
void onScreenChanged();
QWidget *m_window; QWidget *m_window;
QTimer m_timerSaveGeometry; QTimer m_timerSaveGeometry;
QTimer m_timerRestoreGeometry; QTimer m_timerRestoreGeometry;
QTimer m_timerUnlockGeometry; QTimer m_timerUnlockGeometry;
bool m_screenChangeConnected = false;
}; };
#endif // WINDOWGEOMETRYGUARD_H #endif // WINDOWGEOMETRYGUARD_H
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment