git.iko.soy/unity8
on xenial help sign in
Make cacheBuffer int for consistency with Qt own's classes
9fea98dAlbert Astals
plugins/Dash/abstractdashview.cpp+2−2
compare with xenial
unifiedsplit
@@ -111,12 +111,12 @@ void AbstractDashView::setRowSpacing(qreal rowSpacing)
111 }
111 }
112}
112}
113
113
114−qreal AbstractDashView::cacheBuffer() const
114+int AbstractDashView::cacheBuffer() const
115{
115{
116 return m_buffer;
116 return m_buffer;
117}
117}
118
118
119−void AbstractDashView::setCacheBuffer(qreal buffer)
119+void AbstractDashView::setCacheBuffer(int buffer)
120{
120{
121 if (buffer < 0) {
121 if (buffer < 0) {
122 qmlInfo(this) << "Cannot set a negative cache buffer";
122 qmlInfo(this) << "Cannot set a negative cache buffer";
plugins/Dash/abstractdashview.h+3−3
@@ -62,8 +62,8 @@ public:
62 qreal rowSpacing() const;
62 qreal rowSpacing() const;
63 void setRowSpacing(qreal rowSpacing);
63 void setRowSpacing(qreal rowSpacing);
64
64
65− qreal cacheBuffer() const;
65+ int cacheBuffer() const;
66− void setCacheBuffer(qreal);
66+ void setCacheBuffer(int);
67
67
68 qreal displayMarginBeginning() const;
68 qreal displayMarginBeginning() const;
69 void setDisplayMarginBeginning(qreal);
69 void setDisplayMarginBeginning(qreal);
@@ -118,7 +118,7 @@ private:
118
118
119 int m_columnSpacing;
119 int m_columnSpacing;
120 int m_rowSpacing;
120 int m_rowSpacing;
121− qreal m_buffer;
121+ int m_buffer;
122 qreal m_displayMarginBeginning;
122 qreal m_displayMarginBeginning;
123 qreal m_displayMarginEnd;
123 qreal m_displayMarginEnd;
124 bool m_needsRelayout;
124 bool m_needsRelayout;
plugins/Dash/listviewwithpageheader.cpp+7−2
@@ -334,13 +334,18 @@ qreal ListViewWithPageHeader::headerItemShownHeight() const
334 return m_headerItemShownHeight;
334 return m_headerItemShownHeight;
335}
335}
336
336
337−qreal ListViewWithPageHeader::cacheBuffer() const
337+int ListViewWithPageHeader::cacheBuffer() const
338{
338{
339 return m_cacheBuffer;
339 return m_cacheBuffer;
340}
340}
341
341
342−void ListViewWithPageHeader::setCacheBuffer(qreal cacheBuffer)
342+void ListViewWithPageHeader::setCacheBuffer(int cacheBuffer)
343{
343{
344+ if (cacheBuffer < 0) {
345+ qmlInfo(this) << "Cannot set a negative cache buffer";
346+ return;
347+ }
348+
344 if (cacheBuffer != m_cacheBuffer) {
349 if (cacheBuffer != m_cacheBuffer) {
345 m_cacheBuffer = cacheBuffer;
350 m_cacheBuffer = cacheBuffer;
346 Q_EMIT cacheBufferChanged();
351 Q_EMIT cacheBufferChanged();
plugins/Dash/listviewwithpageheader.h+4−4
@@ -54,7 +54,7 @@ class ListViewWithPageHeader : public QQuickFlickable, public QQuickItemChangeLi
54 Q_PROPERTY(bool forceNoClip READ forceNoClip WRITE setForceNoClip NOTIFY forceNoClipChanged)
54 Q_PROPERTY(bool forceNoClip READ forceNoClip WRITE setForceNoClip NOTIFY forceNoClipChanged)
55 Q_PROPERTY(int stickyHeaderHeight READ stickyHeaderHeight NOTIFY stickyHeaderHeightChanged)
55 Q_PROPERTY(int stickyHeaderHeight READ stickyHeaderHeight NOTIFY stickyHeaderHeightChanged)
56 Q_PROPERTY(qreal headerItemShownHeight READ headerItemShownHeight NOTIFY headerItemShownHeightChanged)
56 Q_PROPERTY(qreal headerItemShownHeight READ headerItemShownHeight NOTIFY headerItemShownHeightChanged)
57− Q_PROPERTY(qreal cacheBuffer READ cacheBuffer WRITE setCacheBuffer NOTIFY cacheBufferChanged)
57+ Q_PROPERTY(int cacheBuffer READ cacheBuffer WRITE setCacheBuffer NOTIFY cacheBufferChanged)
58
58
59 friend class ListViewWithPageHeaderTest;
59 friend class ListViewWithPageHeaderTest;
60 friend class ListViewWithPageHeaderTestSection;
60 friend class ListViewWithPageHeaderTestSection;
@@ -85,8 +85,8 @@ public:
85 int stickyHeaderHeight() const;
85 int stickyHeaderHeight() const;
86 qreal headerItemShownHeight() const;
86 qreal headerItemShownHeight() const;
87
87
88− qreal cacheBuffer() const;
88+ int cacheBuffer() const;
89− void setCacheBuffer(qreal cacheBuffer);
89+ void setCacheBuffer(int cacheBuffer);
90
90
91 Q_INVOKABLE void positionAtBeginning();
91 Q_INVOKABLE void positionAtBeginning();
92 Q_INVOKABLE void showHeader();
92 Q_INVOKABLE void showHeader();
@@ -204,7 +204,7 @@ private:
204 bool m_forceNoClip;
204 bool m_forceNoClip;
205 bool m_inLayout;
205 bool m_inLayout;
206 bool m_inContentHeightKeepHeaderShown;
206 bool m_inContentHeightKeepHeaderShown;
207− qreal m_cacheBuffer;
207+ int m_cacheBuffer;
208
208
209 // Qt 5.0 doesn't like releasing the items just after itemCreated
209 // Qt 5.0 doesn't like releasing the items just after itemCreated
210 // so we delay the releasing until the next updatePolish
210 // so we delay the releasing until the next updatePolish