- Don't pass a min size in the Area _Init function. The min size is updated before solving the layout so we don't have to set it in the beginning. This also simplifies the BALMLayout api.

- Header include style fixes.



git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38788 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Clemens Zeidler
2010-09-22 21:53:32 +00:00
parent 30c47afa79
commit 9503cf19be
11 changed files with 33 additions and 75 deletions
+5 -8
View File
@@ -5,6 +5,7 @@
#ifndef ALM_LAYOUT_H
#define ALM_LAYOUT_H
#include <AbstractLayout.h>
#include <File.h>
#include <List.h>
@@ -22,8 +23,8 @@
namespace BALM {
/**
* A GUI layout engine using the ALM.
/*!
* A GUI layout engine using the Auckland Layout Model (ALM).
*/
class BALMLayout : public BAbstractLayout {
public:
@@ -36,11 +37,7 @@ public:
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,
@@ -62,7 +59,7 @@ public:
virtual bool ItemAdded(BLayoutItem* item, int32 atIndex);
virtual void ItemRemoved(BLayoutItem* item, int32 fromIndex);
virtual void DerivedLayoutItems();
char* PerformancePath() const;
void SetPerformancePath(char* path);
+3 -3
View File
@@ -5,6 +5,7 @@
#ifndef AREA_H
#define AREA_H
#include <Alignment.h>
#include <List.h>
#include <Size.h>
@@ -81,10 +82,9 @@ private:
Area(BLayoutItem* item);
void _Init(LinearSpec* ls, XTab* left, YTab* top,
XTab* right, YTab* bottom, BView* content,
BSize minContentSize);
XTab* right, YTab* bottom, BView* content);
void _Init(LinearSpec* ls, Row* row, Column* column,
BView* content, BSize minContentSize);
BView* content);
void _DoLayout();
+1
View File
@@ -5,6 +5,7 @@
#ifndef COLUMN_H
#define COLUMN_H
#include <List.h>
#include "Constraint.h"
+1
View File
@@ -5,6 +5,7 @@
#ifndef ROW_H
#define ROW_H
#include <List.h>
#include "Constraint.h"
+1
View File
@@ -5,6 +5,7 @@
#ifndef X_TAB_H
#define X_TAB_H
#include "LinearSpec.h"
#include "Variable.h"
+1
View File
@@ -5,6 +5,7 @@
#ifndef Y_TAB_H
#define Y_TAB_H
#include "LinearSpec.h"
#include "Variable.h"