git.iko.soy/unity8
on xenial help sign in
better adjustments
32c5d4dNick Dedekind
qml/Panel/IndicatorsBar.qml+8−11
compare with xenial
unifiedsplit
@@ -87,9 +87,9 @@ Item {
87
87
88 // offset to the intially selected expanded item
88 // offset to the intially selected expanded item
89 property real rowOffset: 0
89 property real rowOffset: 0
90− property real rowOffsetAdjustment: 0
90+ property real alignmentAdjustment: 0
91 property real scrollOffset: 0
91 property real scrollOffset: 0
92− property real combinedOffset: rowOffset + rowOffsetAdjustment - scrollOffset
92+ property real combinedOffset: rowOffset + alignmentAdjustment - scrollOffset
93
93
94 onInitialItemChanged: {
94 onInitialItemChanged: {
95 if (initialItem) {
95 if (initialItem) {
@@ -101,7 +101,7 @@ Item {
101 }
101 }
102 }
102 }
103
103
104− Behavior on rowOffsetAdjustment {
104+ Behavior on alignmentAdjustment {
105 NumberAnimation { duration: UbuntuAnimation.SnapDuration; easing: UbuntuAnimation.StandardEasing}
105 NumberAnimation { duration: UbuntuAnimation.SnapDuration; easing: UbuntuAnimation.StandardEasing}
106 }
106 }
107 }
107 }
@@ -187,7 +187,7 @@ Item {
187 repeat: false
187 repeat: false
188 onTriggered: {
188 onTriggered: {
189 if (expanded && row.x > 0) {
189 if (expanded && row.x > 0) {
190− d.rowOffsetAdjustment = -row.x;
190+ d.alignmentAdjustment = -row.x;
191 }
191 }
192 }
192 }
193 }
193 }
@@ -199,7 +199,7 @@ Item {
199 PropertyChanges {
199 PropertyChanges {
200 target: d
200 target: d
201 rowOffset: 0
201 rowOffset: 0
202− rowOffsetAdjustment: 0
202+ alignmentAdjustment: 0
203 scrollOffset: 0
203 scrollOffset: 0
204 restoreEntryValues: false
204 restoreEntryValues: false
205 }
205 }
@@ -215,13 +215,10 @@ Item {
215 if (distanceFromRight - initialItem.width <= 0) return 0;
215 if (distanceFromRight - initialItem.width <= 0) return 0;
216
216
217 var rowOffset = distanceFromRight - originalDistanceFromRight;
217 var rowOffset = distanceFromRight - originalDistanceFromRight;
218− return rowOffset;
219− }
220− rowOffsetAdjustment: {
221 if (originalDistanceFromRight + originalItemWidth/2 > rowContainer.width) {
218 if (originalDistanceFromRight + originalItemWidth/2 > rowContainer.width) {
222− return originalItemWidth;
219+ rowOffset = rowOffset + originalItemWidth;
223 }
220 }
224− return 0;
221+ return rowOffset;
225 }
222 }
226 }
223 }
227 // keep flickable inline with row
224 // keep flickable inline with row
@@ -264,7 +261,7 @@ Item {
264 from: "moved"
261 from: "moved"
265 to: "minimized"
262 to: "minimized"
266 SequentialAnimation {
263 SequentialAnimation {
267− PropertyAction { target: d; properties: "rowOffset, rowOffsetAdjustment, scrollOffset" }
264+ PropertyAction { target: d; properties: "rowOffset, alignmentAdjustment, scrollOffset" }
268 PropertyAnimation {
265 PropertyAnimation {
269 target: row;
266 target: row;
270 properties: "anchors.rightMargin"
267 properties: "anchors.rightMargin"