@@ -83,15 +83,6 @@ Item {
8383 }
8484 }
8585
86− contentX: {
87− var cX = row.width - flickable.width > 0 ? row.width - flickable.width : 0
88− if (cX !== 0) {
89− cX -= d.rowOffset;
90− }
91− return cX;
92− }
93− Behavior on contentX { enabled: !expanded; NumberAnimation { duration: 1000; easing: UbuntuAnimation.StandardEasing } }
94−
9586 IndicatorsRow {
9687 id: row
9788 enabled: false
@@ -99,15 +90,10 @@ Item {
9990 top: parent.top
10091 bottom: parent.bottom
10192 right: parent.right
102− rightMargin: {
103− var rM = row.width - flickable.width < 0 ? row.width - flickable.width : 0;
104− if (rM !== 0) {
105− rM -= d.rowOffset;
106− }
107− return rM;
108− }
10993 }
11094 }
95+
96+ onContentXChanged: console.log("contentX: ", contentX)
11197 }
11298
11399 states: [
@@ -118,10 +104,19 @@ Item {
118104 target: d
119105 rowOffset: 0
120106 }
107+ PropertyChanges {
108+ target: flickable
109+ contentX: row.width - flickable.width > 0 ? row.width - flickable.width : 0
110+ }
111+ PropertyChanges {
112+ target: row
113+ anchors.rightMargin: row.width - flickable.width < 0 ? row.width - flickable.width : 0
114+ }
121115 },
122116 State {
123117 name: "expanded"
124118 when: expanded
119+
125120 PropertyChanges {
126121 target: d
127122 rowOffset: {
@@ -132,13 +127,35 @@ Item {
132127 return rowOffset;
133128 }
134129 }
130+ PropertyChanges {
131+ target: flickable
132+ contentX: {
133+ var cX = row.width - flickable.width > 0 ? row.width - flickable.width : 0
134+ if (cX !== 0) {
135+ cX -= d.rowOffset;
136+ }
137+ return cX;
138+ }
139+ }
140+ PropertyChanges {
141+ target: row
142+ anchors.rightMargin: {
143+ var rM = row.width - flickable.width < 0 ? row.width - flickable.width : 0;
144+ if (rM !== 0) {
145+ rM -= d.rowOffset;
146+ }
147+ return rM;
148+ }
149+ }
135150 }
136151 ]
137152
138153 transitions: [
139154 Transition {
140155 to: "minimized"
141− PropertyAnimation { target: d; properties: "rowOffset"; duration: 1000; easing: UbuntuAnimation.StandardEasing }
156+ PropertyAction { target: d; properties: "rowOffset" }
157+ PropertyAnimation { target: flickable; properties: "contentX"; duration: 1000; easing: UbuntuAnimation.StandardEasing }
158+ PropertyAnimation { target: row; properties: "anchors.rightMargin"; duration: 1000; easing: UbuntuAnimation.StandardEasing }
142159 }
143160 ]
144161}