Strip copyright messages and id tags from individual files

[libs/gltk.git] / source / layout.cpp

diff --git a/source/layout.cpp b/source/layout.cpp
index 35019482bcfbc1efe288be7cf6136723ce3f39a3..6ed46e4d44cecc7e9922ed4920566ada5f609422 100644 (file)
--- a/source/layout.cpp
+++ b/source/layout.cpp
@@ -179,6 +179,9 @@ Layout::ConstraintType Layout::complement(ConstraintType type)
 
 void Layout::add_constraint(Widget &src, ConstraintType type, Widget &tgt)
 {
+       if(&src==&tgt)
+               throw InvalidParameterValue("Can't add a self-referencing constraint");
+
        Slot &src_slot = get_slot_for_widget(src);
        Slot &tgt_slot = get_slot_for_widget(tgt);
 
@@ -233,10 +236,11 @@ void Layout::solve_constraints(int dir)
        Pointers &ptrs = pointers[dir&VERTICAL];
 
        LinearProgram linprog(slots.size()*5+1);
+       float weight = slots.size();
        for(list<Slot *>::iterator i=slots.begin(); i!=slots.end(); ++i)
        {
-               linprog.get_object_row()[(*i)->index*5] = 0.1*((*i)->*(ptrs.packing)).gravity;
-               linprog.get_object_row()[(*i)->index*5+1] = (((*i)->*(ptrs.packing)).expand ? 5 : -1);
+               linprog.get_object_row()[(*i)->index*5] = ((*i)->*(ptrs.packing)).gravity/weight;
+               linprog.get_object_row()[(*i)->index*5+1] = (((*i)->*(ptrs.packing)).expand ? weight : -1);
 
                {
                        LinearProgram::Row row = linprog.add_row();