git.iko.soy/unity8
on xenial help sign in
fix opacity and actually make it non-live
b86f28bMichael Zanetti
Launcher/LauncherDelegate.qml+3−6
compare with xenial
unifiedsplit
@@ -34,9 +34,6 @@ Item {
34 readonly property int effectiveHeight: Math.cos(angle * Math.PI / 180) * height
34 readonly property int effectiveHeight: Math.cos(angle * Math.PI / 180) * height
35 readonly property real foldedHeight: Math.cos(maxAngle * Math.PI / 180) * height
35 readonly property real foldedHeight: Math.cos(maxAngle * Math.PI / 180) * height
36
36
37− property int itemsBeforeThis: 0
38− property int itemsAfterThis: 0
39−
40 property bool dragging:false
37 property bool dragging:false
41
38
42 readonly property ListView listView: ListView.view
39 readonly property ListView listView: ListView.view
@@ -103,7 +100,7 @@ Item {
103 property variant source: ShaderEffectSource {
100 property variant source: ShaderEffectSource {
104 sourceItem: iconItem
101 sourceItem: iconItem
105 hideSource: true
102 hideSource: true
106− live: true
103+ live: false
107 }
104 }
108
105
109 transform: [
106 transform: [
@@ -157,7 +154,7 @@ Item {
157
154
158 property real totalUnfoldedHeight: listView.itemSize + listView.spacing
155 property real totalUnfoldedHeight: listView.itemSize + listView.spacing
159 property real totalEffectiveHeight: effectiveHeight + listView.spacing
156 property real totalEffectiveHeight: effectiveHeight + listView.spacing
160− property real distanceFromTopEdge: -(listView.contentY + listView.topMargin - itemsBeforeThis*totalUnfoldedHeight)
157+ property real distanceFromTopEdge: -(listView.contentY + listView.topMargin - index*totalUnfoldedHeight)
161 property real distanceFromBottomEdge: listView.height - listView.bottomMargin - (y+height) + listView.contentY
158 property real distanceFromBottomEdge: listView.height - listView.bottomMargin - (y+height) + listView.contentY
162
159
163 property real distanceFromEdge: Math.abs(distanceFromBottomEdge) < Math.abs(distanceFromTopEdge) ? distanceFromBottomEdge : distanceFromTopEdge
160 property real distanceFromEdge: Math.abs(distanceFromBottomEdge) < Math.abs(distanceFromTopEdge) ? distanceFromBottomEdge : distanceFromTopEdge
@@ -224,7 +221,7 @@ Item {
224 return 0;
221 return 0;
225 }
222 }
226
223
227− opacity: {
224+ itemOpacity: {
228 // First/last items are special
225 // First/last items are special
229 if (index == 0 || index == listView.count-1) {
226 if (index == 0 || index == listView.count-1) {
230 if (priv.distanceFromEdge < 0) {
227 if (priv.distanceFromEdge < 0) {
Launcher/LauncherPanel.qml−4
@@ -111,7 +111,6 @@ Item {
111 highlightRangeMode: ListView.ApplyRange
111 highlightRangeMode: ListView.ApplyRange
112 preferredHighlightBegin: (height - itemSize) / 2
112 preferredHighlightBegin: (height - itemSize) / 2
113 preferredHighlightEnd: (height + itemSize) / 2
113 preferredHighlightEnd: (height + itemSize) / 2
114− currentIndex: 0
115
114
116 property int itemSize: width
115 property int itemSize: width
117
116
@@ -132,9 +131,6 @@ Item {
132
131
133 maxAngle: 60
132 maxAngle: 60
134
133
135− itemsBeforeThis: index
136− itemsAfterThis: launcherListView.count - (index+1)
137−
138 onClicked: {
134 onClicked: {
139 root.applicationSelected(launcherModel.get(index).desktopFile);
135 root.applicationSelected(launcherModel.get(index).desktopFile);
140 }
136 }