Merge pull request #49587 from bruvzg/text_server_inline_align

[Text Server] Improve object (image/table) inline alignment.

3 files changed, 34 insertions, 0 deletions

diff --git a/core/core_constants.cpp b/core/core_constants.cpp
index de15cfd14a..cd8096c610 100644
--- a/core/core_constants.cpp
+++ b/core/core_constants.cpp
@@ -133,6 +133,19 @@ void register_global_constants() {
 	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);
+
 	// huge list of keys
 	BIND_CORE_CONSTANT(SPKEY);
 
diff --git a/core/math/math_defs.h b/core/math/math_defs.h
index 7692e1be47..c3a8f910c0 100644
--- a/core/math/math_defs.h
+++ b/core/math/math_defs.h
@@ -81,6 +81,26 @@ enum VAlign {
 	VALIGN_BOTTOM
 };
 
+enum InlineAlign {
+	// Image alignment points.
+	INLINE_ALIGN_TOP_TO = 0b0000,
+	INLINE_ALIGN_CENTER_TO = 0b0001,
+	INLINE_ALIGN_BOTTOM_TO = 0b0010,
+	INLINE_ALIGN_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,
+
+	// 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
+};
+
 enum Side {
 	SIDE_LEFT,
 	SIDE_TOP,
diff --git a/core/variant/binder_common.h b/core/variant/binder_common.h
index 3cb2a6bfb5..001da3ddcb 100644
--- a/core/variant/binder_common.h
+++ b/core/variant/binder_common.h
@@ -101,6 +101,7 @@ VARIANT_ENUM_CAST(MouseButton);
 VARIANT_ENUM_CAST(Orientation);
 VARIANT_ENUM_CAST(HAlign);
 VARIANT_ENUM_CAST(VAlign);
+VARIANT_ENUM_CAST(InlineAlign);
 VARIANT_ENUM_CAST(PropertyHint);
 VARIANT_ENUM_CAST(PropertyUsageFlags);
 VARIANT_ENUM_CAST(Variant::Type);