f1e9b20 · unity8 · git.iko.soy

qml/Components/ScrollCalculator.qml−1

compare with xenial

unifiedsplit

@@ -67,7 +67,6 @@ Item {

67 interval: 16

68 repeat: true

69

70− property int iter: 0

71 onTriggered: {

70 onTriggered: {

72 var scrollAmount = scrollArea.baseScrollAmount + scrollArea.maximumScrollAmount * d.progression;

71 var scrollAmount = scrollArea.baseScrollAmount + scrollArea.maximumScrollAmount * d.progression;

73 scrollArea.scroll(scrollAmount);

72 scrollArea.scroll(scrollAmount);

qml/Panel/IndicatorItemRow.qml+1−1

@@ -60,7 +60,7 @@ Item {

60 var currentItemLateralPosition = root.mapToItem(proposedItem, lateralPosition, 0).x;

61

62 // Is the distance into proposed item greater than max buffer?

63− // Poposed item is before current item

63+ // Proposed item is before current item

64 if (proposedItem.x < currentItem.x) {

65 bufferExceeded = (proposedItem.width - currentItemLateralPosition) > maximumBufferOffset;

66 } else { // After

qml/Panel/IndicatorsBar.qml+3−2

@@ -91,6 +91,9 @@ Item {

91 property real scrollOffset: 0

92 property real combinedOffset: rowOffset + alignmentAdjustment - scrollOffset

93

94+ // when the scroll offset changes, we need to reclaculate the relative lateral position

95+ onScrollOffsetChanged: root.lateralPositionChanged()

96+

94 onInitialItemChanged: {

97 onInitialItemChanged: {

95 if (initialItem) {

98 if (initialItem) {

96 originalItemWidth = initialItem.width;

99 originalItemWidth = initialItem.width;

@@ -146,8 +149,6 @@ Item {

146

149

147 lateralPosition: {

150 lateralPosition: {

148 if (root.lateralPosition == -1) return -1;

151 if (root.lateralPosition == -1) return -1;

149− // just to automatically invoke this calculation when scrolling offset changes

150− var dummyvar = d.scrollOffset + row.width;

151

152

152 var mapped = root.mapToItem(row, root.lateralPosition, 0);

153 var mapped = root.mapToItem(row, root.lateralPosition, 0);

153 return Math.min(Math.max(mapped.x, 0), row.width);

154 return Math.min(Math.max(mapped.x, 0), row.width);

qml/Panel/IndicatorsMenu.qml−3

@@ -26,7 +26,6 @@ Showable {

26 property alias hideDragHandle: __hideDragHandle

27 property alias overFlowWidth: bar.overFlowWidth

28 property alias verticalVelocityThreashold: yVelocityCalculator.velocityThreashold

29−

30 property int minimizedPanelHeight: units.gu(3)

29 property int minimizedPanelHeight: units.gu(3)

31 property int expandedPanelHeight: units.gu(7)

30 property int expandedPanelHeight: units.gu(7)

32 property real openedHeight: units.gu(71)

31 property real openedHeight: units.gu(71)

@@ -34,14 +33,12 @@ Showable {

34 readonly property bool fullyOpened: unitProgress >= 1

33 readonly property bool fullyOpened: unitProgress >= 1

35 readonly property bool partiallyOpened: unitProgress > 0 && unitProgress < 1.0

34 readonly property bool partiallyOpened: unitProgress > 0 && unitProgress < 1.0

36 readonly property bool fullyClosed: unitProgress == 0

35 readonly property bool fullyClosed: unitProgress == 0

37−

38 property bool enableHint: true

36 property bool enableHint: true

39 property bool contentEnabled: true

37 property bool contentEnabled: true

40 property color panelColor: "black"

38 property color panelColor: "black"

41

39

42 signal showTapped(point position)

40 signal showTapped(point position)

43

41

44−

45 // TODO: Perhaps we need a animation standard for showing/hiding? Each showable seems to

42 // TODO: Perhaps we need a animation standard for showing/hiding? Each showable seems to

46 // use its own values. Need to ask design about this.

43 // use its own values. Need to ask design about this.

47 showAnimation: StandardAnimation {

44 showAnimation: StandardAnimation {