diff options
| author | axis <qt-info@nokia.com> | 2010-03-09 14:32:05 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-03-18 07:53:43 (GMT) |
| commit | e483886bcfcf7252af9ac7cc89de15f912bf69da (patch) | |
| tree | e2282912c00717b7632570f07a9b8cc02ba77a96 /src/gui/kernel/qwidget.cpp | |
| parent | 05c20cbf719746f295ac4c3ebb484ea6c3555d70 (diff) | |
| download | Qt-e483886bcfcf7252af9ac7cc89de15f912bf69da.zip Qt-e483886bcfcf7252af9ac7cc89de15f912bf69da.tar.gz Qt-e483886bcfcf7252af9ac7cc89de15f912bf69da.tar.bz2 | |
Fixed a bug where a proxy widget received FocusIn over and over.
This also fixed the issue where an input panel would not be requested
by the widget, because it thought it was being focused over and over,
instead of focused, and then clicked (focus followed by click is
default input panel popup behavior on Symbian).
AutoTest: Included and passed
RevBy: yoann
RevBy: Jan-Arve
Diffstat (limited to 'src/gui/kernel/qwidget.cpp')
| -rw-r--r-- | src/gui/kernel/qwidget.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index b5ccb3e..cd943cd 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -6123,6 +6123,8 @@ void QWidget::setFocus(Qt::FocusReason reason) previousProxyFocus = topData->proxyWidget->widget()->focusWidget(); if (previousProxyFocus && previousProxyFocus->focusProxy()) previousProxyFocus = previousProxyFocus->focusProxy(); + if (previousProxyFocus == this && !topData->proxyWidget->d_func()->proxyIsGivingFocus) + return; } } #endif |