git.iko.soy/unity8
on xenial help sign in
more review comments
commitf1e9b208224d61bbd207c440e29072608dfc13f4 authorNick Dedekind <nick.dedekind@canonical.com> dateThu 9 Oct 2014, 18:36 (12 years ago) parent32c5d4d
4 files changed+4−7
compare with xenial
unifiedsplit
qml/Components/ScrollCalculator.qml−1 qml/Panel/IndicatorItemRow.qml+1−1 qml/Panel/IndicatorsBar.qml+3−2 qml/Panel/IndicatorsMenu.qml−3
qml/Components/ScrollCalculator.qml−1
@@ -67,7 +67,6 @@ Item {
6767 interval: 16
6868 repeat: true
6969
70− property int iter: 0
7170 onTriggered: {
7271 var scrollAmount = scrollArea.baseScrollAmount + scrollArea.maximumScrollAmount * d.progression;
7372 scrollArea.scroll(scrollAmount);
qml/Panel/IndicatorItemRow.qml+1−1
@@ -60,7 +60,7 @@ Item {
6060 var currentItemLateralPosition = root.mapToItem(proposedItem, lateralPosition, 0).x;
6161
6262 // Is the distance into proposed item greater than max buffer?
63− // Poposed item is before current item
63+ // Proposed item is before current item
6464 if (proposedItem.x < currentItem.x) {
6565 bufferExceeded = (proposedItem.width - currentItemLateralPosition) > maximumBufferOffset;
6666 } else { // After
qml/Panel/IndicatorsBar.qml+3−2
@@ -91,6 +91,9 @@ Item {
9191 property real scrollOffset: 0
9292 property real combinedOffset: rowOffset + alignmentAdjustment - scrollOffset
9393
94+ // when the scroll offset changes, we need to reclaculate the relative lateral position
95+ onScrollOffsetChanged: root.lateralPositionChanged()
96+
9497 onInitialItemChanged: {
9598 if (initialItem) {
9699 originalItemWidth = initialItem.width;
@@ -146,8 +149,6 @@ Item {
146149
147150 lateralPosition: {
148151 if (root.lateralPosition == -1) return -1;
149− // just to automatically invoke this calculation when scrolling offset changes
150− var dummyvar = d.scrollOffset + row.width;
151152
152153 var mapped = root.mapToItem(row, root.lateralPosition, 0);
153154 return Math.min(Math.max(mapped.x, 0), row.width);
qml/Panel/IndicatorsMenu.qml−3
@@ -26,7 +26,6 @@ Showable {
2626 property alias hideDragHandle: __hideDragHandle
2727 property alias overFlowWidth: bar.overFlowWidth
2828 property alias verticalVelocityThreashold: yVelocityCalculator.velocityThreashold
29−
3029 property int minimizedPanelHeight: units.gu(3)
3130 property int expandedPanelHeight: units.gu(7)
3231 property real openedHeight: units.gu(71)
@@ -34,14 +33,12 @@ Showable {
3433 readonly property bool fullyOpened: unitProgress >= 1
3534 readonly property bool partiallyOpened: unitProgress > 0 && unitProgress < 1.0
3635 readonly property bool fullyClosed: unitProgress == 0
37−
3836 property bool enableHint: true
3937 property bool contentEnabled: true
4038 property color panelColor: "black"
4139
4240 signal showTapped(point position)
4341
44−
4542 // TODO: Perhaps we need a animation standard for showing/hiding? Each showable seems to
4643 // use its own values. Need to ask design about this.
4744 showAnimation: StandardAnimation {