git.iko.soy/unity8
on xenial help sign in
handle dropIndicator's state in the other states too
31ef595Michael Zanetti
Launcher/LauncherPanel.qml+8−4
compare with xenial
unifiedsplit
@@ -133,13 +133,11 @@ Item {
133 property bool dragging: false
133 property bool dragging: false
134
134
135 ThinDivider {
135 ThinDivider {
136+ id: dropIndicator
136 objectName: "dropIndicator"
137 objectName: "dropIndicator"
137 anchors.centerIn: parent
138 anchors.centerIn: parent
138 width: parent.width + mainColumn.anchors.leftMargin + mainColumn.anchors.rightMargin
139 width: parent.width + mainColumn.anchors.leftMargin + mainColumn.anchors.rightMargin
139− opacity: parent.dragging ? 1 : 0
140+ opacity: 0
140− Behavior on opacity {
141− NumberAnimation { duration: UbuntuAnimation.FastDuration }
142− }
143 }
141 }
144
142
145 states: [
143 states: [
@@ -159,6 +157,10 @@ Item {
159 height: units.gu(1)
157 height: units.gu(1)
160 itemOpacity: 0
158 itemOpacity: 0
161 }
159 }
160+ PropertyChanges {
161+ target: dropIndicator
162+ opacity: 1
163+ }
162 },
164 },
163 State {
165 State {
164 name: "expanded"
166 name: "expanded"
@@ -195,10 +197,12 @@ Item {
195 from: "selected"
197 from: "selected"
196 to: "dragging"
198 to: "dragging"
197 UbuntuNumberAnimation { properties: "height" }
199 UbuntuNumberAnimation { properties: "height" }
200+ NumberAnimation { target: dropIndicator; properties: "opacity"; duration: UbuntuAnimation.FastDuration }
198 },
201 },
199 Transition {
202 Transition {
200 from: "dragging"
203 from: "dragging"
201 to: "*"
204 to: "*"
205+ NumberAnimation { target: dropIndicator; properties: "opacity"; duration: UbuntuAnimation.FastDuration }
202 NumberAnimation { properties: "itemOpacity"; duration: UbuntuAnimation.BriskDuration }
206 NumberAnimation { properties: "itemOpacity"; duration: UbuntuAnimation.BriskDuration }
203 SequentialAnimation {
207 SequentialAnimation {
204 UbuntuNumberAnimation { properties: "height" }
208 UbuntuNumberAnimation { properties: "height" }