git.iko.soy/unity8
on xenial help sign in
Make cacheBuffer int for consistency with Qt own's classes
commit9fea98d0eab585dc58c83d9f05905f46e71e0e68 authorAlbert Astals <albert.astals@canonical.com> dateWed 3 Dec 2014, 11:28 (12 years ago) parent3f388f4
4 files changed+16−11
compare with xenial
unifiedsplit
plugins/Dash/abstractdashview.cpp+2−2 plugins/Dash/abstractdashview.h+3−3 plugins/Dash/listviewwithpageheader.cpp+7−2 plugins/Dash/listviewwithpageheader.h+4−4
plugins/Dash/abstractdashview.cpp+2−2
@@ -111,12 +111,12 @@ void AbstractDashView::setRowSpacing(qreal rowSpacing)
111111 }
112112}
113113
114−qreal AbstractDashView::cacheBuffer() const
114+int AbstractDashView::cacheBuffer() const
115115{
116116 return m_buffer;
117117}
118118
119−void AbstractDashView::setCacheBuffer(qreal buffer)
119+void AbstractDashView::setCacheBuffer(int buffer)
120120{
121121 if (buffer < 0) {
122122 qmlInfo(this) << "Cannot set a negative cache buffer";
plugins/Dash/abstractdashview.h+3−3
@@ -62,8 +62,8 @@ public:
6262 qreal rowSpacing() const;
6363 void setRowSpacing(qreal rowSpacing);
6464
65− qreal cacheBuffer() const;
66− void setCacheBuffer(qreal);
65+ int cacheBuffer() const;
66+ void setCacheBuffer(int);
6767
6868 qreal displayMarginBeginning() const;
6969 void setDisplayMarginBeginning(qreal);
@@ -118,7 +118,7 @@ private:
118118
119119 int m_columnSpacing;
120120 int m_rowSpacing;
121− qreal m_buffer;
121+ int m_buffer;
122122 qreal m_displayMarginBeginning;
123123 qreal m_displayMarginEnd;
124124 bool m_needsRelayout;
plugins/Dash/listviewwithpageheader.cpp+7−2
@@ -334,13 +334,18 @@ qreal ListViewWithPageHeader::headerItemShownHeight() const
334334 return m_headerItemShownHeight;
335335}
336336
337−qreal ListViewWithPageHeader::cacheBuffer() const
337+int ListViewWithPageHeader::cacheBuffer() const
338338{
339339 return m_cacheBuffer;
340340}
341341
342−void ListViewWithPageHeader::setCacheBuffer(qreal cacheBuffer)
342+void ListViewWithPageHeader::setCacheBuffer(int cacheBuffer)
343343{
344+ if (cacheBuffer < 0) {
345+ qmlInfo(this) << "Cannot set a negative cache buffer";
346+ return;
347+ }
348+
344349 if (cacheBuffer != m_cacheBuffer) {
345350 m_cacheBuffer = cacheBuffer;
346351 Q_EMIT cacheBufferChanged();
plugins/Dash/listviewwithpageheader.h+4−4
@@ -54,7 +54,7 @@ class ListViewWithPageHeader : public QQuickFlickable, public QQuickItemChangeLi
5454 Q_PROPERTY(bool forceNoClip READ forceNoClip WRITE setForceNoClip NOTIFY forceNoClipChanged)
5555 Q_PROPERTY(int stickyHeaderHeight READ stickyHeaderHeight NOTIFY stickyHeaderHeightChanged)
5656 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)
5858
5959 friend class ListViewWithPageHeaderTest;
6060 friend class ListViewWithPageHeaderTestSection;
@@ -85,8 +85,8 @@ public:
8585 int stickyHeaderHeight() const;
8686 qreal headerItemShownHeight() const;
8787
88− qreal cacheBuffer() const;
89− void setCacheBuffer(qreal cacheBuffer);
88+ int cacheBuffer() const;
89+ void setCacheBuffer(int cacheBuffer);
9090
9191 Q_INVOKABLE void positionAtBeginning();
9292 Q_INVOKABLE void showHeader();
@@ -204,7 +204,7 @@ private:
204204 bool m_forceNoClip;
205205 bool m_inLayout;
206206 bool m_inContentHeightKeepHeaderShown;
207− qreal m_cacheBuffer;
207+ int m_cacheBuffer;
208208
209209 // Qt 5.0 doesn't like releasing the items just after itemCreated
210210 // so we delay the releasing until the next updatePolish