[haiku-commits] haiku: hrev43435 - src/libs/alm

  • From: clemens.zeidler@xxxxxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Wed, 7 Dec 2011 23:31:34 +0100 (CET)

hrev43435 adds 1 changeset to branch 'master'
old head: c5fd97e486e4837e8fa91bc2b59453cb6dd22e2d
new head: 8cfe0f458c553fcc761d7c5a939d877ea6fcff8a

----------------------------------------------------------------------------

8cfe0f4: When calculating the min, max and pref size, relax the range of the 
right and bottom tab. These tabs are set to the layout borders again when 
solving the layout.

                                     [ czeidler <haiku@xxxxxxxxxxxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev43435
Commit:      8cfe0f458c553fcc761d7c5a939d877ea6fcff8a
URL:         http://cgit.haiku-os.org/haiku/commit/?id=8cfe0f4
Author:      czeidler <haiku@xxxxxxxxxxxxxxxxxx>
Date:        Wed Dec  7 22:08:23 2011 UTC

----------------------------------------------------------------------------

1 files changed, 9 insertions(+), 0 deletions(-)
src/libs/alm/ALMLayout.cpp |    9 +++++++++

----------------------------------------------------------------------------

diff --git a/src/libs/alm/ALMLayout.cpp b/src/libs/alm/ALMLayout.cpp
index bae4fa1..b11152b 100644
--- a/src/libs/alm/ALMLayout.cpp
+++ b/src/libs/alm/ALMLayout.cpp
@@ -898,6 +898,9 @@ BALMLayout::_CalculateMinSize()
 {
        _UpdateAreaConstraints();
 
+       Right()->SetRange(0, 20000);
+       Bottom()->SetRange(0, 20000);
+
        return fSolver->MinSize(Right(), Bottom());
 }
 
@@ -910,6 +913,9 @@ BALMLayout::_CalculateMaxSize()
 {
        _UpdateAreaConstraints();
 
+       Right()->SetRange(0, 20000);
+       Bottom()->SetRange(0, 20000);
+
        return fSolver->MaxSize(Right(), Bottom());
 }
 
@@ -922,6 +928,9 @@ BALMLayout::_CalculatePreferredSize()
 {
        _UpdateAreaConstraints();
 
+       Right()->SetRange(0, 20000);
+       Bottom()->SetRange(0, 20000);
+
        fSolver->Solve();
        if (fSolver->Result() != kOptimal) {
                fSolver->Save("failed-layout.txt");


Other related posts:

  • » [haiku-commits] haiku: hrev43435 - src/libs/alm - clemens . zeidler