on xenial help sign in
fixed indicator realignment
ed84f97Nick Dedekind
qml/Panel/IndicatorsBar.qml+11−2
@@ -91,9 +91,18 @@ Item {
91 flickable.resetContentXComponents();
91 flickable.resetContentXComponents();
92
92
93 if (expanded && !flickable.moving) {
93 if (expanded && !flickable.moving) {
94+
94− // gap between left and row?
95+ // gap between left and row?
95− if (row.width > flickable.width && flickable.contentX < 0) {
96+ if (flickable.contentX < 0) {
96 d.alignmentAdjustment += flickable.contentX;
97 d.alignmentAdjustment += flickable.contentX;
98+ // gap between right and row?
99+ } else if (flickable.contentX + flickable.width > row.width) {
100+ // row width is less than flickable
101+ if (row.width < flickable.width) {
102+ d.alignmentAdjustment += flickable.contentX;
103+ } else {
104+ d.alignmentAdjustment += ((flickable.contentX + flickable.width) - row.width);
105+ }
97 // current item overlap on left
106 // current item overlap on left
98 } else if (row.currentItem && row.currentItem.x < flickable.contentX) {
107 } else if (row.currentItem && row.currentItem.x < flickable.contentX) {
99 d.alignmentAdjustment -= (row.currentItem.x - flickable.contentX);
108 d.alignmentAdjustment -= (row.currentItem.x - flickable.contentX);