summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/xcb
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2011-06-07 21:53:52 +0200
committerLars Knoll <lars.knoll@nokia.com>2011-06-08 11:44:41 +0200
commitb6b244efda313b3e617afa57bb8c947582fc4003 (patch)
tree6f3c9857adcce2f462ec875d4aaf7fd387061e45 /src/plugins/platforms/xcb
parent819f9ca965279562f34895dab405f28162c0b8ab (diff)
Fix behaviour after WM_TAKE_FOCUS
We should not call requestActivateWindow() in reaction to WM_TAKE_FOCUS. Looks like it should only be done if the focus should in fact go to a modal child of the widget.
Diffstat (limited to 'src/plugins/platforms/xcb')
-rw-r--r--src/plugins/platforms/xcb/qxcbwindow.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp
index c9a3a16db5..09b92b2fbf 100644
--- a/src/plugins/platforms/xcb/qxcbwindow.cpp
+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
@@ -985,7 +985,6 @@ void QXcbWindow::handleClientMessageEvent(const xcb_client_message_event_t *even
QWindowSystemInterface::handleCloseEvent(window());
} else if (event->data.data32[0] == atom(QXcbAtom::WM_TAKE_FOCUS)) {
connection()->setTime(event->data.data32[1]);
- requestActivateWindow();
} else if (event->data.data32[0] == atom(QXcbAtom::_NET_WM_PING)) {
xcb_client_message_event_t reply = *event;