@@ -87,9 +87,9 @@ Item {
8787
8888 // offset to the intially selected expanded item
8989 property real rowOffset: 0
90− property real rowOffsetAdjustment: 0
90+ property real alignmentAdjustment: 0
9191 property real scrollOffset: 0
92− property real combinedOffset: rowOffset + rowOffsetAdjustment - scrollOffset
92+ property real combinedOffset: rowOffset + alignmentAdjustment - scrollOffset
9393
9494 onInitialItemChanged: {
9595 if (initialItem) {
@@ -101,7 +101,7 @@ Item {
101101 }
102102 }
103103
104− Behavior on rowOffsetAdjustment {
104+ Behavior on alignmentAdjustment {
105105 NumberAnimation { duration: UbuntuAnimation.SnapDuration; easing: UbuntuAnimation.StandardEasing}
106106 }
107107 }
@@ -187,7 +187,7 @@ Item {
187187 repeat: false
188188 onTriggered: {
189189 if (expanded && row.x > 0) {
190− d.rowOffsetAdjustment = -row.x;
190+ d.alignmentAdjustment = -row.x;
191191 }
192192 }
193193 }
@@ -199,7 +199,7 @@ Item {
199199 PropertyChanges {
200200 target: d
201201 rowOffset: 0
202− rowOffsetAdjustment: 0
202+ alignmentAdjustment: 0
203203 scrollOffset: 0
204204 restoreEntryValues: false
205205 }
@@ -215,13 +215,10 @@ Item {
215215 if (distanceFromRight - initialItem.width <= 0) return 0;
216216
217217 var rowOffset = distanceFromRight - originalDistanceFromRight;
218− return rowOffset;
219− }
220− rowOffsetAdjustment: {
221218 if (originalDistanceFromRight + originalItemWidth/2 > rowContainer.width) {
222− return originalItemWidth;
219+ rowOffset = rowOffset + originalItemWidth;
223220 }
224− return 0;
221+ return rowOffset;
225222 }
226223 }
227224 // keep flickable inline with row
@@ -264,7 +261,7 @@ Item {
264261 from: "moved"
265262 to: "minimized"
266263 SequentialAnimation {
267− PropertyAction { target: d; properties: "rowOffset, rowOffsetAdjustment, scrollOffset" }
264+ PropertyAction { target: d; properties: "rowOffset, alignmentAdjustment, scrollOffset" }
268265 PropertyAnimation {
269266 target: row;
270267 properties: "anchors.rightMargin"