diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-12-19 11:04:37 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-12-19 18:35:00 +0000 |
| commit | 6b1bc337410dcfcafc6ceecaa268464f6214ea33 (patch) | |
| tree | 98cdfd8dd2f0d7e019f29512395446f6d6ef949b /src/imports | |
| parent | 8f5b44ecd12eebd26500b4ec02c29ce9e9c004b5 (diff) | |
Rename Popup transitions
Use Android-inspired enter & exit, which eliminates the need of using
a "transition" suffix, and also less prone to appear in auto-completion
when new users try to open/show/close/hide popups.
Change-Id: I3a448d3e9be33fbfffbf08488858aa63a70233f2
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/controls/material/Menu.qml | 4 | ||||
| -rw-r--r-- | src/imports/controls/plugins.qmltypes | 4 | ||||
| -rw-r--r-- | src/imports/templates/plugins.qmltypes | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/imports/controls/material/Menu.qml b/src/imports/controls/material/Menu.qml index 828fa14e..4523fc26 100644 --- a/src/imports/controls/material/Menu.qml +++ b/src/imports/controls/material/Menu.qml @@ -43,13 +43,13 @@ import QtGraphicalEffects 1.0 T.Menu { id: control - showTransition: Transition { + enter: Transition { // grow_fade_in NumberAnimation { property: "scale"; from: 0.9; to: 1.0; easing.type: Easing.OutQuint; duration: 220 } NumberAnimation { property: "opacity"; from: 0.0; to: 1.0; easing.type: Easing.OutCubic; duration: 150 } } - hideTransition: Transition { + exit: Transition { // shrink_fade_out NumberAnimation { property: "scale"; from: 1.0; to: 0.9; easing.type: Easing.OutQuint; duration: 220 } NumberAnimation { property: "opacity"; from: 1.0; to: 0.0; easing.type: Easing.OutCubic; duration: 150 } diff --git a/src/imports/controls/plugins.qmltypes b/src/imports/controls/plugins.qmltypes index 7300e935..518a9b6c 100644 --- a/src/imports/controls/plugins.qmltypes +++ b/src/imports/controls/plugins.qmltypes @@ -515,8 +515,8 @@ Module { Property { name: "focus"; type: "bool" } Property { name: "modal"; type: "bool" } Property { name: "visible"; type: "bool"; isReadonly: true } - Property { name: "showTransition"; type: "QQuickTransition"; isPointer: true } - Property { name: "hideTransition"; type: "QQuickTransition"; isPointer: true } + Property { name: "enter"; type: "QQuickTransition"; isPointer: true } + Property { name: "exit"; type: "QQuickTransition"; isPointer: true } Signal { name: "pressedOutside" } Signal { name: "releasedOutside" } Signal { name: "clickedOutside" } diff --git a/src/imports/templates/plugins.qmltypes b/src/imports/templates/plugins.qmltypes index 37125e54..e96c09d9 100644 --- a/src/imports/templates/plugins.qmltypes +++ b/src/imports/templates/plugins.qmltypes @@ -509,8 +509,8 @@ Module { Property { name: "focus"; type: "bool" } Property { name: "modal"; type: "bool" } Property { name: "visible"; type: "bool"; isReadonly: true } - Property { name: "showTransition"; type: "QQuickTransition"; isPointer: true } - Property { name: "hideTransition"; type: "QQuickTransition"; isPointer: true } + Property { name: "enter"; type: "QQuickTransition"; isPointer: true } + Property { name: "exit"; type: "QQuickTransition"; isPointer: true } Signal { name: "pressedOutside" } Signal { name: "releasedOutside" } Signal { name: "clickedOutside" } |