[haiku-commits] r38771 - in haiku/trunk: headers/libs/alm src/libs/alm src/tests/libs/alm
- From: clemens.zeidler@xxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 22 Sep 2010 01:31:50 +0200 (CEST)
Author: czeidler
Date: 2010-09-22 01:31:50 +0200 (Wed, 22 Sep 2010)
New Revision: 38771
Changeset: http://dev.haiku-os.org/changeset/38771
Added:
haiku/trunk/headers/libs/alm/ALMLayout.h
haiku/trunk/src/libs/alm/ALMLayout.cpp
Removed:
haiku/trunk/headers/libs/alm/BALMLayout.h
haiku/trunk/src/libs/alm/BALMLayout.cpp
Modified:
haiku/trunk/headers/libs/alm/Area.h
haiku/trunk/headers/libs/alm/Column.h
haiku/trunk/headers/libs/alm/Row.h
haiku/trunk/headers/libs/alm/XTab.h
haiku/trunk/headers/libs/alm/YTab.h
haiku/trunk/src/libs/alm/Jamfile
haiku/trunk/src/tests/libs/alm/Areas.cpp
haiku/trunk/src/tests/libs/alm/HelloWorld.cpp
haiku/trunk/src/tests/libs/alm/Pinwheel.cpp
haiku/trunk/src/tests/libs/alm/TableDemo.cpp
haiku/trunk/src/tests/libs/alm/TwoViews.cpp
Log:
- Rename BALMLayout.* file to ALMLayout.*.
- Fix some copyrights.
Added: haiku/trunk/headers/libs/alm/ALMLayout.h
===================================================================
--- haiku/trunk/headers/libs/alm/ALMLayout.h (rev 0)
+++ haiku/trunk/headers/libs/alm/ALMLayout.h 2010-09-21 23:31:50 UTC (rev
38771)
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2006 - 2010, Haiku, Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef ALM_LAYOUT_H
+#define ALM_LAYOUT_H
+
+#include <AbstractLayout.h>
+#include <File.h>
+#include <List.h>
+#include <Size.h>
+#include <SupportDefs.h>
+#include <View.h>
+
+#include "Area.h"
+#include "Column.h"
+#include "LayoutStyleType.h"
+#include "LinearSpec.h"
+#include "Row.h"
+#include "XTab.h"
+#include "YTab.h"
+
+
+namespace BALM {
+
+/**
+ * A GUI layout engine using the ALM.
+ */
+class BALMLayout : public BAbstractLayout {
+public:
+ BALMLayout();
+ virtual ~BALMLayout();
+
+ void SolveLayout();
+
+ XTab* AddXTab();
+ YTab* AddYTab();
+ Row* AddRow();
+ Row* AddRow(YTab* top, YTab*
bottom);
+ Column* AddColumn();
+ Column* AddColumn(XTab* left,
XTab* right);
+
+ Area* AddArea(XTab* left,
YTab* top, XTab* right,
+ YTab*
bottom, BView* content, BSize minContentSize);
+ Area* AddArea(Row* row,
Column* column,
+ BView*
content, BSize minContentSize);
+ Area* AddArea(XTab* left,
YTab* top, XTab* right,
+ YTab*
bottom, BView* content);
+ Area* AddArea(Row* row,
Column* column,
+ BView*
content);
+ Area* AreaOf(BView* control);
+
+ XTab* Left() const;
+ XTab* Right() const;
+ YTab* Top() const;
+ YTab* Bottom() const;
+
+ void RecoverLayout(BView*
parent);
+
+ LayoutStyleType LayoutStyle() const;
+ void
SetLayoutStyle(LayoutStyleType style);
+
+ BSize BaseMinSize();
+ BSize BaseMaxSize();
+ BSize BasePreferredSize();
+ BAlignment BaseAlignment();
+
+ virtual void InvalidateLayout(bool children
= false);
+
+ virtual bool ItemAdded(BLayoutItem* item,
int32 atIndex);
+ virtual void ItemRemoved(BLayoutItem* item,
int32 fromIndex);
+ virtual void DerivedLayoutItems();
+
+ char* PerformancePath() const;
+ void
SetPerformancePath(char* path);
+
+ LinearSpec* Solver();
+
+private:
+ Area*
_AreaForItem(BLayoutItem* item) const;
+ void
_UpdateAreaConstraints();
+
+ BSize CalculateMinSize();
+ BSize CalculateMaxSize();
+ BSize
CalculatePreferredSize();
+
+private:
+ LayoutStyleType fLayoutStyle;
+ bool fActivated;
+
+ LinearSpec fSolver;
+
+ XTab* fLeft;
+ XTab* fRight;
+ YTab* fTop;
+ YTab* fBottom;
+ BSize fMinSize;
+ BSize fMaxSize;
+ BSize fPreferredSize;
+ char* fPerformancePath;
+};
+
+} // namespace BALM
+
+using BALM::BALMLayout;
+
+#endif // ALM_LAYOUT_H
Modified: haiku/trunk/headers/libs/alm/Area.h
===================================================================
--- haiku/trunk/headers/libs/alm/Area.h 2010-09-21 23:22:17 UTC (rev 38770)
+++ haiku/trunk/headers/libs/alm/Area.h 2010-09-21 23:31:50 UTC (rev 38771)
@@ -1,9 +1,7 @@
/*
- * Copyright 2007-2008, Christof Lutteroth, lutteroth@xxxxxxxxxxxxxxxxx
- * Copyright 2007-2008, James Kim, jkim202@xxxxxxxxxxxxxxxxx
+ * Copyright 2006 - 2010, Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*/
-
#ifndef AREA_H
#define AREA_H
Modified: haiku/trunk/headers/libs/alm/Column.h
===================================================================
--- haiku/trunk/headers/libs/alm/Column.h 2010-09-21 23:22:17 UTC (rev
38770)
+++ haiku/trunk/headers/libs/alm/Column.h 2010-09-21 23:31:50 UTC (rev
38771)
@@ -1,6 +1,5 @@
/*
- * Copyright 2007-2008, Christof Lutteroth, lutteroth@xxxxxxxxxxxxxxxxx
- * Copyright 2007-2008, James Kim, jkim202@xxxxxxxxxxxxxxxxx
+ * Copyright 2006 - 2010, Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef COLUMN_H
Modified: haiku/trunk/headers/libs/alm/Row.h
===================================================================
--- haiku/trunk/headers/libs/alm/Row.h 2010-09-21 23:22:17 UTC (rev 38770)
+++ haiku/trunk/headers/libs/alm/Row.h 2010-09-21 23:31:50 UTC (rev 38771)
@@ -1,9 +1,7 @@
/*
- * Copyright 2007-2008, Christof Lutteroth, lutteroth@xxxxxxxxxxxxxxxxx
- * Copyright 2007-2008, James Kim, jkim202@xxxxxxxxxxxxxxxxx
+ * Copyright 2006 - 2010, Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*/
-
#ifndef ROW_H
#define ROW_H
Modified: haiku/trunk/headers/libs/alm/XTab.h
===================================================================
--- haiku/trunk/headers/libs/alm/XTab.h 2010-09-21 23:22:17 UTC (rev 38770)
+++ haiku/trunk/headers/libs/alm/XTab.h 2010-09-21 23:31:50 UTC (rev 38771)
@@ -1,6 +1,5 @@
/*
- * Copyright 2007-2008, Christof Lutteroth, lutteroth@xxxxxxxxxxxxxxxxx
- * Copyright 2007-2008, James Kim, jkim202@xxxxxxxxxxxxxxxxx
+ * Copyright 2006 - 2010, Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef X_TAB_H
Modified: haiku/trunk/headers/libs/alm/YTab.h
===================================================================
--- haiku/trunk/headers/libs/alm/YTab.h 2010-09-21 23:22:17 UTC (rev 38770)
+++ haiku/trunk/headers/libs/alm/YTab.h 2010-09-21 23:31:50 UTC (rev 38771)
@@ -1,6 +1,5 @@
/*
- * Copyright 2007-2008, Christof Lutteroth, lutteroth@xxxxxxxxxxxxxxxxx
- * Copyright 2007-2008, James Kim, jkim202@xxxxxxxxxxxxxxxxx
+ * Copyright 2006 - 2010, Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef Y_TAB_H
Added: haiku/trunk/src/libs/alm/ALMLayout.cpp
===================================================================
--- haiku/trunk/src/libs/alm/ALMLayout.cpp (rev 0)
+++ haiku/trunk/src/libs/alm/ALMLayout.cpp 2010-09-21 23:31:50 UTC (rev
38771)
@@ -0,0 +1,636 @@
+/*
+ * Copyright 2007-2008, Christof Lutteroth, lutteroth@xxxxxxxxxxxxxxxxx
+ * Copyright 2007-2008, James Kim, jkim202@xxxxxxxxxxxxxxxxx
+ * Copyright 2010, Clemens Zeidler <haiku@xxxxxxxxxxxxxxxxxx>
+ * Distributed under the terms of the MIT License.
+ */
+
+#include "ALMLayout.h"
+
+#include <math.h> // for floor
+#include <new>
+
+#include "Area.h"
+#include "Column.h"
+#include "ResultType.h"
+#include "Row.h"
+#include "XTab.h"
+#include "YTab.h"
+
+
+/**
+ * Constructor.
+ * Creates new layout engine.
+ */
+BALMLayout::BALMLayout()
+ :
+ BAbstractLayout()
+{
+ fLayoutStyle = FIT_TO_SIZE;
+ fActivated = true;
+
+ fLeft = new XTab(&fSolver);
+ fRight = new XTab(&fSolver);
+ fTop = new YTab(&fSolver);
+ fBottom = new YTab(&fSolver);
+
+ // the Left tab is always at x-position 0, and the Top tab is always at
y-position 0
+ fLeft->SetRange(0, 0);
+ fTop->SetRange(0, 0);
+
+ // cached layout values
+ // need to be invalidated whenever the layout specification is changed
+ fMinSize = Area::kUndefinedSize;
+ fMaxSize = Area::kUndefinedSize;
+ fPreferredSize = Area::kUndefinedSize;
+
+ fPerformancePath = NULL;
+}
+
+
+BALMLayout::~BALMLayout()
+{
+
+}
+
+
+/**
+ * Solves the layout.
+ */
+void
+BALMLayout::SolveLayout()
+{
+ // if autoPreferredContentSize is set on an area,
+ // readjust its preferredContentSize and penalties settings
+ for (int32 i = 0; i < CountItems(); i++) {
+ Area* currentArea = _AreaForItem(ItemAt(i));
+ if (currentArea && currentArea->AutoPreferredContentSize())
+ currentArea->SetDefaultBehavior();
+ }
+
+ // Try to solve the layout until the result is OPTIMAL or INFEASIBLE,
+ // maximally 15 tries sometimes the solving algorithm encounters
numerical
+ // problems (NUMFAILURE), and repeating the solving often helps to
overcome
+ // them.
+ BFile* file = NULL;
+ if (fPerformancePath != NULL) {
+ file = new BFile(fPerformancePath,
+ B_READ_WRITE | B_CREATE_FILE | B_OPEN_AT_END);
+ }
+
+ ResultType result;
+ for (int32 tries = 0; tries < 15; tries++) {
+ result = fSolver.Solve();
+ if (fPerformancePath != NULL) {
+ /*char buffer [100];
+ file->Write(buffer, sprintf(buffer,
"%d\t%fms\t#vars=%ld\t"
+ "#constraints=%ld\n", result,
fSolver.SolvingTime(),
+ fSolver.Variables()->CountItems(),
+ fSolver.Constraints()->CountItems()));*/
+ }
+ if (result == OPTIMAL || result == INFEASIBLE)
+ break;
+ }
+ delete file;
+}
+
+
+/**
+ * Adds a new x-tab to the specification.
+ *
+ * @return the new x-tab
+ */
+XTab*
+BALMLayout::AddXTab()
+{
+ return new XTab(&fSolver);
+}
+
+
+/**
+ * Adds a new y-tab to the specification.
+ *
+ * @return the new y-tab
+ */
+YTab*
+BALMLayout::AddYTab()
+{
+ return new YTab(&fSolver);
+}
+
+
+/**
+ * Adds a new row to the specification.
+ *
+ * @return the new row
+ */
+Row*
+BALMLayout::AddRow()
+{
+ return new Row(&fSolver);
+}
+
+
+/**
+ * Adds a new row to the specification that is glued to the given y-tabs.
+ *
+ * @param top
+ * @param bottom
+ * @return the new row
+ */
+Row*
+BALMLayout::AddRow(YTab* top, YTab* bottom)
+{
+ Row* row = new Row(&fSolver);
+ if (top != NULL)
+ row->Constraints()->AddItem(row->Top()->IsEqual(top));
+ if (bottom != NULL)
+ row->Constraints()->AddItem(row->Bottom()->IsEqual(bottom));
+ return row;
+}
+
+
+/**
+ * Adds a new column to the specification.
+ *
+ * @return the new column
+ */
+Column*
+BALMLayout::AddColumn()
+{
+ return new Column(&fSolver);
+}
+
+
+/**
+ * Adds a new column to the specification that is glued to the given x-tabs.
+ *
+ * @param left
+ * @param right
+ * @return the new column
+ */
+Column*
+BALMLayout::AddColumn(XTab* left, XTab* right)
+{
+ Column* column = new Column(&fSolver);
+ if (left != NULL)
+ column->Constraints()->AddItem(column->Left()->IsEqual(left));
+ if (right != NULL)
+ column->Constraints()->AddItem(column->Right()->IsEqual(right));
+ return column;
+}
+
+
+/**
+ * Adds a new area to the specification, setting only the necessary minimum
size constraints.
+ *
+ * @param left left border
+ * @param top top border
+ * @param right right border
+ * @param bottom bottom border
+ * @param content the control which is the area content
+ * @param minContentSize minimum content size
+ * @return the new area
+ */
+Area*
+BALMLayout::AddArea(XTab* left, YTab* top, XTab* right, YTab* bottom,
+ BView* content, BSize minContentSize)
+{
+ BLayoutItem* item = AddView(content);
+ Area* area = _AreaForItem(item);
+ if (!area)
+ return NULL;
+
+ area->Init(&fSolver, left, top, right, bottom, content,
+ minContentSize);
+ return area;
+}
+
+
+/**
+ * Adds a new area to the specification, setting only the necessary minimum
size constraints.
+ *
+ * @param row the row that defines the top and bottom
border
+ * @param column the column that defines the left and
right border
+ * @param content the control which is the area content
+ * @param minContentSize minimum content size
+ * @return the new area
+ */
+Area*
+BALMLayout::AddArea(Row* row, Column* column, BView* content,
+ BSize minContentSize)
+{
+ BLayoutItem* item = AddView(content);
+ Area* area = _AreaForItem(item);
+ if (!area)
+ return NULL;
+
+ area->Init(&fSolver, row, column, content, minContentSize);
+ return area;
+}
+
+
+/**
+ * Adds a new area to the specification, automatically setting preferred size
constraints.
+ *
+ * @param left left border
+ * @param top top border
+ * @param right right border
+ * @param bottom bottom border
+ * @param content the control which is the area content
+ * @return the new area
+ */
+Area*
+BALMLayout::AddArea(XTab* left, YTab* top, XTab* right, YTab* bottom,
+ BView* content)
+{
+ BLayoutItem* item = AddView(content);
+ Area* area = _AreaForItem(item);
+ if (!area)
+ return NULL;
+
+ area->Init(&fSolver, left, top, right, bottom, content,
+ BSize(0, 0));
+ area->SetDefaultBehavior();
+ area->SetAutoPreferredContentSize(false);
+ return area;
+}
+
+
+/**
+ * Adds a new area to the specification, automatically setting preferred size
constraints.
+ *
+ * @param row the row that defines the top and bottom border
+ * @param column the column that defines the left and right
border
+ * @param content the control which is the area content
+ * @return the new area
+ */
+Area*
+BALMLayout::AddArea(Row* row, Column* column, BView* content)
+{
+ BLayoutItem* item = AddView(content);
+ Area* area = _AreaForItem(item);
+ if (!area)
+ return NULL;
+
+ area->Init(&fSolver, row, column, content, BSize(0, 0));
+ area->SetDefaultBehavior();
+ area->SetAutoPreferredContentSize(false);
+ return area;
+}
+
+
+/**
+ * Finds the area that contains the given control.
+ *
+ * @param control the control to look for
+ * @return the area that contains the control
+ */
+Area*
+BALMLayout::AreaOf(BView* control)
+{
+ return _AreaForItem(ItemAt(IndexOfView(control)));
+}
+
+
+/**
+ * Gets the left variable.
+ */
+XTab*
+BALMLayout::Left() const
+{
+ return fLeft;
+}
+
+
+/**
+ * Gets the right variable.
+ */
+XTab*
+BALMLayout::Right() const
+{
+ return fRight;
+}
+
+
+/**
+ * Gets the top variable.
+ */
+YTab*
+BALMLayout::Top() const
+{
+ return fTop;
+}
+
+
+/**
+ * Gets the bottom variable.
+ */
+YTab*
+BALMLayout::Bottom() const
+{
+ return fBottom;
+}
+
+
+/**
+ * Reverse engineers a GUI and recovers an ALM specification.
+ * @param parent the parent container of the GUI
+ */
+void
+BALMLayout::RecoverLayout(BView* parent) {} // Still working on it.
+
+
+/**
+ * Gets the current layout style.
+ */
+LayoutStyleType
+BALMLayout::LayoutStyle() const
+{
+ return fLayoutStyle;
+}
+
+
+/**
+ * Sets the current layout style.
+ */
+void
+BALMLayout::SetLayoutStyle(LayoutStyleType style)
+{
+ fLayoutStyle = style;
+}
+
+
+/**
+ * Gets minimum size.
+ */
+BSize
+BALMLayout::BaseMinSize() {
+ if (fMinSize == Area::kUndefinedSize)
+ fMinSize = CalculateMinSize();
+ return fMinSize;
+}
+
+
+/**
+ * Gets maximum size.
+ */
+BSize
+BALMLayout::BaseMaxSize()
+{
+ if (fMaxSize == Area::kUndefinedSize)
+ fMaxSize = CalculateMaxSize();
+ return fMaxSize;
+}
+
+
+/**
+ * Gets preferred size.
+ */
+BSize
+BALMLayout::BasePreferredSize()
+{
+ if (fPreferredSize == Area::kUndefinedSize)
+ fPreferredSize = CalculatePreferredSize();
+ return fPreferredSize;
+}
+
+
+/**
+ * Gets the alignment.
+ */
+BAlignment
+BALMLayout::BaseAlignment()
+{
+ BAlignment alignment;
+ alignment.SetHorizontal(B_ALIGN_HORIZONTAL_CENTER);
+ alignment.SetVertical(B_ALIGN_VERTICAL_CENTER);
+ return alignment;
+}
+
+
+/**
+ * Invalidates the layout.
+ * Resets minimum/maximum/preferred size.
+ */
+void
+BALMLayout::InvalidateLayout(bool children)
+{
+ BLayout::InvalidateLayout(children);
+ fMinSize = Area::kUndefinedSize;
+ fMaxSize = Area::kUndefinedSize;
+ fPreferredSize = Area::kUndefinedSize;
+}
+
+
+bool
+BALMLayout::ItemAdded(BLayoutItem* item, int32 atIndex)
+{
+ item->SetLayoutData(new(std::nothrow) Area(this, item));
+ return item->LayoutData() != NULL;
+}
+
+
+void
+BALMLayout::ItemRemoved(BLayoutItem* item, int32 fromIndex)
+{
+ if (Area* area = _AreaForItem(item)) {
+ item->SetLayoutData(NULL);
+ delete area;
+ }
+}
+
+
+/**
+ * Calculate and set the layout.
+ * If no layout specification is given, a specification is reverse engineered
automatically.
+ */
+void
+BALMLayout::DerivedLayoutItems()
+{
+ // TODO: modify to allow for viewlessness
+ // make sure that layout events occuring during layout are ignored
+ // i.e. activated is set to false during layout calculation
+ if (!fActivated)
+ return;
+ fActivated = false;
+
+ if (Owner() == NULL)
+ return;
+
+ _UpdateAreaConstraints();
+
+ // reverse engineer a layout specification if none was given
+ //~ if (this == NULL) RecoverLayout(View());
+
+ // if the layout engine is set to fit the GUI to the given size,
+ // then the given size is enforced by setting absolute positions
+ // for Right and Bottom
+ if (fLayoutStyle == FIT_TO_SIZE) {
+ BRect area(LayoutArea());
+ Right()->SetRange(area.right, area.right);
+ Bottom()->SetRange(area.bottom, area.bottom);
+ }
+
+ SolveLayout();
+
+ // if new layout is infasible, use previous layout
+ if (fSolver.Result() == INFEASIBLE) {
+ fActivated = true; // now layout calculation is allowed to run
again
+ return;
+ }
+
+ if (fSolver.Result() != OPTIMAL) {
+ fSolver.Save("failed-layout.txt");
+ printf("Could not solve the layout specification (%d). ",
+ fSolver.Result());
+ printf("Saved specification in file failed-layout.txt\n");
+ }
+
+ // change the size of the GUI according to the calculated size
+ // if the layout engine was configured to do so
+ if (fLayoutStyle == ADJUST_SIZE) {
+ Owner()->ResizeTo(floor(Right()->Value() - Left()->Value() +
0.5),
+ floor(Bottom()->Value() - Top()->Value() +
0.5));
+ }
+
+ // set the calculated positions and sizes for every area
+ for (int32 i = 0; i < CountItems(); i++)
+ _AreaForItem(ItemAt(i))->DoLayout();
+
+ fActivated = true;
+}
+
+
+/**
+ * Gets the path of the performance log file.
+ *
+ * @return the path of the performance log file
+ */
+char*
+BALMLayout::PerformancePath() const
+{
+ return fPerformancePath;
+}
+
+
+/**
+ * Sets the path of the performance log file.
+ *
+ * @param path the path of the performance log file
+ */
+void
+BALMLayout::SetPerformancePath(char* path)
+{
+ fPerformancePath = path;
+}
+
+
+LinearSpec*
+BALMLayout::Solver()
+{
+ return &fSolver;
+}
+
+
+/**
+ * Caculates the miminum size.
+ */
+BSize
+BALMLayout::CalculateMinSize()
+{
+ _UpdateAreaConstraints();
+
+ SummandList* oldObjFunction = fSolver.ObjFunction();
+ SummandList* newObjFunction = new SummandList(2);
+ newObjFunction->AddItem(new Summand(1.0, fRight));
+ newObjFunction->AddItem(new Summand(1.0, fBottom));
+ fSolver.SetObjFunction(newObjFunction);
+ SolveLayout();
+ fSolver.SetObjFunction(oldObjFunction);
+ fSolver.UpdateObjFunction();
+ delete newObjFunction->ItemAt(0);
+ delete newObjFunction->ItemAt(1);
+ delete newObjFunction;
+
+ if (fSolver.Result() == UNBOUNDED)
+ return Area::kMinSize;
+ if (fSolver.Result() != OPTIMAL) {
+ fSolver.Save("failed-layout.txt");
+ printf("Could not solve the layout specification (%d). "
+ "Saved specification in file failed-layout.txt",
fSolver.Result());
+ }
+
+ return BSize(Right()->Value() - Left()->Value(),
+ Bottom()->Value() - Top()->Value());
+}
+
+
+/**
+ * Caculates the maximum size.
+ */
+BSize
+BALMLayout::CalculateMaxSize()
+{
+ _UpdateAreaConstraints();
+
+ SummandList* oldObjFunction = fSolver.ObjFunction();
+ SummandList* newObjFunction = new SummandList(2);
+ newObjFunction->AddItem(new Summand(-1.0, fRight));
+ newObjFunction->AddItem(new Summand(-1.0, fBottom));
+ fSolver.SetObjFunction(newObjFunction);
+ SolveLayout();
+ fSolver.SetObjFunction(oldObjFunction);
+ fSolver.UpdateObjFunction();
+ delete newObjFunction->ItemAt(0);
+ delete newObjFunction->ItemAt(1);
+ delete newObjFunction;
+
+ if (fSolver.Result() == UNBOUNDED)
+ return Area::kMaxSize;
+ if (fSolver.Result() != OPTIMAL) {
+ fSolver.Save("failed-layout.txt");
+ printf("Could not solve the layout specification (%d). "
+ "Saved specification in file failed-layout.txt",
fSolver.Result());
+ }
+
+ return BSize(Right()->Value() - Left()->Value(),
+ Bottom()->Value() - Top()->Value());
+}
+
+
+/**
+ * Caculates the preferred size.
+ */
+BSize
+BALMLayout::CalculatePreferredSize()
+{
+ _UpdateAreaConstraints();
+
+ SolveLayout();
+ if (fSolver.Result() != OPTIMAL) {
+ fSolver.Save("failed-layout.txt");
+ printf("Could not solve the layout specification (%d). "
+ "Saved specification in file failed-layout.txt",
fSolver.Result());
+ }
+
+ return BSize(Right()->Value() - Left()->Value(),
+ Bottom()->Value() - Top()->Value());
+}
+
+
+Area*
+BALMLayout::_AreaForItem(BLayoutItem* item) const
+{
+ if (!item)
+ return NULL;
+ return static_cast<Area*>(item->LayoutData());
+}
+
+
+void
+BALMLayout::_UpdateAreaConstraints()
+{
+ for (int i = 0; i < CountItems(); i++)
+ _AreaForItem(ItemAt(i))->InvalidateSizeConstraints();
+}
Modified: haiku/trunk/src/libs/alm/Jamfile
===================================================================
--- haiku/trunk/src/libs/alm/Jamfile 2010-09-21 23:22:17 UTC (rev 38770)
+++ haiku/trunk/src/libs/alm/Jamfile 2010-09-21 23:31:50 UTC (rev 38771)
@@ -9,7 +9,7 @@
SharedLibrary libalm.so :
Area.cpp
Column.cpp
- BALMLayout.cpp
+ ALMLayout.cpp
Row.cpp
XTab.cpp
YTab.cpp
Modified: haiku/trunk/src/tests/libs/alm/Areas.cpp
===================================================================
--- haiku/trunk/src/tests/libs/alm/Areas.cpp 2010-09-21 23:22:17 UTC (rev
38770)
+++ haiku/trunk/src/tests/libs/alm/Areas.cpp 2010-09-21 23:31:50 UTC (rev
38771)
@@ -3,7 +3,7 @@
#include <List.h>
#include <Window.h>
-#include "BALMLayout.h"
+#include "ALMLayout.h"
class AreasWindow : public BWindow {
Modified: haiku/trunk/src/tests/libs/alm/HelloWorld.cpp
===================================================================
--- haiku/trunk/src/tests/libs/alm/HelloWorld.cpp 2010-09-21 23:22:17 UTC
(rev 38770)
+++ haiku/trunk/src/tests/libs/alm/HelloWorld.cpp 2010-09-21 23:31:50 UTC
(rev 38771)
@@ -1,3 +1,10 @@
+/*
+ * Copyright 2007-2008, Christof Lutteroth, lutteroth@xxxxxxxxxxxxxxxxx
+ * Copyright 2007-2008, James Kim, jkim202@xxxxxxxxxxxxxxxxx
+ * Copyright 2010, Clemens Zeidler <haiku@xxxxxxxxxxxxxxxxxx>
+ * Distributed under the terms of the MIT License.
+ */
+
#include <Application.h>
#include <Button.h>
#include <List.h>
@@ -4,10 +11,7 @@
#include <Window.h>
// include this for ALM
-#include "XTab.h"
-#include "YTab.h"
-#include "Area.h"
-#include "BALMLayout.h"
+#include "ALMLayout.h"
class HelloWorldWindow : public BWindow {
@@ -24,10 +28,8 @@
// add an area containing the button
// use the borders of the layout as the borders for the area
- Area* a = fLayout->AddArea(
- fLayout->Left(), fLayout->Top(),
- fLayout->Right(), fLayout->Bottom(),
- button1);
+ fLayout->AddArea(fLayout->Left(), fLayout->Top(),
fLayout->Right(),
+ fLayout->Bottom(), button1);
button1->SetExplicitMinSize(BSize(0, 50));
button1->SetExplicitMaxSize(BSize(500, 500));
Modified: haiku/trunk/src/tests/libs/alm/Pinwheel.cpp
===================================================================
--- haiku/trunk/src/tests/libs/alm/Pinwheel.cpp 2010-09-21 23:22:17 UTC (rev
38770)
+++ haiku/trunk/src/tests/libs/alm/Pinwheel.cpp 2010-09-21 23:31:50 UTC (rev
38771)
@@ -1,3 +1,10 @@
+/*
+ * Copyright 2007-2008, Christof Lutteroth, lutteroth@xxxxxxxxxxxxxxxxx
+ * Copyright 2007-2008, James Kim, jkim202@xxxxxxxxxxxxxxxxx
+ * Copyright 2010, Clemens Zeidler <haiku@xxxxxxxxxxxxxxxxxx>
+ * Distributed under the terms of the MIT License.
+ */
+
#include <Application.h>
#include <Button.h>
#include <TextView.h>
@@ -5,10 +12,7 @@
#include <Window.h>
// include this for ALM
-#include "XTab.h"
-#include "YTab.h"
-#include "Area.h"
-#include "BALMLayout.h"
+#include "ALMLayout.h"
class PinwheelWindow : public BWindow {
Modified: haiku/trunk/src/tests/libs/alm/TableDemo.cpp
===================================================================
--- haiku/trunk/src/tests/libs/alm/TableDemo.cpp 2010-09-21 23:22:17 UTC
(rev 38770)
+++ haiku/trunk/src/tests/libs/alm/TableDemo.cpp 2010-09-21 23:31:50 UTC
(rev 38771)
@@ -1,6 +1,7 @@
/*
* Copyright 2007-2008, Christof Lutteroth, lutteroth@xxxxxxxxxxxxxxxxx
* Copyright 2007-2008, James Kim, jkim202@xxxxxxxxxxxxxxxxx
+ * Copyright 2010, Clemens Zeidler <haiku@xxxxxxxxxxxxxxxxxx>
* Distributed under the terms of the MIT License.
*/
@@ -9,7 +10,7 @@
#include <Button.h>
#include <Window.h>
-#include "BALMLayout.h"
+#include "ALMLayout.h"
class TableDemoWindow : public BWindow {
Modified: haiku/trunk/src/tests/libs/alm/TwoViews.cpp
===================================================================
--- haiku/trunk/src/tests/libs/alm/TwoViews.cpp 2010-09-21 23:22:17 UTC (rev
38770)
+++ haiku/trunk/src/tests/libs/alm/TwoViews.cpp 2010-09-21 23:31:50 UTC (rev
38771)
@@ -1,3 +1,10 @@
+/*
+ * Copyright 2007-2008, Christof Lutteroth, lutteroth@xxxxxxxxxxxxxxxxx
+ * Copyright 2007-2008, James Kim, jkim202@xxxxxxxxxxxxxxxxx
+ * Copyright 2010, Clemens Zeidler <haiku@xxxxxxxxxxxxxxxxxx>
+ * Distributed under the terms of the MIT License.
+ */
+
#include <Application.h>
#include <Button.h>
#include <TextView.h>
@@ -4,7 +11,7 @@
#include <List.h>
#include <Window.h>
-#include "BALMLayout.h"
+#include "ALMLayout.h"
class TwoViewsWindow : public BWindow {
Other related posts:
- » [haiku-commits] r38771 - in haiku/trunk: headers/libs/alm src/libs/alm src/tests/libs/alm - clemens . zeidler
