diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-08-21 08:57:24 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-08-21 08:57:24 (GMT) |
| commit | 49c5acd406f5d2607b7a66d38d6279aa8c78f7f9 (patch) | |
| tree | f45126f94631d128a05817e8179ebbaaa607df60 /src/gui/kernel | |
| parent | a44894a39113e0eb9d4f7c912eee4671b3f391c1 (diff) | |
| parent | 8280ed177d798aeaf82868ba6c7c8c4250051f1d (diff) | |
| download | Qt-49c5acd406f5d2607b7a66d38d6279aa8c78f7f9.zip Qt-49c5acd406f5d2607b7a66d38d6279aa8c78f7f9.tar.gz Qt-49c5acd406f5d2607b7a66d38d6279aa8c78f7f9.tar.bz2 | |
Merge commit 'qt/master'
Conflicts:
examples/graphicsview/graphicsview.pro
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qwidget_qws.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/gui/kernel/qwidget_qws.cpp b/src/gui/kernel/qwidget_qws.cpp index 66c047a..09bffe6 100644 --- a/src/gui/kernel/qwidget_qws.cpp +++ b/src/gui/kernel/qwidget_qws.cpp @@ -581,6 +581,15 @@ void QWidgetPrivate::show_sys() if (q->isWindow()) { + + if (!q->testAttribute(Qt::WA_ShowWithoutActivating) + && q->windowType() != Qt::Popup + && q->windowType() != Qt::Tool + && q->windowType() != Qt::ToolTip) { + QWidget::qwsDisplay()->requestFocus(data.winid,true); + } + + if (QWindowSurface *surface = q->windowSurface()) { const QRect frameRect = q->frameGeometry(); if (surface->geometry() != frameRect) @@ -597,12 +606,6 @@ void QWidgetPrivate::show_sys() #endif data.fstrut_dirty = true; invalidateBuffer(r); - if (!q->testAttribute(Qt::WA_ShowWithoutActivating) - && q->windowType() != Qt::Popup - && q->windowType() != Qt::Tool - && q->windowType() != Qt::ToolTip) { - QWidget::qwsDisplay()->requestFocus(data.winid,true); - } bool staysontop = (q->windowFlags() & Qt::WindowStaysOnTopHint) || q->windowType() == Qt::Popup; |