Don't try to solve if container is smaller than its margins

Attempting that would cause unsigneds to wrap around to very large values
and cause a weird solution.

diff --git a/source/layout.cpp b/source/layout.cpp
index 34afd7284a35878b409dd95f8b4bc34ebd6c4299..f89e407cf7f4d3b61d08831c0f71693b68b27760 100644 (file)
--- 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);
                }
 
                {