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.
7cc6e34Mirco Müller
qml/Launcher/LauncherDelegate.qml+6−3
compare with xenial
unifiedsplit
@@ -47,8 +47,11 @@ Item {
47 Connections {
47 Connections {
48 target: mainColumn.parent
48 target: mainColumn.parent
49 onPanelMoved: {
49 onPanelMoved: {
50− if (alerting) {
50+ if (alerting && launcherListView.peekingIndex === index) {
51 x = Math.max(units.gu(4.5) - mainColumn.parent.parent.visibleWidth, 0)
51 x = Math.max(units.gu(4.5) - mainColumn.parent.parent.visibleWidth, 0)
52+ if (x === 0) {
53+ launcherListView.unpeeking(index)
54+ }
52 }
55 }
53 }
56 }
54 }
57 }
@@ -56,8 +59,9 @@ Item {
56 onAlertingChanged: {
59 onAlertingChanged: {
57 if (alerting) {
60 if (alerting) {
58 launcherListView.peeking(index)
61 launcherListView.peeking(index)
59− if (launcher.state !== "visible") {
62+ if (launcher.state !== "visible" && launcherListView.peekingIndex === index) {
60 revealing = true
63 revealing = true
64+ hiding = false
61 }
65 }
62 } else {
66 } else {
63 launcherListView.unpeeking(index)
67 launcherListView.unpeeking(index)
@@ -72,7 +76,6 @@ Item {
72 loops: 1
76 loops: 1
73 target: root
77 target: root
74 properties: "x"
78 properties: "x"
75− from: 0
76 to: units.gu(.5) + launcherListView.width * .5
79 to: units.gu(.5) + launcherListView.width * .5
77 duration: UbuntuAnimation.BriskDuration
80 duration: UbuntuAnimation.BriskDuration
78 }
81 }
qml/Launcher/LauncherPanel.qml+2−2
@@ -152,7 +152,7 @@ Rectangle {
152 }
152 }
153
153
154 function peeking(peek) {
154 function peeking(peek) {
155− if (!dragging && panel.visible) {
155+ if (!dragging && 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
@@ -175,7 +175,7 @@ Rectangle {
175 panel.visible = true
175 panel.visible = true
176 launcherListViewItem.clip = false
176 launcherListViewItem.clip = false
177 } else {
177 } else {
178− launcherListViewItem.clip = true
178+ //launcherListViewItem.clip = true
179 }
179 }
180 }
180 }
181
181