align to horizontal_alignment, valign to vertical_alignment, related

1 files changed, 23 insertions, 22 deletions

diff --git a/core/math/math_defs.h b/core/math/math_defs.h
index 900e90a598..1c6139688b 100644
--- a/core/math/math_defs.h
+++ b/core/math/math_defs.h
@@ -68,37 +68,38 @@ enum Orientation {
 	VERTICAL
 };
 
-enum HAlign {
-	HALIGN_LEFT,
-	HALIGN_CENTER,
-	HALIGN_RIGHT,
-	HALIGN_FILL,
+enum HorizontalAlignment {
+	HORIZONTAL_ALIGNMENT_LEFT,
+	HORIZONTAL_ALIGNMENT_CENTER,
+	HORIZONTAL_ALIGNMENT_RIGHT,
+	HORIZONTAL_ALIGNMENT_FILL,
 };
 
-enum VAlign {
-	VALIGN_TOP,
-	VALIGN_CENTER,
-	VALIGN_BOTTOM
+enum VerticalAlignment {
+	VERTICAL_ALIGNMENT_TOP,
+	VERTICAL_ALIGNMENT_CENTER,
+	VERTICAL_ALIGNMENT_BOTTOM,
+	VERTICAL_ALIGNMENT_FILL,
 };
 
-enum InlineAlign {
+enum InlineAlignment {
 	// Image alignment points.
-	INLINE_ALIGN_TOP_TO = 0b0000,
-	INLINE_ALIGN_CENTER_TO = 0b0001,
-	INLINE_ALIGN_BOTTOM_TO = 0b0010,
-	INLINE_ALIGN_IMAGE_MASK = 0b0011,
+	INLINE_ALIGNMENT_TOP_TO = 0b0000,
+	INLINE_ALIGNMENT_CENTER_TO = 0b0001,
+	INLINE_ALIGNMENT_BOTTOM_TO = 0b0010,
+	INLINE_ALIGNMENT_IMAGE_MASK = 0b0011,
 
 	// Text alignment points.
-	INLINE_ALIGN_TO_TOP = 0b0000,
-	INLINE_ALIGN_TO_CENTER = 0b0100,
-	INLINE_ALIGN_TO_BASELINE = 0b1000,
-	INLINE_ALIGN_TO_BOTTOM = 0b1100,
-	INLINE_ALIGN_TEXT_MASK = 0b1100,
+	INLINE_ALIGNMENT_TO_TOP = 0b0000,
+	INLINE_ALIGNMENT_TO_CENTER = 0b0100,
+	INLINE_ALIGNMENT_TO_BASELINE = 0b1000,
+	INLINE_ALIGNMENT_TO_BOTTOM = 0b1100,
+	INLINE_ALIGNMENT_TEXT_MASK = 0b1100,
 
 	// Presets.
-	INLINE_ALIGN_TOP = INLINE_ALIGN_TOP_TO | INLINE_ALIGN_TO_TOP,
-	INLINE_ALIGN_CENTER = INLINE_ALIGN_CENTER_TO | INLINE_ALIGN_TO_CENTER,
-	INLINE_ALIGN_BOTTOM = INLINE_ALIGN_BOTTOM_TO | INLINE_ALIGN_TO_BOTTOM
+	INLINE_ALIGNMENT_TOP = INLINE_ALIGNMENT_TOP_TO | INLINE_ALIGNMENT_TO_TOP,
+	INLINE_ALIGNMENT_CENTER = INLINE_ALIGNMENT_CENTER_TO | INLINE_ALIGNMENT_TO_CENTER,
+	INLINE_ALIGNMENT_BOTTOM = INLINE_ALIGNMENT_BOTTOM_TO | INLINE_ALIGNMENT_TO_BOTTOM
 };
 
 enum Side {