# HG changeset patch
# User lbajardsilogic
# Date 1195219075 0
# Node ID 0442224a95539ac09dd3bc6f2d731c711c6df4d2
# Parent  1416cdbe79b63572e1041546a993b0b8d064179b
correct bug in minimumSize when we have only one row or one column

diff -r 1416cdbe79b6 -r 0442224a9553 widgets/FlowLayout.cpp
--- a/widgets/FlowLayout.cpp	Thu Nov 15 17:21:04 2007 +0000
+++ b/widgets/FlowLayout.cpp	Fri Nov 16 13:17:55 2007 +0000
@@ -91,7 +91,7 @@
 
 QSize FlowLayout::sizeHint() const
 {
-    return minimumSize();
+	return minimumSize();
 }
 
 QSize FlowLayout::minimumSize() const
@@ -110,13 +110,15 @@
 		}
 
 		//find XMax
-		if (itemXMax->geometry().x() < item->geometry().x())
+		if ( (itemXMax->geometry().x() < item->geometry().x()) ||
+			 ( (itemXMax->geometry().x() == item->geometry().x()) && (itemXMax->geometry().width() < item->geometry().width()) ) )
 		{
 			itemXMax = item;
 		}
 
         //find YMax
-		if (itemYMax->geometry().y() < item->geometry().y())
+		if ( (itemYMax->geometry().y() < item->geometry().y()) ||
+			( (itemYMax->geometry().y() == item->geometry().y()) && (itemYMax->geometry().height() < item->geometry().height()) ) )
 		{
 			itemYMax = item;
 		}
diff -r 1416cdbe79b6 -r 0442224a9553 widgets/FlowLayout.h
--- a/widgets/FlowLayout.h	Thu Nov 15 17:21:04 2007 +0000
+++ b/widgets/FlowLayout.h	Fri Nov 16 13:17:55 2007 +0000
@@ -45,7 +45,7 @@
     QSize minimumSize() const;
 	void setGeometry(const QRect &rect);
     QSize sizeHint() const;
-    QLayoutItem *takeAt(int index);
+	QLayoutItem *takeAt(int index);
 
 private:
     int doLayout(const QRect &rect, bool testOnly) const;