git.iko.soy/unity8
on xenial help sign in
go with qreal and proper min/max
commitf260fe79c00fae96599febdda3718ee3cc4d201a authorAlbert Astals <albert.astals@canonical.com> dateTue 17 Dec 2013, 13:06 (13 years ago) parent3180634
2 files changed+8−8
compare with xenial
unifiedsplit
plugins/DashViews/verticaljournal.cpp+6−6 plugins/DashViews/verticaljournal.h+2−2
plugins/DashViews/verticaljournal.cpp+6−6
@@ -250,15 +250,15 @@ void VerticalJournal::refill()
250250 }
251251}
252252
253−void VerticalJournal::findBottomModelIndexToAdd(int *modelIndex, double *yPos)
253+void VerticalJournal::findBottomModelIndexToAdd(int *modelIndex, qreal *yPos)
254254{
255255 *modelIndex = 0;
256− *yPos = INT_MAX;
256+ *yPos = std::numeric_limits<qreal>::max();
257257
258258 Q_FOREACH(const auto &column, m_columnVisibleItems) {
259259 if (!column.isEmpty()) {
260260 const ViewItem &item = column.last();
261− *yPos = qMin(*yPos, static_cast<double>(item.y() + item.height() + m_rowSpacing));
261+ *yPos = qMin(*yPos, item.y() + item.height() + m_rowSpacing);
262262 *modelIndex = qMax(*modelIndex, item.m_modelIndex + 1);
263263 } else {
264264 *yPos = 0;
@@ -266,10 +266,10 @@ void VerticalJournal::findBottomModelIndexToAdd(int *modelIndex, double *yPos)
266266 }
267267}
268268
269−void VerticalJournal::findTopModelIndexToAdd(int *modelIndex, double *yPos)
269+void VerticalJournal::findTopModelIndexToAdd(int *modelIndex, qreal *yPos)
270270{
271271 *modelIndex = INT_MAX;
272− *yPos = INT_MIN;
272+ *yPos = std::numeric_limits<qreal>::lowest();
273273 int columnToAddTo = -1;
274274
275275 // Find the topmost free column
@@ -308,7 +308,7 @@ bool VerticalJournal::addVisibleItems(qreal fillFrom, qreal fillTo, bool asynchr
308308 return false;
309309
310310 int modelIndex;
311− double yPos;
311+ qreal yPos;
312312 findBottomModelIndexToAdd(&modelIndex, &yPos);
313313 bool changed = false;
314314 while (modelIndex < m_delegateModel->count() && yPos <= fillTo) {
plugins/DashViews/verticaljournal.h+2−2
@@ -142,8 +142,8 @@ private:
142142
143143 void createDelegateModel();
144144 void refill();
145− void findBottomModelIndexToAdd(int *modelIndex, double *yPos);
146− void findTopModelIndexToAdd(int *modelIndex, double *yPos);
145+ void findBottomModelIndexToAdd(int *modelIndex, qreal *yPos);
146+ void findTopModelIndexToAdd(int *modelIndex, qreal *yPos);
147147 bool addVisibleItems(qreal fillFrom, qreal fillTo, bool asynchronous);
148148 bool removeNonVisibleItems(qreal bufferFrom, qreal bufferTo);
149149 QQuickItem *createItem(int modelIndex, bool asynchronous);