Move vertical align back into canvas text.

3 files changed, 27 insertions, 8 deletions

diff --git a/src/lib/elementary/efl2_ui_text.eo b/src/lib/elementary/efl2_ui_text.eo
index 79cec75b97..f4a50b1474 100644
--- a/src/lib/elementary/efl2_ui_text.eo
+++ b/src/lib/elementary/efl2_ui_text.eo
@@ -36,14 +36,6 @@ class @beta Efl2.Ui.Text extends Efl.Ui.Layout_Base implements Efl.Input.Clickab
      like automatic scrollbars, virtual keyboard, clipboard, configurable
      context menus, password mode or autocapitalization, for example.]]
    methods {
-      // FIXME: rename and improve doc
-      @property vertical_align {
-         [[Vertical alignment of text]]
-         values {
-            value: double; [[Vertical alignment value]]
-         }
-      }
-
       @property scrollable {
          [[Enable or disable scrolling in the widget.
 
diff --git a/src/lib/evas/canvas/efl2_canvas_text.eo b/src/lib/evas/canvas/efl2_canvas_text.eo
index bacadc30f0..c8a4847855 100644
--- a/src/lib/evas/canvas/efl2_canvas_text.eo
+++ b/src/lib/evas/canvas/efl2_canvas_text.eo
@@ -19,6 +19,15 @@ class @beta Efl2.Canvas.Text extends Efl.Canvas.Object implements Efl2.Text.Cont
 {
    [[Efl canvas text class]]
    methods {
+      @property vertical_align {
+         [[Vertical alignment of text]]
+         set {}
+         get {}
+         values {
+            value: double; [[Vertical alignment value]]
+         }
+      }
+
       @property is_empty {
          [[Whether the object is empty (no text) or not
          ]]
diff --git a/src/lib/evas/canvas/efl_canvas_text.c b/src/lib/evas/canvas/efl_canvas_text.c
index 084be4da48..b451de2b0a 100644
--- a/src/lib/evas/canvas/efl_canvas_text.c
+++ b/src/lib/evas/canvas/efl_canvas_text.c
@@ -7066,6 +7066,24 @@ _efl2_canvas_text_is_ellipsized_get(const Eo *eo_obj EINA_UNUSED, Efl2_Canvas_Te
 }
 
 EOLIAN static void
+_efl2_canvas_text_vertical_align_set(Eo *eo_obj, Efl2_Canvas_Text_Data *o, double align)
+{
+   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+   evas_object_async_block(obj);
+   if (align < 0.0) align = 0.0;
+   else if (align > 1.0) align = 1.0;
+   if (EINA_DBL_EQ(o->valign, align)) return;
+   o->valign = align;
+   _evas_textblock_changed(o, eo_obj);
+}
+
+EOLIAN static double
+_efl2_canvas_text_vertical_align_get(const Eo *obj EINA_UNUSED, Efl2_Canvas_Text_Data *o)
+{
+   return o->valign;
+}
+
+EOLIAN static void
 _efl_canvas_text_bidi_delimiters_set(Eo *eo_obj EINA_UNUSED, Efl2_Canvas_Text_Data *o, const char *delim)
 {
    Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);