i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move constraint solving to the rest of the constraint stuff. Only adjust windows if specifications are feasible.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38285 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Clemens Zeidler
2010-08-20 02:21:34 +00:00
parent 1f50b439bb
commit 668e181957
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/decorators/SATDecorator/SATGroup.cpp
+1 -9
View File
@@ -713,16 +713,8 @@ SATGroup::FindVerticalTab(float position)
void void
SATGroup::SolveSATAndAdjustWindows(SATWindow* triggerWindow) SATGroup::AdjustWindows(SATWindow* triggerWindow)
{ {
// solve Stack & Tile specification
ResultType result;
for (int32 tries = 0; tries < 15; tries++) {
result = fLinearSpec.Solve();
if (result == OPTIMAL || result == INFEASIBLE)
break;
}
// set window locations and sizes // set window locations and sizes
for (int i = 0; i < fSATWindowList.CountItems(); i++) { for (int i = 0; i < fSATWindowList.CountItems(); i++) {
SATWindow* windowSAT = fSATWindowList.ItemAt(i); SATWindow* windowSAT = fSATWindowList.ItemAt(i);
src/add-ons/decorators/SATDecorator/SATGroup.h
+1 -1
View File
@@ -198,7 +198,7 @@ public:
LinearSpec* GetLinearSpec() { return &fLinearSpec; } LinearSpec* GetLinearSpec() { return &fLinearSpec; }
void SolveSATAndAdjustWindows(SATWindow* triggerWindow); void AdjustWindows(SATWindow* triggerWindow);
/*! Create a new WindowArea from the crossing and add the window. */ /*! Create a new WindowArea from the crossing and add the window. */
bool AddWindow(SATWindow* window, Tab* left, Tab* top, bool AddWindow(SATWindow* window, Tab* left, Tab* top,
src/add-ons/decorators/SATDecorator/SATWindow.cpp
+10 -2
View File
@@ -405,7 +405,6 @@ GroupCookie::DoGroupLayout(SATWindow* triggerWindow)
leftConstraint->SetRightSide(frame.left); leftConstraint->SetRightSide(frame.left);
topConstraint->SetRightSide(frame.top); topConstraint->SetRightSide(frame.top);
widthConstraint->SetPenaltyNeg(110); widthConstraint->SetPenaltyNeg(110);
widthConstraint->SetPenaltyPos(110); widthConstraint->SetPenaltyPos(110);
heightConstraint->SetPenaltyNeg(110); heightConstraint->SetPenaltyNeg(110);
@@ -417,7 +416,16 @@ GroupCookie::DoGroupLayout(SATWindow* triggerWindow)
topConstraint->SetPenaltyPos(100); topConstraint->SetPenaltyPos(100);
// After we set the new parameter solve and apply the new layout. // After we set the new parameter solve and apply the new layout.
fSATGroup->SolveSATAndAdjustWindows(triggerWindow); ResultType result;
for (int32 tries = 0; tries < 15; tries++) {
result = fSATGroup->GetLinearSpec()->Solve();
if (result == INFEASIBLE)
break;
if (result == OPTIMAL) {
fSATGroup->AdjustWindows(triggerWindow);
break;
}
}
// set penalties back to normal // set penalties back to normal
widthConstraint->SetPenaltyNeg(10); widthConstraint->SetPenaltyNeg(10);