From 1f6ef95ca6bc8972d16b5b3c97e4fe4797fdf97d Mon Sep 17 00:00:00 2001 From: Guillaume Melquiond Date: Sun, 21 Oct 2007 10:37:44 +0000 Subject: Allowed for decreasing sizes in layout. --- ChangeLog | 1 + src/gui/widgets/layout.cpp | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8a62cac7..477995bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ * src/gui/window.cpp, src/gui/window.h: Removed redundant resizable flag. Factored moving/resizing code, so that events are fired only once per size change. + * src/gui/widgets/layout.cpp: Allowed for decreasing sizes in layout. 2007-10-20 Guillaume Melquiond diff --git a/src/gui/widgets/layout.cpp b/src/gui/widgets/layout.cpp index 9d0b4791..228eac74 100644 --- a/src/gui/widgets/layout.cpp +++ b/src/gui/widgets/layout.cpp @@ -142,15 +142,16 @@ std::vector< int > Layout::compute(int dim, int upp) if (mSizes[dim][i] == FILL) ++nbFill; if (sizes[i] == FILL) sizes[i] = 0; else upp -= sizes[i]; + upp -= mPadding; } upp += mPadding; - if (upp <= 0 || nbFill == 0) return sizes; + if (nbFill == 0) return sizes; for (int i = 0; i < nb; ++i) { if (mSizes[dim][i] != FILL) continue; - int s = (upp + nbFill / 2) / nbFill; + int s = upp / nbFill; sizes[i] += s; upp -= s; --nbFill; -- cgit v1.2.3-70-g09d2