diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2009-11-05 07:16:29 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2009-11-05 07:16:29 (GMT) |
| commit | 0bc45e6b54f67a3f5e8b7c3b780a124de1d9570d (patch) | |
| tree | 8ecfeef9ac3dc80cfb903dc9008f0db00dc38089 | |
| parent | 31e07c3838b72a208ec2853e6194ebe1692128f3 (diff) | |
| download | Qt-0bc45e6b54f67a3f5e8b7c3b780a124de1d9570d.zip Qt-0bc45e6b54f67a3f5e8b7c3b780a124de1d9570d.tar.gz Qt-0bc45e6b54f67a3f5e8b7c3b780a124de1d9570d.tar.bz2 | |
fix calculator
| -rw-r--r-- | demos/declarative/calculator/calculator.qml | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/demos/declarative/calculator/calculator.qml b/demos/declarative/calculator/calculator.qml index 18ee5b9..54af7ad 100644 --- a/demos/declarative/calculator/calculator.qml +++ b/demos/declarative/calculator/calculator.qml @@ -45,7 +45,7 @@ Rectangle { } Item { - width: 320 + width: 320; height: 160 Item { id: basicButtons @@ -106,23 +106,19 @@ Rectangle { } } - states: [ - State { - name: "Advanced"; when: advancedCheckBox.toggled == true - PropertyChanges { target: basicButtons; x: 0 } - PropertyChanges { target: simpleOperations; y: 32 } - PropertyChanges { target: bksp; opacity: 1 } - PropertyChanges { target: c; x: 69; width: 67 } - PropertyChanges { target: ac; x: 138; width: 67 } - PropertyChanges { target: equals; width: 50 } - PropertyChanges { target: advancedButtons; x: 210; opacity: 1 } - } - ] + states: State { + name: "Advanced"; when: advancedCheckBox.toggled == true + PropertyChanges { target: basicButtons; x: 0 } + PropertyChanges { target: simpleOperations; y: 32 } + PropertyChanges { target: bksp; opacity: 1 } + PropertyChanges { target: c; x: 69; width: 67 } + PropertyChanges { target: ac; x: 138; width: 67 } + PropertyChanges { target: equals; width: 50 } + PropertyChanges { target: advancedButtons; x: 210; opacity: 1 } + } - transitions: [ - Transition { - NumberAnimation { properties: "x,y,width"; easing: "easeOutBounce"; duration: 500 } - NumberAnimation { properties: "opacity"; easing: "easeInOutQuad"; duration: 500 } - } - ] + transitions: Transition { + NumberAnimation { properties: "x,y,width"; easing: "easeOutBounce"; duration: 500 } + NumberAnimation { properties: "opacity"; easing: "easeInOutQuad"; duration: 500 } + } } |