diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2010-07-21 02:23:15 (GMT) |
|---|---|---|
| committer | Toby Tomkins <toby.tomkins@nokia.com> | 2010-07-26 07:08:07 (GMT) |
| commit | 056bbc32fd64f48851e6ad058c5e4c1372a96564 (patch) | |
| tree | a76fc7d01d913e371c949d839d40d3f394960d55 /demos | |
| parent | acebca36dc84677bb0875297b1739e15025323bb (diff) | |
| download | Qt-056bbc32fd64f48851e6ad058c5e4c1372a96564.zip Qt-056bbc32fd64f48851e6ad058c5e4c1372a96564.tar.gz Qt-056bbc32fd64f48851e6ad058c5e4c1372a96564.tar.bz2 | |
QML focus API updates.
The wantsFocus property has been renamed to activeFocus, to better
reflect its value. Reading and writing the focus property is also now
consistent -- this property represents focus within a scope. Other small
changes were made to keep things consistent with the new naming.
Reviewed-by: Aaron Kennedy
(cherry picked from commit 21806ff0921641b4e4d9d39721ab4ebeae74dddc)
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/declarative/photoviewer/PhotoViewerCore/EditableButton.qml | 2 | ||||
| -rw-r--r-- | demos/declarative/twitter/TwitterCore/Button.qml | 2 | ||||
| -rw-r--r-- | demos/declarative/webbrowser/content/UrlInput.qml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/demos/declarative/photoviewer/PhotoViewerCore/EditableButton.qml b/demos/declarative/photoviewer/PhotoViewerCore/EditableButton.qml index 6109535..568666e 100644 --- a/demos/declarative/photoviewer/PhotoViewerCore/EditableButton.qml +++ b/demos/declarative/photoviewer/PhotoViewerCore/EditableButton.qml @@ -77,6 +77,6 @@ Item { MouseArea { anchors { fill: parent; leftMargin: -20; topMargin: -20; rightMargin: -20; bottomMargin: -20 } - onClicked: { textInput.forceFocus(); textInput.openSoftwareInputPanel(); } + onClicked: { textInput.forceActiveFocus(); textInput.openSoftwareInputPanel(); } } } diff --git a/demos/declarative/twitter/TwitterCore/Button.qml b/demos/declarative/twitter/TwitterCore/Button.qml index 9c90c2c..d326c64 100644 --- a/demos/declarative/twitter/TwitterCore/Button.qml +++ b/demos/declarative/twitter/TwitterCore/Button.qml @@ -80,7 +80,7 @@ Item { }, State { name: "Focused" - when: container.focus == true + when: container.activeFocus == true PropertyChanges { target: btnText; color: "#FFFFFF" } } ] diff --git a/demos/declarative/webbrowser/content/UrlInput.qml b/demos/declarative/webbrowser/content/UrlInput.qml index 9992456..4f49821 100644 --- a/demos/declarative/webbrowser/content/UrlInput.qml +++ b/demos/declarative/webbrowser/content/UrlInput.qml @@ -69,7 +69,7 @@ Item { TextInput { id: urlText horizontalAlignment: TextEdit.AlignLeft - font.pixelSize: 14; focusOnPress: true + font.pixelSize: 14; onTextChanged: container.urlChanged() |