X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flayout.cpp;h=f89e407cf7f4d3b61d08831c0f71693b68b27760;hb=76a7cd9ed443c1a6451e6fab98f428f7cce48eed;hp=34afd7284a35878b409dd95f8b4bc34ebd6c4299;hpb=2ea95d42a147747c79cade5c9b7f299d47367be7;p=libs%2Fgltk.git

diff --git a/source/layout.cpp b/source/layout.cpp
index 34afd72..f89e407 100644
--- a/source/layout.cpp
+++ b/source/layout.cpp
@@ -232,6 +232,10 @@ void Layout::solve_constraints(int dir)
 {
 	Pointers &ptrs = pointers[dir&VERTICAL];
 
+	const Geometry &geom = container->get_geometry();
+	if(geom.*(ptrs.dim)<margin.*(ptrs.low_margin)+margin.*(ptrs.high_margin))
+		return;
+
 	/* Set up a linear program to solve the constraints.  The program matrix has
 	five columns for each widget, and one constant column.  The first and second
 	columns of a widget are its position and dimension, respectively.  The
@@ -257,7 +261,7 @@ void Layout::solve_constraints(int dir)
 			row[(*i)->index*5] = 1;
 			row[(*i)->index*5+1] = 1;
 			row[(*i)->index*5+3] = 1;
-			row.back() = container->get_geometry().*(ptrs.dim)-margin.*(ptrs.high_margin);
+			row.back() = geom.*(ptrs.dim)-margin.*(ptrs.high_margin);
 		}
 
 		{