From 9906e6746d846079a70a989f9b9f69be007d3a7a Mon Sep 17 00:00:00 2001
From: Bill Egert <begert@gmail.com>
Date: Sat, 9 Feb 2008 14:56:04 +0000
Subject: [PATCH] Top Align...let items be as large as they can be.

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=772740
---
 layouts/flowlayout.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/layouts/flowlayout.cpp b/layouts/flowlayout.cpp
index 7fff7a6d1..e70b1f564 100644
--- a/layouts/flowlayout.cpp
+++ b/layouts/flowlayout.cpp
@@ -189,7 +189,7 @@ void FlowLayout::relayout()
     for(int i = 1; (i <= rowMax) && (colWidth == 0); i++) {
         if( i * (usedSpace / maxItemWidth ) >= count) {
             colWidth = maxItemWidth;
-            rowHeight = floor( ((rectHeight - space) / i - space) );
+            rowHeight = rectHeight / i;
             rowCnt = i;
             colCnt = (int)(usedSpace / colWidth);
         }
@@ -198,10 +198,9 @@ void FlowLayout::relayout()
     //make items fit in available space
     if( colWidth == 0) {
         colCnt = (int)ceil((qreal)(count + (count % 2)) / rowMax);
-        // use floor incase we get into repeating decimal situation (that breaks things..I think)
-        colWidth = floor(rectWidth / colCnt);
+        colWidth = rectWidth / colCnt;
         rowCnt = (count + (count % 2)) / colCnt;
-        rowHeight = floor( ( ( rectHeight - space ) / rowCnt ) - space );
+        rowHeight = rectHeight / rowCnt;
     }
 
     //kDebug() << "colWidth: " << colWidth << "rowHeight: " << rowHeight
@@ -210,19 +209,19 @@ void FlowLayout::relayout()
 
     // lay the items out in left-to-right , top-to-bottom order
     int insertColumn = 0;
-    qreal rowPos = space;
+    qreal rowPos = 0;
     foreach(LayoutItem *item , d->items) {
 
         if(insertColumn >= colCnt) {
             insertColumn = 0;
-            rowPos += (rowHeight + space);
+            rowPos += rowHeight;
         }
 
         // position the item
         const QRectF newGeometry(rect.left() + (insertColumn * colWidth),
                                  rect.top() + rowPos,
                                  colWidth - space,
-                                 rowHeight);
+                                 rowHeight - space);
 
         //kDebug() << "newGeometry: " << newGeometry;
         insertColumn++;