diff options
| author | Markku Luukkainen <markku.luukkainen@digia.com> | 2009-06-10 10:09:39 (GMT) |
|---|---|---|
| committer | Markku Luukkainen <markku.luukkainen@digia.com> | 2009-06-10 10:09:39 (GMT) |
| commit | 9009dce133b015cd2c7060d1f4747f3733dcf546 (patch) | |
| tree | 485055704634d8482abc612c697db0e2a717108c /src | |
| parent | 39c796e57be1830133e6189abe8f796b6846904f (diff) | |
| parent | 37524a8b9ffa41f960fcc595039def4ae4167f3e (diff) | |
| download | Qt-9009dce133b015cd2c7060d1f4747f3733dcf546.zip Qt-9009dce133b015cd2c7060d1f4747f3733dcf546.tar.gz Qt-9009dce133b015cd2c7060d1f4747f3733dcf546.tar.bz2 | |
Merge branch 'softkeys_without_stack' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into softkeys_without_stack
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/kernel/qwidget_s60.cpp | 1 | ||||
| -rw-r--r-- | src/gui/styles/qs60style.cpp | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp index cc6f794..a912b64 100644 --- a/src/gui/kernel/qwidget_s60.cpp +++ b/src/gui/kernel/qwidget_s60.cpp @@ -108,6 +108,7 @@ void QWidgetPrivate::setSoftKeys_sys(const QList<QAction*> &softkeys) if (placeInScreen==1) placeInScreen=2; } + nativeContainer->DrawDeferred(); // 3.1 needs an extra invitation } void QWidgetPrivate::setWSGeometry(bool dontShow) diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp index 6d24d54..3236928 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -1880,11 +1880,11 @@ void QS60Style::drawControl(ControlElement element, const QStyleOption *option, } break; #endif //QT_NO_TOOLBAR - case CE_ShapedFrame: { - const QTextEdit *txt = qobject_cast<const QTextEdit *>(widget); - if (txt) + case CE_ShapedFrame: + if (qobject_cast<const QTextEdit *>(widget)) QS60StylePrivate::drawSkinElement(QS60StylePrivate::SE_Editor, painter, option->rect, flags); - } + if (option->state & State_HasFocus) + drawPrimitive(PE_FrameFocusRect, option, painter, widget); break; default: QCommonStyle::drawControl(element, option, painter, widget); |