summaryrefslogtreecommitdiffstats
path: root/src/gui/graphicsview/qgraphicsproxywidget.cpp
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2010-03-09 14:32:05 (GMT)
committeraxis <qt-info@nokia.com>2010-03-18 07:53:43 (GMT)
commite483886bcfcf7252af9ac7cc89de15f912bf69da (patch)
treee2282912c00717b7632570f07a9b8cc02ba77a96 /src/gui/graphicsview/qgraphicsproxywidget.cpp
parent05c20cbf719746f295ac4c3ebb484ea6c3555d70 (diff)
downloadQt-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/graphicsview/qgraphicsproxywidget.cpp')
-rw-r--r--src/gui/graphicsview/qgraphicsproxywidget.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/graphicsview/qgraphicsproxywidget.cpp b/src/gui/graphicsview/qgraphicsproxywidget.cpp
index a39ccfd..483eb62 100644
--- a/src/gui/graphicsview/qgraphicsproxywidget.cpp
+++ b/src/gui/graphicsview/qgraphicsproxywidget.cpp
@@ -1315,6 +1315,8 @@ void QGraphicsProxyWidget::focusInEvent(QFocusEvent *event)
return;
}
+ d->proxyIsGivingFocus = true;
+
switch (event->reason()) {
case Qt::TabFocusReason: {
if (QWidget *focusChild = d->findFocusChild(0, true))
@@ -1328,10 +1330,11 @@ void QGraphicsProxyWidget::focusInEvent(QFocusEvent *event)
default:
if (d->widget && d->widget->focusWidget()) {
d->widget->focusWidget()->setFocus(event->reason());
- return;
}
break;
}
+
+ d->proxyIsGivingFocus = false;
}
/*!