git.iko.soy/unity8
on xenial help sign in
Fix some peeking edge-cases where more than one wiggling icon peeks out, when the launcher is moved.
commit7cc6e34eae51eef7383993fd1107b8e80b2cd1d6 authorMirco Müller <mirco.mueller@ubuntu.com> dateThu 18 Jun 2015, 11:50 (11 years ago) parentbab7fe7
2 files changed+8−5
compare with xenial
unifiedsplit
qml/Launcher/LauncherDelegate.qml+6−3 qml/Launcher/LauncherPanel.qml+2−2
qml/Launcher/LauncherDelegate.qml+6−3
@@ -47,8 +47,11 @@ Item {
4747 Connections {
4848 target: mainColumn.parent
4949 onPanelMoved: {
50− if (alerting) {
50+ if (alerting && launcherListView.peekingIndex === index) {
5151 x = Math.max(units.gu(4.5) - mainColumn.parent.parent.visibleWidth, 0)
52+ if (x === 0) {
53+ launcherListView.unpeeking(index)
54+ }
5255 }
5356 }
5457 }
@@ -56,8 +59,9 @@ Item {
5659 onAlertingChanged: {
5760 if (alerting) {
5861 launcherListView.peeking(index)
59− if (launcher.state !== "visible") {
62+ if (launcher.state !== "visible" && launcherListView.peekingIndex === index) {
6063 revealing = true
64+ hiding = false
6165 }
6266 } else {
6367 launcherListView.unpeeking(index)
@@ -72,7 +76,6 @@ Item {
7276 loops: 1
7377 target: root
7478 properties: "x"
75− from: 0
7679 to: units.gu(.5) + launcherListView.width * .5
7780 duration: UbuntuAnimation.BriskDuration
7881 }
qml/Launcher/LauncherPanel.qml+2−2
@@ -152,7 +152,7 @@ Rectangle {
152152 }
153153
154154 function peeking(peek) {
155− if (!dragging && panel.visible) {
155+ if (!dragging && launcher.visibleWidth > 0) {
156156 priv.moveToIndexYFrom = contentY
157157 positionViewAtIndex(peek, ListView.Center)
158158 priv.moveToIndexYTo = contentY
@@ -175,7 +175,7 @@ Rectangle {
175175 panel.visible = true
176176 launcherListViewItem.clip = false
177177 } else {
178− launcherListViewItem.clip = true
178+ //launcherListViewItem.clip = true
179179 }
180180 }
181181