Rename Efl.Ui.Direction -> Efl.Ui.Layout_Orientation

Summary:
This clarifies a bit the whole Orientation vs. Direction confusion, at the
expense of longer names (Image_Orientation vs. Layout_Orientation).
Also, the interfaces are now adjectives (Orientable) and the enums have long
names (*_Orientation).

Pretty big patch, but no functional changes.

Relates to T7863

Test Plan:
Everything builds and passes tests.
Elementary_tests show same behavior, including the "inverted" widgets, which
are the only parts which received a bit of code changes.
Proof:
https://travis-ci.org/Enlightenment/efl/builds/536277282

Reviewers: zmike, bu5hm4n, cedric

Reviewed By: zmike

Subscribers: #reviewers, #committers

Tags: #efl

Differential Revision: https://phab.enlightenment.org/D8946

10 files changed, 83 insertions, 79 deletions

diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h
index 2b5f62a04d..aa88196720 100644
--- a/src/lib/efl/Efl.h
+++ b/src/lib/efl/Efl.h
@@ -97,8 +97,8 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
 #include "interfaces/efl_text.eo.h"
 #include "interfaces/efl_text_types.eot.h"
 #include "interfaces/efl_ui_i18n.eo.h"
-#include "interfaces/efl_ui_direction.eo.h"
-#include "interfaces/efl_ui_direction_readonly.eo.h"
+#include "interfaces/efl_ui_layout_orientable.eo.h"
+#include "interfaces/efl_ui_layout_orientable_readonly.eo.h"
 #include "interfaces/efl_ui_drag.eo.h"
 #include "interfaces/efl_ui_range_display.eo.h"
 #include "interfaces/efl_ui_range_interactive.eo.h"
diff --git a/src/lib/efl/interfaces/efl_gfx_image_orientable.eo b/src/lib/efl/interfaces/efl_gfx_image_orientable.eo
index 7530b8568c..2070feb737 100644
--- a/src/lib/efl/interfaces/efl_gfx_image_orientable.eo
+++ b/src/lib/efl/interfaces/efl_gfx_image_orientable.eo
@@ -1,4 +1,4 @@
-parse efl_ui_direction;
+parse efl_ui_layout_orientable;
 
 enum @beta Efl.Gfx.Image_Orientation
 {
@@ -10,7 +10,7 @@ enum @beta Efl.Gfx.Image_Orientation
      its roof pointing to the right if the $right orientation is used).
      Flipping values ($flip_horizontal and $flip_vertical) can be additionaly added
      to produce a mirroring in each axis.
-     Not to be confused with @Efl.Ui.Dir which is meant for widgets, rather
+     Not to be confused with @Efl.Ui.Layout_Orientation which is meant for widgets, rather
      than images and canvases. This enum is used to rotate images, videos and
      the like.
    ]]
diff --git a/src/lib/efl/interfaces/efl_interfaces_main.c b/src/lib/efl/interfaces/efl_interfaces_main.c
index 57113a52af..0817211ffb 100644
--- a/src/lib/efl/interfaces/efl_interfaces_main.c
+++ b/src/lib/efl/interfaces/efl_interfaces_main.c
@@ -61,7 +61,7 @@
 #include "interfaces/efl_model.eo.c"
 #include "interfaces/efl_interpolator.eo.c"
 #include "interfaces/efl_ui_i18n.eo.c"
-#include "interfaces/efl_ui_direction.eo.c"
+#include "interfaces/efl_ui_layout_orientable.eo.c"
 #include "interfaces/efl_ui_drag.eo.c"
 #include "interfaces/efl_ui_range_display.eo.c"
 #include "interfaces/efl_ui_range_interactive.eo.c"
