Merge from layout management branch.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18649 a95241bf-73f2-0310-859d-f6bbb57e9c96
2006-08-26 16:21:15 +00:00
parent 01595708f3
commit 9ecf9d1c1d
277 changed files with 45889 additions and 747 deletions
@@ -179,14 +179,24 @@ struct scroll_bar_info {
 enum alignment {
 	B_ALIGN_LEFT,
    B_ALIGN_RIGHT,
-    B_ALIGN_CENTER
+    B_ALIGN_CENTER,
+
+	B_ALIGN_HORIZONTAL_CENTER	= B_ALIGN_CENTER,
+
+	B_ALIGN_HORIZONTAL_UNSET	= -1L,
+	B_ALIGN_USE_FULL_WIDTH		= -2L,
 };

 enum vertical_alignment {
 	B_ALIGN_TOP = 0x10L,
 	B_ALIGN_MIDDLE = 0x20,
 	B_ALIGN_BOTTOM = 0x30,
-	B_ALIGN_NO_VERTICAL = -1L
+
+	B_ALIGN_VERTICAL_CENTER		= B_ALIGN_MIDDLE,
+
+	B_ALIGN_VERTICAL_UNSET		= -1L,
+	B_ALIGN_NO_VERTICAL			= B_ALIGN_VERTICAL_UNSET,
+	B_ALIGN_USE_FULL_HEIGHT		= -2L,
 };

 /*----------------------------------------------------------------*/