diff options
author | Jørgen Lind <jorgen.lind@nokia.com> | 2010-12-06 15:13:34 (GMT) |
---|---|---|
committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-01-04 14:18:19 (GMT) |
commit | 3753b15e88f2c8220b887f27be79491c4135a291 (patch) | |
tree | 9d8ceb094637b4270d61a57384a854e1d26d81d8 /src/gui/kernel/qwidget_qpa.cpp | |
parent | fc013b7be66a6d4fc13af8bd38b7e679ed3998af (diff) | |
download | Qt-3753b15e88f2c8220b887f27be79491c4135a291.zip Qt-3753b15e88f2c8220b887f27be79491c4135a291.tar.gz Qt-3753b15e88f2c8220b887f27be79491c4135a291.tar.bz2 |
Added window focus handling to lighthouse
The idea is that QPlatformWindows can request focus handling. And when
actual focus shifting is done by windowsystem callbacks/events which are
sent to QWindowSystemInterface
Diffstat (limited to 'src/gui/kernel/qwidget_qpa.cpp')
-rw-r--r-- | src/gui/kernel/qwidget_qpa.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/gui/kernel/qwidget_qpa.cpp b/src/gui/kernel/qwidget_qpa.cpp index 617d984..1279e0a 100644 --- a/src/gui/kernel/qwidget_qpa.cpp +++ b/src/gui/kernel/qwidget_qpa.cpp @@ -379,9 +379,8 @@ QWidget *QWidget::keyboardGrabber() void QWidget::activateWindow() { - // XXX -// qDebug() << "QWidget::activateWindow" << this; - QApplication::setActiveWindow(this); //##### + if (platformWindow()) + platformWindow()->requestActivateWindow(); } void QWidgetPrivate::show_sys() @@ -409,9 +408,6 @@ void QWidgetPrivate::show_sys() } if (window) window->setVisible(true); - - if (q->isWindow() && q->windowType() != Qt::Popup && q->windowType() != Qt::ToolTip && !(q->windowFlags() & Qt::X11BypassWindowManagerHint)) - q->activateWindow(); //### QWindowSystemInterface should have callback function for when WS actually activates window. } } |