diff options
author | wang_zhiqiang <wang_zhiqiang@dl.cn.nexty-ele.com> | 2018-10-17 08:56:06 +0800 |
---|---|---|
committer | wang_zhiqiang <wang_zhiqiang@dl.cn.nexty-ele.com> | 2018-10-17 08:56:06 +0800 |
commit | 56607817112410d7a25cddc81aa7d652fc536cb9 (patch) | |
tree | 5511f4d7c0d99b4325629ad74f5929f1d2389adc /launcher/qml/IconItem.qml | |
parent | c225d3fe5d0d9354fb368b793e798403ab17a71f (diff) |
make applist flickablesandbox/wangzhiqiang/some_improve
Change-Id: I2a2a4a56b0d3d3e635f73cc7519171d67182c893
Diffstat (limited to 'launcher/qml/IconItem.qml')
-rw-r--r-- | launcher/qml/IconItem.qml | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/launcher/qml/IconItem.qml b/launcher/qml/IconItem.qml index c15a3da..8171bef 100644 --- a/launcher/qml/IconItem.qml +++ b/launcher/qml/IconItem.qml @@ -22,13 +22,17 @@ Item { id: main width: 320 height: 320 + x: main.x + y: main.y property string icon: model.icon Item { id: container parent: loc - x: main.x - y: main.y +// x: main.x +// y: main.y + x: main.x - loc.r_mouseX + loc.mouseX + y: main.y - loc.r_mouseY + loc.mouseY width: main.width height: main.height @@ -85,8 +89,8 @@ Item { text: qsTr(model.name.toUpperCase()) } - Behavior on x { enabled: item.state !== 'active'; NumberAnimation { duration: 400; easing.type: Easing.OutCubic } } - Behavior on y { enabled: item.state !== 'active'; NumberAnimation { duration: 400; easing.type: Easing.OutCubic } } + Behavior on x { enabled: item.state !== 'active' && loc.flicking == false ; NumberAnimation { duration: 400; easing.type: Easing.OutCubic } } + Behavior on y { enabled: item.state !== 'active' && loc.flicking == false ; NumberAnimation { duration: 400; easing.type: Easing.OutCubic } } SequentialAnimation on rotation { NumberAnimation { to: 5; duration: 100 } NumberAnimation { to: -5; duration: 200 } @@ -112,6 +116,8 @@ Item { target: container scale: 0.85 opacity: 0.75 + x: main.x - loc.r_mouseX + loc.mouseX + y: main.y - loc.r_mouseY + loc.mouseY } } ] |