diff options
author | Liang Qi <liang.qi@qt.io> | 2022-03-22 11:23:24 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2022-04-19 22:06:26 +0200 |
commit | d27a6235246764bef1d61905ef96feeeddc65cd8 (patch) | |
tree | a191de9b96b5a99ade1c14570469060532aab9c6 /src/plugins/platforms/xcb/qxcbwindow.h | |
parent | fbbad06751c93002754d4de26a73d43f139b82a0 (diff) |
Revert "xcb: implement missing bits from ICCCM 4.1.4 WM_STATE handling"
This reverts commit e946e6895a8517a887ac246905e0769edd766fcc.
It clears the duplicate show() and hide() too aggressive in
handleDeferredTasks() and can cause visible states out of sync between
qt and system(x11) when user switches visible on and off very
frequently.
This change also reverts 28138aa80a14279a72af2818f5bbbaa670283964.
Fixes: QTBUG-101347
Fixes: QTBUG-99810
Task-number: QTBUG-69515
Pick-to: 6.2 6.3 5.15
Change-Id: I419c324634be8ee6884e02032bb53a42738305ac
Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbwindow.h')
-rw-r--r-- | src/plugins/platforms/xcb/qxcbwindow.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/src/plugins/platforms/xcb/qxcbwindow.h b/src/plugins/platforms/xcb/qxcbwindow.h index 01aabfc429..2c65296d90 100644 --- a/src/plugins/platforms/xcb/qxcbwindow.h +++ b/src/plugins/platforms/xcb/qxcbwindow.h @@ -74,14 +74,6 @@ public: Q_DECLARE_FLAGS(NetWmStates, NetWmState) - enum Task { - Map, - Unmap, - SetGeometry, - SetWindowFlags, - SetWindowState - }; - QXcbWindow(QWindow *window); ~QXcbWindow(); @@ -151,9 +143,6 @@ public: QXcbWindow *toWindow() override; - bool shouldDeferTask(Task task); - void handleDeferredTasks(); - void handleMouseEvent(xcb_timestamp_t time, const QPoint &local, const QPoint &global, Qt::KeyboardModifiers modifiers, QEvent::Type type, Qt::MouseEventSource source); @@ -291,11 +280,6 @@ protected: int m_swapInterval = -1; qreal m_sizeHintsScaleFactor = 1.0; - - bool m_wmStateValid = true; - QVector<Task> m_deferredTasks; - bool m_isWmManagedWindow = true; - QRect m_deferredGeometry; }; class QXcbForeignWindow : public QXcbWindow |