git.iko.soy/unity8
on xenial help sign in
Make sure the clip-property of launcherListViewItem is correctly reset after the peeking icon moved back into the launcher's boundaries.
commit48533362f253ebd8180535a43426fc66b0a8e954 authorMirco Müller <mirco.mueller@ubuntu.com> dateThu 18 Jun 2015, 12:35 (11 years ago) parent7cc6e34
2 files changed+17−10
compare with xenial
unifiedsplit
qml/Launcher/LauncherDelegate.qml+16−7 qml/Launcher/LauncherPanel.qml+1−3
qml/Launcher/LauncherDelegate.qml+16−7
@@ -80,14 +80,23 @@ Item {
8080 duration: UbuntuAnimation.BriskDuration
8181 }
8282
83− UbuntuNumberAnimation {
83+ SequentialAnimation {
8484 running: hiding
85− alwaysRunToEnd: true
86− loops: 1
87− target: root
88− properties: "x"
89− to: 0
90− duration: UbuntuAnimation.BriskDuration
85+
86+ UbuntuNumberAnimation {
87+ alwaysRunToEnd: true
88+ loops: 1
89+ target: root
90+ properties: "x"
91+ to: 0
92+ duration: UbuntuAnimation.BriskDuration
93+ }
94+
95+ UbuntuNumberAnimation {
96+ target: launcherListViewItem
97+ property: "clip"
98+ to: 1
99+ }
91100 }
92101
93102 QtObject {
qml/Launcher/LauncherPanel.qml+1−3
@@ -152,7 +152,7 @@ Rectangle {
152152 }
153153
154154 function peeking(peek) {
155− if (!dragging && launcher.visibleWidth > 0) {
155+ if (!dragging && (peekingIndex === -1 || launcher.visibleWidth > 0)) {
156156 priv.moveToIndexYFrom = contentY
157157 positionViewAtIndex(peek, ListView.Center)
158158 priv.moveToIndexYTo = contentY
@@ -174,8 +174,6 @@ Rectangle {
174174 if (peekingIndex !== -1) {
175175 panel.visible = true
176176 launcherListViewItem.clip = false
177− } else {
178− //launcherListViewItem.clip = true
179177 }
180178 }
181179