5aa12fa · unity8 · git.iko.soy

debian/changelog+6

compare with xenial

unifiedsplit

@@ -1,3 +1,9 @@

1+unity8 (8.17+ubports2) xenial; urgency=medium

2+

3+ * Fix for https://github.com/ubports/ubuntu-touch/issues/624

4+

5+ -- Dalton Durst <dalton@ubports.com> Fri, 1 Jun 2018 16:14:11 -0500

6+

1unity8 (8.17+ubports1) UNRELEASED; urgency=medium

7unity8 (8.17+ubports1) UNRELEASED; urgency=medium

2

8

3 * No change rebuild to generate sources in ubports repo

9 * No change rebuild to generate sources in ubports repo

plugins/Dash/listviewwithpageheader.cpp+3−5

@@ -1141,11 +1141,10 @@ void ListViewWithPageHeader::contentYAnimationRunningChanged(bool running)

1141 }

1142}

1143

1144−/*

1145−void ListViewWithPageHeader::itemGeometryChanged(QQuickItem *item, const QRectF &newGeometry, const QRectF &oldGeometry)

1144+void ListViewWithPageHeader::itemGeometryChanged(QQuickItem *item, QQuickGeometryChange change, const QRectF &oldGeometry)

1146{

1145{

1146+ if (change.heightChange()) {

1147− const qreal heightDiff = newGeometry.height() - oldGeometry.height();

1147+ const qreal heightDiff = height() - oldGeometry.height();

1148− if (heightDiff != 0) {

1149 if (!m_visibleItems.isEmpty()) {

1148 if (!m_visibleItems.isEmpty()) {

1150 ListItem *firstItem = m_visibleItems.first();

1149 ListItem *firstItem = m_visibleItems.first();

1151 const auto prevFirstItemY = firstItem->y();

1150 const auto prevFirstItemY = firstItem->y();

@@ -1166,7 +1165,6 @@ void ListViewWithPageHeader::itemGeometryChanged(QQuickItem *item, const QRectF

1166 m_contentHeightDirty = true;

1165 m_contentHeightDirty = true;

1167 }

1166 }

1168}

1167}

1169−*/

1170

1168

1171void ListViewWithPageHeader::itemImplicitHeightChanged(QQuickItem *item)

1169void ListViewWithPageHeader::itemImplicitHeightChanged(QQuickItem *item)

