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.
4853336Mirco Müller
qml/Launcher/LauncherDelegate.qml+16−7
compare with xenial
unifiedsplit
@@ -80,14 +80,23 @@ Item {
80 duration: UbuntuAnimation.BriskDuration
80 duration: UbuntuAnimation.BriskDuration
81 }
81 }
82
82
83− UbuntuNumberAnimation {
83+ SequentialAnimation {
84 running: hiding
84 running: hiding
85+
86+ UbuntuNumberAnimation {
85− alwaysRunToEnd: true
87+ alwaysRunToEnd: true
86− loops: 1
88+ loops: 1
87− target: root
89+ target: root
88− properties: "x"
90+ properties: "x"
89− to: 0
91+ to: 0
90− duration: UbuntuAnimation.BriskDuration
92+ duration: UbuntuAnimation.BriskDuration
93+ }
94+
95+ UbuntuNumberAnimation {
96+ target: launcherListViewItem
97+ property: "clip"
98+ to: 1
99+ }
91 }
100 }
92
101
93 QtObject {
102 QtObject {
qml/Launcher/LauncherPanel.qml+1−3
@@ -152,7 +152,7 @@ Rectangle {
152 }
152 }
153
153
154 function peeking(peek) {
154 function peeking(peek) {
155− if (!dragging && launcher.visibleWidth > 0) {
155+ if (!dragging && (peekingIndex === -1 || launcher.visibleWidth > 0)) {
156 priv.moveToIndexYFrom = contentY
156 priv.moveToIndexYFrom = contentY
157 positionViewAtIndex(peek, ListView.Center)
157 positionViewAtIndex(peek, ListView.Center)
158 priv.moveToIndexYTo = contentY
158 priv.moveToIndexYTo = contentY
@@ -174,8 +174,6 @@ Rectangle {
174 if (peekingIndex !== -1) {
174 if (peekingIndex !== -1) {
175 panel.visible = true
175 panel.visible = true
176 launcherListViewItem.clip = false
176 launcherListViewItem.clip = false
177− } else {
178− //launcherListViewItem.clip = true
179 }
177 }
180 }
178 }
181
179