diff options
| author | Zeno Albisser <zeno.albisser@nokia.com> | 2010-08-20 06:53:15 -0400 |
|---|---|---|
| committer | Zeno Albisser <zeno.albisser@nokia.com> | 2010-08-20 06:53:15 -0400 |
| commit | 138cdd066b23336bd63b2bee78736adc15c71ade (patch) | |
| tree | 6cbce59ffed25ead297c5d59940cf22bf0f3abfa | |
| parent | 2894c5017bd0d40428eecf3ef63185976e97d578 (diff) | |
fixed swipe in Button.qml
| -rw-r--r-- | multilayer-dashboard/Button.qml | 12 | ||||
| -rw-r--r-- | multilayer-dashboard/ColumnFour.qml | 2 | ||||
| -rw-r--r-- | multilayer-dashboard/ColumnThree.qml | 2 |
3 files changed, 12 insertions, 4 deletions
diff --git a/multilayer-dashboard/Button.qml b/multilayer-dashboard/Button.qml index 1428b3b..3b95487 100644 --- a/multilayer-dashboard/Button.qml +++ b/multilayer-dashboard/Button.qml @@ -81,11 +81,19 @@ Item{ name: "disabled" PropertyChanges { target: background; opacity: 0.3 } PropertyChanges { target: mark; opacity: 0.3 } + PropertyChanges { target: stroke; width: stroke.parent.width * 0.7 } } ] transitions: [ Transition { - PropertyAnimation { duration: 200; property: "opacity" } + from: "*" + to: "disabled" + PropertyAnimation { target: stroke; duration: 1000; property: "width" } + }, + Transition { + from: "disabled" + to: "" + PropertyAnimation { target: stroke; duration: 1000; property: "width" } } ] @@ -132,7 +140,7 @@ Item{ if (gesture.horizontalDirection == SwipeGesture.Right) { button.state = "disabled" } else if (gesture.horizontalDirection == SwipeGesture.Left) { - script: button.state = "" + button.state = "" } } button.handled = false diff --git a/multilayer-dashboard/ColumnFour.qml b/multilayer-dashboard/ColumnFour.qml index 2bc5fab..15997dd 100644 --- a/multilayer-dashboard/ColumnFour.qml +++ b/multilayer-dashboard/ColumnFour.qml @@ -45,7 +45,7 @@ Item { id: myRow width: 160 - height: 340 + height: parent.height property variant reparentWidget: myRow property variant topLevel: myRow diff --git a/multilayer-dashboard/ColumnThree.qml b/multilayer-dashboard/ColumnThree.qml index 74e4b2d..56879ac 100644 --- a/multilayer-dashboard/ColumnThree.qml +++ b/multilayer-dashboard/ColumnThree.qml @@ -45,7 +45,7 @@ Item { id: myRow width: 300 - height: 340 + height: parent.height property variant reparentWidget: myRow property variant topLevel: myRow |