1172{

1170{

plugins/Dash/listviewwithpageheader.h+1−1

@@ -116,7 +116,7 @@ protected:

116 void viewportMoved(Qt::Orientations orient) override;

117 qreal minYExtent() const override;

118 qreal maxYExtent() const override;

119− //void itemGeometryChanged(QQuickItem *item, const QRectF &newGeometry, const QRectF &oldGeometry) override;

119+ void itemGeometryChanged(QQuickItem *item, QQuickGeometryChange change, const QRectF &oldGeometry) override;

120 void itemImplicitHeightChanged(QQuickItem *item) override;

121 void updatePolish() override;

122

plugins/Dash/verticaljournal.cpp+6−8

@@ -271,11 +271,9 @@ void VerticalJournal::processModelRemoves(const QVector<QQmlChangeSet::Change> &

271 }

272}

273

274−

275−//void VerticalJournal::itemGeometryChanged(QQuickItem * /*item*/, const QRectF &newGeometry, const QRectF &oldGeometry)

274+void VerticalJournal::itemGeometryChanged(QQuickItem * /*item*/, QQuickGeometryChange change, const QRectF &)

276−//{

275+{

277−// const qreal heightDiff = newGeometry.height() - oldGeometry.height();

276+ if (change.verticalChange()) {

278−// if (heightDiff != 0) {

279−// relayout();

277+ relayout();

280−// }

278+ }

281−//}

279+}

plugins/Dash/verticaljournal.h+1−1

@@ -66,7 +66,7 @@ public:

66 void setColumnWidth(qreal columnWidth);

67

68protected:

69−// void itemGeometryChanged(QQuickItem *item, const QRectF &newGeometry, const QRectF &oldGeometry) override;

69+ void itemGeometryChanged(QQuickItem * /*item*/, QQuickGeometryChange change, const QRectF &oldGeometry) override;

70

71Q_SIGNALS:

72 void columnWidthChanged();

tests/plugins/CMakeLists.txt+1−1

@@ -8,5 +8,5 @@ add_subdirectory(LightDM)

8add_subdirectory(SessionBroadcast)

9add_subdirectory(Ubuntu)

10add_subdirectory(Unity)

11−#add_subdirectory(Utils) #FIXME broken with qt 5.9

11+add_subdirectory(Utils)

12add_subdirectory(Wizard)

tests/plugins/Ubuntu/CMakeLists.txt+1−1

@@ -1 +1 @@

1−#add_subdirectory(Gestures) #FIXME broken with qt 5.9

1+add_subdirectory(Gestures)

tests/plugins/Ubuntu/Gestures/GestureTest.cpp+1−1

@@ -107,7 +107,7 @@ void GestureTest::sendTouch(qint64 timestamp, int id, QPointF pos,

107 QCoreApplication::sendEvent(m_view, &touchEvent);

108

109 QQuickWindowPrivate *windowPrivate = QQuickWindowPrivate::get(m_view);

110− windowPrivate->flushDelayedTouchEvent();

110+ windowPrivate->flushFrameSynchronousEvents();

111}

112

113void GestureTest::passTime(qint64 timeSpanMs)

tests/plugins/Ubuntu/Gestures/tst_TouchGate.cpp+1−1

@@ -189,7 +189,7 @@ void tst_TouchGate::holdsEventsUntilGainsOwnership()

189 if (!ownershipAfterTouchEnd) {

190 touchRegistry->removeCandidateOwnerForTouch(0, candidateItem);

191 QQuickWindowPrivate *wp = QQuickWindowPrivate::get(testItem->window());

192− wp->flushDelayedTouchEvent();

192+ wp->flushFrameSynchronousEvents();

193 // TouchGate should now open its flood gates and let testItem get all

194 // events from touch 0 produced so far

195 QCOMPARE(testItem->touchEventsReceived.count(), 2);

tests/plugins/Utils/ModelTest.cpp+1−1

@@ -441,7 +441,7 @@ void ModelTest::data()

441 QVariant textAlignmentVariant = model->data ( model->index ( 0, 0 ), Qt::TextAlignmentRole );

442 if ( textAlignmentVariant.isValid() ) {

443 int alignment = textAlignmentVariant.toInt();

444− QCOMPARE( alignment, ( alignment & ( Qt::AlignHorizontal_Mask | Qt::AlignVertical_Mask ) ) );

444+ QCOMPARE( alignment, (int) ( alignment & ( Qt::AlignHorizontal_Mask | Qt::AlignVertical_Mask ) ));

445 }

446

447 // General Purpose roles that should return a QColor

tests/qmltests/CMakeLists.txt+1−1

@@ -1,5 +1,5 @@

1

2−#add_subdirectory(Components) #FIXME broken with qt 5.9

2+add_subdirectory(Components)

3

4add_unity8_qmltest(. OrientedShell)

5add_unity8_qmltest(. DisabledScreenNotice)

tests/qmltests/Components/tst_DragHandle.cpp+2−2

@@ -177,7 +177,7 @@ void tst_DragHandle::flickAndHold(QQuickItem *dragHandle,

177 QTest::touchEvent(m_view, m_device).release(0, touchPoint.toPoint());

178

179 QQuickWindowPrivate *windowPrivate = QQuickWindowPrivate::get(m_view);

180− windowPrivate->flushDelayedTouchEvent();

180+ windowPrivate->flushFrameSynchronousEvents();

181}

182

183void tst_DragHandle::drag(QPointF &touchPoint, const QPointF& direction, qreal distance,

@@ -192,7 +192,7 @@ void tst_DragHandle::drag(QPointF &touchPoint, const QPointF& direction, qreal d

192 m_fakeTimeSource->m_msecsSinceReference += timeStep;

193 QTest::touchEvent(m_view, m_device).move(0, touchPoint.toPoint());

194

195− windowPrivate->flushDelayedTouchEvent();

195+ windowPrivate->flushFrameSynchronousEvents();

196 }

197}

198

tests/utils/CMakeLists.txt+1−1

@@ -1 +1 @@

1−#add_subdirectory(modules) #FIXME broken with qt 5.9

1+add_subdirectory(modules)

tests/utils/modules/Unity/Test/TouchEventSequenceWrapper.cpp−9

@@ -26,16 +26,7 @@ TouchEventSequenceWrapper::TouchEventSequenceWrapper(QTest::QTouchEventSequence

26

27void TouchEventSequenceWrapper::commit(bool processEvents)

28{

29− // Item might be deleted as a consequence of this event sequence being handled

30− // So store its window beforehand

31− QQuickWindow *window = m_item->window();

32−

33 m_eventSequence.commit(processEvents);

29 m_eventSequence.commit(processEvents);

34−

35− if (window) {

36− QQuickWindowPrivate *wp = QQuickWindowPrivate::get(window);

37− wp->flushDelayedTouchEvent();

38− }

39}

30}

40

31

41void TouchEventSequenceWrapper::move(int touchId, int x, int y)

32void TouchEventSequenceWrapper::move(int touchId, int x, int y)