diff options
author | axis <qt-info@nokia.com> | 2009-08-12 13:20:08 (GMT) |
---|---|---|
committer | axis <qt-info@nokia.com> | 2009-08-12 15:05:52 (GMT) |
commit | ecb4110040218fafaad8717c7c58de1086d3590d (patch) | |
tree | 3d803129114440896ef702c397342e5af77663b6 /src/gui/styles/qstyle.cpp | |
parent | 9bba7e42a2988967507d536c497c54efc791eb67 (diff) | |
download | Qt-ecb4110040218fafaad8717c7c58de1086d3590d.zip Qt-ecb4110040218fafaad8717c7c58de1086d3590d.tar.gz Qt-ecb4110040218fafaad8717c7c58de1086d3590d.tar.bz2 |
Revised SIP API.
After discussions with Matthias, several things were changed:
- the autoSipOnMouseFocus property was removed and replaced with a
new style hint, SH_RequestSoftwareInputPanel. This means the style
can define when the input panel is launched.
- The code which sends RequestSoftwareInputPanel events was moved
into its own function, and the widgets call that function.
AutoTest: Included and passed
RevBy: mae
Diffstat (limited to 'src/gui/styles/qstyle.cpp')
-rw-r--r-- | src/gui/styles/qstyle.cpp | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/gui/styles/qstyle.cpp b/src/gui/styles/qstyle.cpp index 598fe6b..f930107 100644 --- a/src/gui/styles/qstyle.cpp +++ b/src/gui/styles/qstyle.cpp @@ -1586,6 +1586,20 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment, */ /*! + \enum QStyle::RequestSoftwareInputPanel + + This enum describes under what circumstances a software input panel will be + requested by input capable widgets. + + \value RSIP_OnMouseClickAndAlreadyFocused Requests an input panel if the user + clicks on the widget, but only if it is already focused. + \value RSIP_OnMouseClick Requests an input panel if the user clicks on the + widget. + + \sa QEvent::RequestSoftwareInputPanel, QInputContext +*/ + +/*! \enum QStyle::StyleHint This enum describes the available style hints. A style hint is a general look @@ -1868,6 +1882,9 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment, \value SH_ToolButtonStyle Determines the default system style for tool buttons that uses Qt::ToolButtonFollowStyle. + \value SH_RequestSoftwareInputPanel Determines when a software input panel should + be requested by input widgets. Returns an enum of type QStyle::RequestSoftwareInputPanel. + \omitvalue SH_UnderlineAccelerator \sa styleHint() |