@@ -195,20 +195,6 @@ Showable {
195195 enabled: contentEnabled
196196 visibleIndicators: indicatorRow.visibleIndicators
197197
198− Connections {
199− property bool enableIndexChangeSignal: true
200−
201− target: enableIndexChangeSignal ? indicatorRow : null
202− onCurrentItemIndexChanged: {
203− var oldActive = enableIndexChangeSignal;
204− enableIndexChangeSignal = false;
205−
206− menuContent.setCurrentMenuIndex(indicatorRow.currentItemIndex);
207−
208− enableIndexChangeSignal = oldActive;
209− }
210− }
211−
212198 //small shadow gradient at bottom of menu
213199 Rectangle {
214200 anchors {
@@ -279,20 +265,6 @@ Showable {
279265 state: indicators.state
280266 unitProgress: indicators.unitProgress
281267
282− Connections {
283− property bool enableIndexChangeSignal: true
284−
285− target: enableIndexChangeSignal ? menuContent : null
286− onCurrentMenuIndexChanged: {
287− var oldActive = enableIndexChangeSignal;
288− enableIndexChangeSignal = false;
289−
290− indicatorRow.setCurrentItem(menuContent.currentMenuIndex);
291−
292− enableIndexChangeSignal = oldActive;
293− }
294− }
295−
296268 EdgeDragArea {
297269 id: rowDragArea
298270 anchors.fill: indicatorRow
@@ -341,15 +313,45 @@ Showable {
341313 }
342314 }
343315
344− property var activeDragHandle: showDragHandle.dragging ? showDragHandle : hideDragHandle.dragging ? hideDragHandle : null
316+ QtObject {
317+ id: d
318+ property bool enableIndexChangeSignal: true
319+ property var activeDragHandle: showDragHandle.dragging ? showDragHandle : hideDragHandle.dragging ? hideDragHandle : null
320+ }
321+
322+ Connections {
323+ target: menuContent
324+ onCurrentMenuIndexChanged: {
325+ var oldActive = d.enableIndexChangeSignal;
326+ if (!oldActive) return;
327+ d.enableIndexChangeSignal = false;
328+
329+ indicatorRow.setCurrentItem(menuContent.currentMenuIndex);
330+
331+ d.enableIndexChangeSignal = oldActive;
332+ }
333+ }
334+
335+ Connections {
336+ target: indicatorRow
337+ onCurrentItemIndexChanged: {
338+ var oldActive = d.enableIndexChangeSignal;
339+ if (!oldActive) return;
340+ d.enableIndexChangeSignal = false;
341+
342+ menuContent.setCurrentMenuIndex(indicatorRow.currentItemIndex);
343+
344+ d.enableIndexChangeSignal = oldActive;
345+ }
346+ }
345347 // connections to the active drag handle
346348 Connections {
347− target: activeDragHandle
349+ target: d.activeDragHandle
348350 onTouchXChanged: {
349− indicators.calculateCurrentItem(activeDragHandle.touchX, true);
351+ indicators.calculateCurrentItem(d.activeDragHandle.touchX, true);
350352 }
351353 onTouchSceneYChanged: {
352− yVelocityCalculator.trackedPosition = activeDragHandle.touchSceneY;
354+ yVelocityCalculator.trackedPosition = d.activeDragHandle.touchSceneY;
353355 }
354356 }
355357
@@ -403,8 +405,8 @@ Showable {
403405 }
404406 StateChangeScript {
405407 script: {
406− if (activeDragHandle) {
407− calculateCurrentItem(activeDragHandle.touchX, false);
408+ if (d.activeDragHandle) {
409+ calculateCurrentItem(d.activeDragHandle.touchX, false);
408410 }
409411 }
410412 }