git.iko.soy/unity8
on xenial help sign in
go with qreal and proper min/max
f260fe7Albert Astals
plugins/DashViews/verticaljournal.cpp+6−6
compare with xenial
unifiedsplit
@@ -250,15 +250,15 @@ void VerticalJournal::refill()
250 }
250 }
251}
251}
252
252
253−void VerticalJournal::findBottomModelIndexToAdd(int *modelIndex, double *yPos)
253+void VerticalJournal::findBottomModelIndexToAdd(int *modelIndex, qreal *yPos)
254{
254{
255 *modelIndex = 0;
255 *modelIndex = 0;
256− *yPos = INT_MAX;
256+ *yPos = std::numeric_limits<qreal>::max();
257
257
258 Q_FOREACH(const auto &column, m_columnVisibleItems) {
258 Q_FOREACH(const auto &column, m_columnVisibleItems) {
259 if (!column.isEmpty()) {
259 if (!column.isEmpty()) {
260 const ViewItem &item = column.last();
260 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);
262 *modelIndex = qMax(*modelIndex, item.m_modelIndex + 1);
262 *modelIndex = qMax(*modelIndex, item.m_modelIndex + 1);
263 } else {
263 } else {
264 *yPos = 0;
264 *yPos = 0;
@@ -266,10 +266,10 @@ void VerticalJournal::findBottomModelIndexToAdd(int *modelIndex, double *yPos)
266 }
266 }
267}
267}
268
268
269−void VerticalJournal::findTopModelIndexToAdd(int *modelIndex, double *yPos)
269+void VerticalJournal::findTopModelIndexToAdd(int *modelIndex, qreal *yPos)
270{
270{
271 *modelIndex = INT_MAX;
271 *modelIndex = INT_MAX;
272− *yPos = INT_MIN;
272+ *yPos = std::numeric_limits<qreal>::lowest();
273 int columnToAddTo = -1;
273 int columnToAddTo = -1;
274
274
275 // Find the topmost free column
275 // Find the topmost free column
@@ -308,7 +308,7 @@ bool VerticalJournal::addVisibleItems(qreal fillFrom, qreal fillTo, bool asynchr
308 return false;
308 return false;
309
309
310 int modelIndex;
310 int modelIndex;
311− double yPos;
311+ qreal yPos;
312 findBottomModelIndexToAdd(&modelIndex, &yPos);
312 findBottomModelIndexToAdd(&modelIndex, &yPos);
313 bool changed = false;
313 bool changed = false;
314 while (modelIndex < m_delegateModel->count() && yPos <= fillTo) {
314 while (modelIndex < m_delegateModel->count() && yPos <= fillTo) {
plugins/DashViews/verticaljournal.h+2−2
@@ -142,8 +142,8 @@ private:
142
142
143 void createDelegateModel();
143 void createDelegateModel();
144 void refill();
144 void refill();
145− void findBottomModelIndexToAdd(int *modelIndex, double *yPos);
145+ void findBottomModelIndexToAdd(int *modelIndex, qreal *yPos);
146− void findTopModelIndexToAdd(int *modelIndex, double *yPos);
146+ void findTopModelIndexToAdd(int *modelIndex, qreal *yPos);
147 bool addVisibleItems(qreal fillFrom, qreal fillTo, bool asynchronous);
147 bool addVisibleItems(qreal fillFrom, qreal fillTo, bool asynchronous);
148 bool removeNonVisibleItems(qreal bufferFrom, qreal bufferTo);
148 bool removeNonVisibleItems(qreal bufferFrom, qreal bufferTo);
149 QQuickItem *createItem(int modelIndex, bool asynchronous);
149 QQuickItem *createItem(int modelIndex, bool asynchronous);