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

Add default spacing for Layouts (#5614)

Browse Source 
* introduce B_USE_DEFAULT_SPACING, which works somewhat like B_SIZE_UNSET and B_ALIGN_HORIZONTAL_UNSET
* introduce static float BControlLook::ComposeItemSpacing(float spacing), which checks uses be_control_look->DefaultItemSpacing().
* modify layouts to use BControlLook::ComposeItemSpacing() in SetInsets and SetSpacing methods.
* default insets are still 0, 0, 0, 0, but can be set to default spacing by passing B_USE_DEFAULT_SPACING
* I've found two regressions, patches incoming, please report others on #5614.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38512 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Alex Wilson
2010-09-02 22:58:24 +00:00
parent 743d974099
commit 82ab316723
17 changed files with 85 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/interface/ControlLook.h
+1
View File
@@ -79,6 +79,7 @@ public:
/* TODO: virtual*/
float DefaultItemSpacing() const;
static float ComposeItemSpacing(float spacing);
uint32 Flags(BControl* control) const;
headers/os/interface/GridLayout.h
+3 -2
View File
@@ -10,8 +10,9 @@
class BGridLayout : public BTwoDimensionalLayout {
public:
BGridLayout(float horizontal = 0.0f,
float vertical = 0.0f);
BGridLayout(float horizontal
= B_USE_DEFAULT_SPACING,
float vertical = B_USE_DEFAULT_SPACING);
BGridLayout(BMessage* from);
virtual ~BGridLayout();
headers/os/interface/GridLayoutBuilder.h
+3 -3
View File
@@ -9,9 +9,9 @@
class BGridLayoutBuilder {
public:
BGridLayoutBuilder(
float horizontalSpacing = 0.0f,
float verticalSpacing = 0.0f);
BGridLayoutBuilder(float horizontal
= B_USE_DEFAULT_SPACING,
float vertical = B_USE_DEFAULT_SPACING);
BGridLayoutBuilder(BGridLayout* layout);
BGridLayoutBuilder(BGridView* view);
headers/os/interface/GridView.h
+6 -2
View File
@@ -11,8 +11,12 @@
class BGridView : public BView {
public:
BGridView(float horizontalSpacing = 0.0f,
float verticalSpacing = 0.0f);
BGridView(float horizontal
= B_USE_DEFAULT_SPACING,
float vertical = B_USE_DEFAULT_SPACING);
BGridView(const char* name,
float horizontal = B_USE_DEFAULT_SPACING,
float vertical = B_USE_DEFAULT_SPACING);
BGridView(BMessage* from);
virtual ~BGridView();
headers/os/interface/GroupLayout.h
+1 -1
View File
@@ -10,7 +10,7 @@
class BGroupLayout : public BTwoDimensionalLayout {
public:
BGroupLayout(enum orientation orientation,
float spacing = 0.0f);
float spacing = B_USE_DEFAULT_SPACING);
BGroupLayout(BMessage* from);
virtual ~BGroupLayout();
headers/os/interface/GroupLayoutBuilder.h
+3 -2
View File
@@ -13,7 +13,7 @@ class BGroupLayoutBuilder {
public:
BGroupLayoutBuilder(
enum orientation orientation = B_HORIZONTAL,
float spacing = 0.0f);
float spacing = B_USE_DEFAULT_SPACING);
BGroupLayoutBuilder(BGroupLayout* layout);
BGroupLayoutBuilder(BGroupView* view);
@@ -29,7 +29,8 @@ public:
BGroupLayoutBuilder& Add(BLayoutItem* item, float weight);
BGroupLayoutBuilder& AddGroup(enum orientation orientation,
float spacing = 0.0f, float weight = 1.0f);
float spacing = B_USE_DEFAULT_SPACING,
float weight = 1.0f);
BGroupLayoutBuilder& End();
BGroupLayoutBuilder& AddGlue(float weight = 1.0f);
headers/os/interface/GroupView.h
+2 -2
View File
@@ -14,10 +14,10 @@ class BGroupView : public BView {
public:
BGroupView(
enum orientation orientation = B_HORIZONTAL,
float spacing = 0.0f);
float spacing = B_USE_DEFAULT_SPACING);
BGroupView(const char* name,
enum orientation orientation = B_HORIZONTAL,
float spacing = 0.0f);
float spacing = B_USE_DEFAULT_SPACING);
BGroupView(BMessage* from);
virtual ~BGroupView();
headers/os/interface/InterfaceDefs.h
+2
View File
@@ -223,6 +223,8 @@ enum vertical_alignment {
B_ALIGN_USE_FULL_HEIGHT = -2L
};
const float B_USE_DEFAULT_SPACING = -2.0f;
// Line join and cap modes
headers/os/interface/LayoutBuilder.h
+22 -15
View File
@@ -51,10 +51,10 @@ public:
public:
inline Group(enum orientation orientation
= B_HORIZONTAL,
float spacing = 0.0f);
float spacing = B_USE_DEFAULT_SPACING);
inline Group(BWindow* window,
enum orientation orientation = B_HORIZONTAL,
float spacing = 0.0f);
float spacing = B_USE_DEFAULT_SPACING);
inline Group(BGroupLayout* layout);
inline Group(BGroupView* view);
@@ -69,14 +69,16 @@ public:
inline ThisBuilder& Add(BLayoutItem* item, float weight);
inline GroupBuilder AddGroup(enum orientation orientation,
float spacing = 0.0f, float weight = 1.0f);
float spacing = B_USE_DEFAULT_SPACING,
float weight = 1.0f);
inline GroupBuilder AddGroup(BGroupView* groupView,
float weight = 1.0f);
inline GroupBuilder AddGroup(BGroupLayout* groupLayout,
float weight = 1.0f);
inline GridBuilder AddGrid(float horizontalSpacing = 0.0f,
float verticalSpacing = 0.0f,
inline GridBuilder AddGrid(float horizontal
= B_USE_DEFAULT_SPACING,
float vertical = B_USE_DEFAULT_SPACING,
float weight = 1.0f);
inline GridBuilder AddGrid(BGridLayout* gridLayout,
float weight = 1.0f);
@@ -84,7 +86,8 @@ public:
float weight = 1.0f);
inline SplitBuilder AddSplit(enum orientation orientation,
float spacing = 0.0f, float weight = 1.0f);
float spacing = B_USE_DEFAULT_SPACING,
float weight = 1.0f);
inline SplitBuilder AddSplit(BSplitView* splitView,
float weight = 1.0f);
@@ -110,11 +113,12 @@ public:
typedef Split<ThisBuilder> SplitBuilder;
public:
inline Grid(float horizontalSpacing = 0.0f,
float verticalSpacing = 0.0f);
inline Grid(float horizontal
= B_USE_DEFAULT_SPACING,
float vertical = B_USE_DEFAULT_SPACING);
inline Grid(BWindow* window,
float horizontalSpacing = 0.0f,
float verticalSpacing = 0.0f);
float horizontal = B_USE_DEFAULT_SPACING,
float vertical = B_USE_DEFAULT_SPACING);
inline Grid(BGridLayout* layout);
inline Grid(BGridView* view);
@@ -190,7 +194,7 @@ public:
public:
inline Split(enum orientation orientation
= B_HORIZONTAL,
float spacing = 0.0f);
float spacing = B_USE_DEFAULT_SPACING);
inline Split(BSplitView* view);
inline BSplitView* View() const;
@@ -203,14 +207,16 @@ public:
inline ThisBuilder& Add(BLayoutItem* item, float weight);
inline GroupBuilder AddGroup(enum orientation orientation,
float spacing = 0.0f, float weight = 1.0f);
float spacing = B_USE_DEFAULT_SPACING,
float weight = 1.0f);
inline GroupBuilder AddGroup(BGroupView* groupView,
float weight = 1.0f);
inline GroupBuilder AddGroup(BGroupLayout* groupLayout,
float weight = 1.0f);
inline GridBuilder AddGrid(float horizontalSpacing = 0.0f,
float verticalSpacing = 0.0f,
inline GridBuilder AddGrid(float horizontal
= B_USE_DEFAULT_SPACING,
float vertical = B_USE_DEFAULT_SPACING,
float weight = 1.0f);
inline GridBuilder AddGrid(BGridView* gridView,
float weight = 1.0f);
@@ -218,7 +224,8 @@ public:
float weight = 1.0f);
inline SplitBuilder AddSplit(enum orientation orientation,
float spacing = 0.0f, float weight = 1.0f);
float spacing = B_USE_DEFAULT_SPACING,
float weight = 1.0f);
inline SplitBuilder AddSplit(BSplitView* splitView,
float weight = 1.0f);
headers/os/interface/SplitLayoutBuilder.h
+1 -1
View File
@@ -11,7 +11,7 @@ class BSplitLayoutBuilder {
public:
BSplitLayoutBuilder(
enum orientation orientation = B_HORIZONTAL,
float spacing = 0.0f);
float spacing = B_USE_DEFAULT_SPACING);
BSplitLayoutBuilder(BSplitView* view);
BSplitView* SplitView() const;
headers/os/interface/SplitView.h
+1 -1
View File
@@ -15,7 +15,7 @@ public:
BSplitView(
enum orientation orientation
= B_HORIZONTAL,
float spacing = 0.0f);
float spacing = B_USE_DEFAULT_SPACING);
BSplitView(BMessage* from);
virtual ~BSplitView();