align to horizontal_alignment, valign to vertical_alignment, related

3 files changed, 48 insertions, 46 deletions

diff --git a/core/core_constants.cpp b/core/core_constants.cpp
index dd1754f010..51fcfd5305 100644
--- a/core/core_constants.cpp
+++ b/core/core_constants.cpp
@@ -142,27 +142,28 @@ void register_global_constants() {
 	BIND_CORE_ENUM_CONSTANT(CLOCKWISE);
 	BIND_CORE_ENUM_CONSTANT(COUNTERCLOCKWISE);
 
-	BIND_CORE_ENUM_CONSTANT(HALIGN_LEFT);
-	BIND_CORE_ENUM_CONSTANT(HALIGN_CENTER);
-	BIND_CORE_ENUM_CONSTANT(HALIGN_RIGHT);
-	BIND_CORE_ENUM_CONSTANT(HALIGN_FILL);
-
-	BIND_CORE_ENUM_CONSTANT(VALIGN_TOP);
-	BIND_CORE_ENUM_CONSTANT(VALIGN_CENTER);
-	BIND_CORE_ENUM_CONSTANT(VALIGN_BOTTOM);
-
-	BIND_CORE_ENUM_CONSTANT(INLINE_ALIGN_TOP_TO);
-	BIND_CORE_ENUM_CONSTANT(INLINE_ALIGN_CENTER_TO);
-	BIND_CORE_ENUM_CONSTANT(INLINE_ALIGN_BOTTOM_TO);
-
-	BIND_CORE_ENUM_CONSTANT(INLINE_ALIGN_TO_TOP);
-	BIND_CORE_ENUM_CONSTANT(INLINE_ALIGN_TO_CENTER);
-	BIND_CORE_ENUM_CONSTANT(INLINE_ALIGN_TO_BASELINE);
-	BIND_CORE_ENUM_CONSTANT(INLINE_ALIGN_TO_BOTTOM);
-
-	BIND_CORE_ENUM_CONSTANT(INLINE_ALIGN_TOP);
-	BIND_CORE_ENUM_CONSTANT(INLINE_ALIGN_CENTER);
-	BIND_CORE_ENUM_CONSTANT(INLINE_ALIGN_BOTTOM);
+	BIND_CORE_ENUM_CONSTANT(HORIZONTAL_ALIGNMENT_LEFT);
+	BIND_CORE_ENUM_CONSTANT(HORIZONTAL_ALIGNMENT_CENTER);
+	BIND_CORE_ENUM_CONSTANT(HORIZONTAL_ALIGNMENT_RIGHT);
+	BIND_CORE_ENUM_CONSTANT(HORIZONTAL_ALIGNMENT_FILL);
+
+	BIND_CORE_ENUM_CONSTANT(VERTICAL_ALIGNMENT_TOP);
+	BIND_CORE_ENUM_CONSTANT(VERTICAL_ALIGNMENT_CENTER);
+	BIND_CORE_ENUM_CONSTANT(VERTICAL_ALIGNMENT_BOTTOM);
+	BIND_CORE_ENUM_CONSTANT(VERTICAL_ALIGNMENT_FILL);
+
+	BIND_CORE_ENUM_CONSTANT(INLINE_ALIGNMENT_TOP_TO);
+	BIND_CORE_ENUM_CONSTANT(INLINE_ALIGNMENT_CENTER_TO);
+	BIND_CORE_ENUM_CONSTANT(INLINE_ALIGNMENT_BOTTOM_TO);
+
+	BIND_CORE_ENUM_CONSTANT(INLINE_ALIGNMENT_TO_TOP);
+	BIND_CORE_ENUM_CONSTANT(INLINE_ALIGNMENT_TO_CENTER);
+	BIND_CORE_ENUM_CONSTANT(INLINE_ALIGNMENT_TO_BASELINE);
+	BIND_CORE_ENUM_CONSTANT(INLINE_ALIGNMENT_TO_BOTTOM);
+
+	BIND_CORE_ENUM_CONSTANT(INLINE_ALIGNMENT_TOP);
+	BIND_CORE_ENUM_CONSTANT(INLINE_ALIGNMENT_CENTER);
+	BIND_CORE_ENUM_CONSTANT(INLINE_ALIGNMENT_BOTTOM);
 
 	BIND_CORE_ENUM_CLASS_CONSTANT(Key, KEY, SPECIAL);
 	BIND_CORE_ENUM_CLASS_CONSTANT(Key, KEY, ESCAPE);
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 {
diff --git a/core/variant/binder_common.h b/core/variant/binder_common.h
index 3f9f7e02b2..3fb4af4944 100644
--- a/core/variant/binder_common.h
+++ b/core/variant/binder_common.h
@@ -106,9 +106,9 @@ VARIANT_ENUM_CAST(KeyModifierMask);
 VARIANT_ENUM_CAST(MIDIMessage);
 VARIANT_ENUM_CAST(MouseButton);
 VARIANT_ENUM_CAST(Orientation);
-VARIANT_ENUM_CAST(HAlign);
-VARIANT_ENUM_CAST(VAlign);
-VARIANT_ENUM_CAST(InlineAlign);
+VARIANT_ENUM_CAST(HorizontalAlignment);
+VARIANT_ENUM_CAST(VerticalAlignment);
+VARIANT_ENUM_CAST(InlineAlignment);
 VARIANT_ENUM_CAST(PropertyHint);
 VARIANT_ENUM_CAST(PropertyUsageFlags);
 VARIANT_ENUM_CAST(Variant::Type);