diff --git a/src/lib/efl/interfaces/efl_ui_direction.eo b/src/lib/efl/interfaces/efl_ui_direction.eo
deleted file mode 100644
index ff6e831269..0000000000
--- a/src/lib/efl/interfaces/efl_ui_direction.eo
+++ /dev/null
@@ -1,48 +0,0 @@
-// FIXME: Documentation lacks proper references due to cyclic imports.
-// FIXME: What about AnyRTL? And other strange directions?
-
-parse efl_gfx_image_orientable;
-
-enum @beta Efl.Ui.Dir
-{
-   [[Direction for UI objects and layouts.
-
-     Not to be confused with @Efl.Gfx.Image_Orientation which is for images and canvases. This
-     enum is used to define how widgets should expand and orient themselves,
-     not to rotate images.
-
-     See also @Efl.Ui.Direction.
-   ]]
-   default = 0,[[Default direction. Each widget may have a different default.]]
-   horizontal, [[Horizontal direction, along the X axis. Usually left-to-right,
-                 but may be inverted to right-to-left if mirroring is on.]]
-   vertical,   [[Vertical direction, along the Y axis. Usually downwards.]]
-   ltr,        [[Horizontal, left-to-right direction.]]
-   rtl,        [[Horizontal, right-to-left direction.]]
-   down,       [[Vertical, top-to-bottom direction.]]
-   up,         [[Vertical, bottom-to-top direction.]]
-   right = Efl.Ui.Dir.ltr, [[Right is an alias for LTR.]]
-   left = Efl.Ui.Dir.rtl, [[Left is an alias for RTL.]]
-}
-
-interface @beta Efl.Ui.Direction
-{
-   [[EFL UI object direction interface]]
-   methods {
-       @property direction {
-         [[Control the direction of a given widget.
-
-           Use this function to change how your widget is to be disposed:
-           vertically or horizontally or inverted vertically or inverted
-           horizontally.
-
-           Mirroring as defined in @Efl.Ui.I18n can invert the $horizontal
-           direction: it is $ltr by default, but becomes $rtl if the object
-           is mirrored.
-         ]]
-         values {
-            dir: Efl.Ui.Dir; [[Direction of the widget.]]
-         }
-      }
-   }
-}
diff --git a/src/lib/efl/interfaces/efl_ui_direction_readonly.c b/src/lib/efl/interfaces/efl_ui_direction_readonly.c
deleted file mode 100644
index e972ab2b02..0000000000
--- a/src/lib/efl/interfaces/efl_ui_direction_readonly.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <Efl.h>
-
-typedef struct {
-
-} Efl_Ui_Direction_Readonly_Data;
-
-EOLIAN static void
-_efl_ui_direction_readonly_efl_ui_direction_direction_set(Eo *obj EINA_UNUSED, Efl_Ui_Direction_Readonly_Data *pd EINA_UNUSED, Efl_Ui_Dir dir EINA_UNUSED)
-{
-   EINA_LOG_ERR("This object does not allow setting of a direction");
-}
-
-#include "interfaces/efl_ui_direction_readonly.eo.c"
diff --git a/src/lib/efl/interfaces/efl_ui_direction_readonly.eo b/src/lib/efl/interfaces/efl_ui_direction_readonly.eo
deleted file mode 100644
index aaba2d45c5..0000000000
--- a/src/lib/efl/interfaces/efl_ui_direction_readonly.eo
+++ /dev/null
@@ -1,6 +0,0 @@
-mixin @beta Efl.Ui.Direction_Readonly extends Efl.Ui.Direction
-{
-  implements {
-    Efl.Ui.Direction.direction { set; [[This will always print and error that this is a readonly object]]}
-  }
-}
diff --git a/src/lib/efl/interfaces/efl_ui_layout_orientable.eo b/src/lib/efl/interfaces/efl_ui_layout_orientable.eo
new file mode 100644
index 0000000000..98142646e9
--- /dev/null
+++ b/src/lib/efl/interfaces/efl_ui_layout_orientable.eo
@@ -0,0 +1,52 @@
+parse efl_gfx_image_orientable;
+
+enum @beta Efl.Ui.Layout_Orientation
+{
+   [[Orientation for UI objects and layouts that can have multiple configurations.
+
+     Select among $horizontal or $vertical orientations (or use $default to let the
+     object decide). Additionally, $inverted can be added to reverse the direction
+     along the selected axis.
+
+     Not to be confused with @Efl.Gfx.Image_Orientation which is for images and canvases. This
+     enum is used to define how widgets should expand and orient themselves,
+     not to rotate images.
+
+     See also @Efl.Ui.Layout_Orientable.
+   ]]
+   default = 0,      [[Default direction. Each widget may have a different default.]]
+   horizontal = 1,   [[Horizontal direction, along the X axis. Usually left-to-right,
+                       but can be inverted.]]
+   vertical = 2,     [[Vertical direction, along the Y axis. Usually downwards but
+                       can be inverted.]]
+   axis_bitmask = 3, [[This bitmask can be used to isolate the axis value from the rest of bits.]]
+   inverted = 4      [[Add this value to make the object invert its default direction
+                       along the selected axis.]]
+}
+
+interface @beta Efl.Ui.Layout_Orientable
+{
+   [[Interface for UI objects which can have more than one orientation.
+   
+     For example, sliders, which can be horizontal or vertical, or container
+     boxes, which can arrange their elements in a horizontal or vertical fashion.
+   ]]
+   c_prefix: efl_ui_layout;
+   methods {
+       @property orientation {
+         [[Control the direction of a given widget.
+
+           Use this function to change how your widget is to be disposed:
+           vertically or horizontally or inverted vertically or inverted
+           horizontally.
+
+           Mirroring as defined in @Efl.Ui.I18n can invert the $horizontal
+           direction: it is $ltr by default, but becomes $rtl if the object
+           is mirrored.
+         ]]
+         values {
+            dir: Efl.Ui.Layout_Orientation; [[Direction of the widget.]]
+         }
+      }
+   }
+}
diff --git a/src/lib/efl/interfaces/efl_ui_layout_orientable_readonly.c b/src/lib/efl/interfaces/efl_ui_layout_orientable_readonly.c
new file mode 100644
index 0000000000..eca76dce3d
--- /dev/null
+++ b/src/lib/efl/interfaces/efl_ui_layout_orientable_readonly.c
@@ -0,0 +1,17 @@
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <Efl.h>
+
+typedef struct {
+
+} Efl_Ui_Layout_Orientable_Readonly_Data;
+
+EOLIAN static void
+_efl_ui_layout_orientable_readonly_efl_ui_layout_orientable_orientation_set(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Orientable_Readonly_Data *pd EINA_UNUSED, Efl_Ui_Layout_Orientation dir EINA_UNUSED)
+{
+   EINA_LOG_ERR("This object does not allow setting an orientation");
+}
+
+#include "interfaces/efl_ui_layout_orientable_readonly.eo.c"
diff --git a/src/lib/efl/interfaces/efl_ui_layout_orientable_readonly.eo b/src/lib/efl/interfaces/efl_ui_layout_orientable_readonly.eo
new file mode 100644
index 0000000000..8131181025
--- /dev/null
+++ b/src/lib/efl/interfaces/efl_ui_layout_orientable_readonly.eo
@@ -0,0 +1,6 @@
+mixin @beta Efl.Ui.Layout_Orientable_Readonly extends Efl.Ui.Layout_Orientable
+{
+  implements {
+    Efl.Ui.Layout_Orientable.orientation { set; [[This will always print an error saying that this is a readonly object.]] }
+  }
+}
diff --git a/src/lib/efl/interfaces/meson.build b/src/lib/efl/interfaces/meson.build
index 705dbcf444..e3baa55571 100644
--- a/src/lib/efl/interfaces/meson.build
+++ b/src/lib/efl/interfaces/meson.build
@@ -73,8 +73,8 @@ pub_eo_files = [
   'efl_pack_table.eo',
   'efl_gfx_arrangement.eo',
   'efl_ui_i18n.eo',
-  'efl_ui_direction.eo',
-  'efl_ui_direction_readonly.eo',
+  'efl_ui_layout_orientable.eo',
+  'efl_ui_layout_orientable_readonly.eo',
   'efl_ui_drag.eo',
   'efl_ui_range_display.eo',
   'efl_ui_range_interactive.eo',
@@ -167,7 +167,7 @@ efl_src += files([
   'efl_observer.c',
   'efl_file.c',
   'efl_ui_format.c',
-  'efl_ui_direction_readonly.c',
+  'efl_ui_layout_orientable_readonly.c',
   'efl_text_markup_util.c',
 ])