efl: Merge Flipable and Orientation

No need to split: those two are used in all the same classes, since the
split between Orientation and Ui.Dir.

Note that the enum types remain in the main namespace.

diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
index b4fa663..c341f4e 100644 (file)
--- a/src/Makefile_Efl.am
+++ b/src/Makefile_Efl.am
@@ -50,7 +50,6 @@ efl_eolian_files = \
       lib/efl/interfaces/efl_model.eo \
       lib/efl/interfaces/efl_animator.eo \
       lib/efl/interfaces/efl_orientation.eo \
-      lib/efl/interfaces/efl_flipable.eo \
       lib/efl/interfaces/efl_container.eo \
       lib/efl/interfaces/efl_content.eo \
       lib/efl/interfaces/efl_pack.eo \

diff --git a/src/examples/evas/evas-images5.c b/src/examples/evas/evas-images5.c
index 951b5b4..ed8a4e5 100644 (file)
--- a/src/examples/evas/evas-images5.c
+++ b/src/examples/evas/evas-images5.c
@@ -121,13 +121,13 @@ _on_keydown(void        *data EINA_UNUSED,
          efl_orientation_set(d.img, EFL_ORIENT_270);
          break;
       case 4:
-         efl_flip_set(d.img, EFL_FLIP_HORIZONTAL);
+         efl_orientation_flip_set(d.img, EFL_FLIP_HORIZONTAL);
          break;
       case 5:
-         efl_flip_set(d.img, EFL_FLIP_VERTICAL);
+         efl_orientation_flip_set(d.img, EFL_FLIP_VERTICAL);
          break;
       case 6:
-         efl_flip_set(d.img, EFL_FLIP_NONE);
+         efl_orientation_flip_set(d.img, EFL_FLIP_NONE);
          break;
      }
 }

diff --git a/src/lib/efl/CMakeLists.txt b/src/lib/efl/CMakeLists.txt
index b8d94de..12a492a 100644 (file)
--- a/src/lib/efl/CMakeLists.txt
+++ b/src/lib/efl/CMakeLists.txt
@@ -11,7 +11,6 @@ set(PUBLIC_EO_FILES
   interfaces/efl_content.eo
   interfaces/efl_control.eo
   interfaces/efl_file.eo
-  interfaces/efl_flipable.eo
   interfaces/efl_gfx.eo
   interfaces/efl_gfx_buffer.eo
   interfaces/efl_gfx_fill.eo

diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h
index 9e95c8a..7749547 100644 (file)
--- a/src/lib/efl/Efl.h
+++ b/src/lib/efl/Efl.h
@@ -88,7 +88,6 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
 #include "interfaces/efl_text_types.eot.h"
 #include "interfaces/efl_text_properties.eo.h"
 #include "interfaces/efl_orientation.eo.h"
-#include "interfaces/efl_flipable.eo.h"
 #include "interfaces/efl_ui_base.eo.h"
 #include "interfaces/efl_ui_direction.eo.h"
 #include "interfaces/efl_ui_drag.eo.h"

diff --git a/src/lib/efl/interfaces/efl_flipable.eo b/src/lib/efl/interfaces/efl_flipable.eo
deleted file mode 100644 (file)
index c915127..0000000
--- a/src/lib/efl/interfaces/efl_flipable.eo
+++ /dev/null
@@ -1,29 +0,0 @@
-enum Efl.Flip
-{
-   [[Flip, See also @Efl.Flipable]]
-   none = 0, [[No flip]]
-   horizontal = 1, [[Flip image horizontally]]
-   vertical = 2 [[Flip image vertically]]
-}
-
-interface Efl.Flipable
-{
-   [[Efl flipable interface]]
-   eo_prefix: efl_flip;
-   methods {
-       @property flip {
-         [[Control the flip of the given image
-
-           Use this function to change how your image is to be
-           flipped: vertically or horizontally or transpose
-           or traverse]]
-         set {
-         }
-         get {
-         }
-         values {
-            flip: Efl.Flip; [[Flip method]]
-         }
-      }
-   }
-}

diff --git a/src/lib/efl/interfaces/efl_interfaces_main.c b/src/lib/efl/interfaces/efl_interfaces_main.c
index a203c33..1419f74 100644 (file)
--- a/src/lib/efl/interfaces/efl_interfaces_main.c
+++ b/src/lib/efl/interfaces/efl_interfaces_main.c
@@ -62,7 +62,6 @@
 #include "interfaces/efl_model.eo.c"
 #include "interfaces/efl_animator.eo.c"
 #include "interfaces/efl_orientation.eo.c"
-#include "interfaces/efl_flipable.eo.c"
 #include "interfaces/efl_ui_base.eo.c"
 #include "interfaces/efl_ui_direction.eo.c"
 #include "interfaces/efl_ui_drag.eo.c"

diff --git a/src/lib/efl/interfaces/efl_orientation.eo b/src/lib/efl/interfaces/efl_orientation.eo
index 1b42b32..087de1b 100644 (file)
--- a/src/lib/efl/interfaces/efl_orientation.eo
+++ b/src/lib/efl/interfaces/efl_orientation.eo
@@ -17,6 +17,17 @@ enum Efl.Orient
    left = 270, [[Orient left, rotate 90 degrees clock-wise.]]
 }
 
+enum Efl.Flip
+{
+   [[A flip type, to flip visual objects.
+
+     See also @Efl.Orientation.
+   ]]
+   none = 0, [[No flip]]
+   horizontal = 1, [[Flip image horizontally]]
+   vertical = 2 [[Flip image vertically]]
+}
+
 interface Efl.Orientation
 {
    [[Efl orientation interface]]
@@ -31,5 +42,16 @@ interface Efl.Orientation
             dir: Efl.Orient(Efl.Orient.none); [[The rotation angle (CCW), see @Efl.Orient.]]
          }
       }
+      @property flip {
+        [[Control the flip of the given image
+
+          Use this function to change how your image is to be
+          flipped: vertically or horizontally or transpose
+          or traverse.
+        ]]
+        values {
+           flip: Efl.Flip; [[Flip method]]
+        }
+     }
    }
 }

diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index 2aa9f2f..60594ae 100644 (file)
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -1333,19 +1333,19 @@ _efl_ui_image_efl_orientation_orientation_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_
 
 
 EOLIAN static void
-_efl_ui_image_efl_flipable_flip_set(Eo *obj, Efl_Ui_Image_Data *sd, Efl_Flip flip)
+_efl_ui_image_efl_orientation_flip_set(Eo *obj, Efl_Ui_Image_Data *sd, Efl_Flip flip)
 {
    if (sd->edje) return;
    if (sd->flip == flip) return;
 
-   efl_flip_set(sd->img, flip);
+   efl_orientation_flip_set(sd->img, flip);
 
    sd->flip = flip;
    _efl_ui_image_internal_sizing_eval(obj, sd);
 }
 
 EOLIAN static Efl_Flip
-_efl_ui_image_efl_flipable_flip_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd)
+_efl_ui_image_efl_orientation_flip_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd)
 {
    return sd->flip;
 }
@@ -2176,7 +2176,7 @@ elm_image_orient_set(Evas_Object *obj, Elm_Image_Orient orient)
      }
 
    efl_orientation_set(obj, dir);
-   efl_flip_set(obj, flip);
+   efl_orientation_flip_set(obj, flip);
 }
 
 EAPI Elm_Image_Orient

diff --git a/src/lib/elementary/efl_ui_image.eo b/src/lib/elementary/efl_ui_image.eo
index 254077d..db48d04 100644 (file)
--- a/src/lib/elementary/efl_ui_image.eo
+++ b/src/lib/elementary/efl_ui_image.eo
@@ -21,7 +21,7 @@ struct Efl.Ui.Image.Error
 class Efl.Ui.Image (Efl.Ui.Widget, Efl.Ui.Clickable, Efl.Ui.Draggable,
                  Efl.File, Efl.Image, Efl.Image.Load, Efl.Player, Efl.Gfx.View,
                  Efl.Access.Image, Efl.Access.Widget.Action, Efl.Gfx.Color,
-                 Efl.Orientation, Efl.Flipable,
+                 Efl.Orientation,
                  Efl.Ui.View, Efl.Ui.Model.Connect, Efl.Layout.Calc,
                  Efl.Layout.Group, Efl.Layout.Signal)
 {
@@ -102,7 +102,7 @@ class Efl.Ui.Image (Efl.Ui.Widget, Efl.Ui.Clickable, Efl.Ui.Draggable,
       Efl.Image.smooth_scale { get; set; }
       Efl.Image.scale_type { get; set; }
       Efl.Orientation.orientation { get; set; }
-      Efl.Flipable.flip { get; set; }
+      Efl.Orientation.flip { get; set; }
       Efl.Player.playable { get; }
       Efl.Player.play { get; set; }
       Efl.Layout.Signal.signal_emit;

diff --git a/src/lib/elementary/efl_ui_image_zoomable.c b/src/lib/elementary/efl_ui_image_zoomable.c
index 7cfcf78..1250f87 100644 (file)
--- a/src/lib/elementary/efl_ui_image_zoomable.c
+++ b/src/lib/elementary/efl_ui_image_zoomable.c
@@ -615,7 +615,7 @@ _grid_create(Evas_Object *obj)
                evas_object_image_add(evas_object_evas_get(obj));
              evas_object_image_load_orientation_set(g->grid[tn].img, EINA_TRUE);
              efl_orientation_set(g->grid[tn].img, sd->orient);
-             efl_flip_set(g->grid[tn].img, sd->flip);
+             efl_orientation_flip_set(g->grid[tn].img, sd->flip);
              evas_object_image_scale_hint_set
                (g->grid[tn].img, EVAS_IMAGE_SCALE_HINT_DYNAMIC);
              evas_object_pass_events_set(g->grid[tn].img, EINA_TRUE);
@@ -1333,7 +1333,7 @@ _orient_apply(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd)
      }
 
    efl_orientation_set(sd->img, sd->orient);
-   efl_flip_set(sd->img, sd->flip);
+   efl_orientation_flip_set(sd->img, sd->flip);
    evas_object_image_size_get(sd->img, &iw, &ih);
    sd->size.imw = iw;
    sd->size.imh = ih;
@@ -1359,7 +1359,7 @@ _efl_ui_image_zoomable_efl_orientation_orientation_get(Eo *obj EINA_UNUSED, Efl_
 }
 
 EOLIAN static void
-_efl_ui_image_zoomable_efl_flipable_flip_set(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd, Efl_Flip flip)
+_efl_ui_image_zoomable_efl_orientation_flip_set(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd, Efl_Flip flip)
 {
    if (sd->flip == flip) return;
 
@@ -1368,7 +1368,7 @@ _efl_ui_image_zoomable_efl_flipable_flip_set(Eo *obj, Efl_Ui_Image_Zoomable_Data
 }
 
 EOLIAN static Efl_Flip
-_efl_ui_image_zoomable_efl_flipable_flip_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Zoomable_Data *sd)
+_efl_ui_image_zoomable_efl_orientation_flip_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Zoomable_Data *sd)
 {
    return sd->flip;
 }
@@ -3093,7 +3093,7 @@ elm_photocam_image_orient_set(Eo *obj, Evas_Image_Orient evas_orient)
 
    _evas_orient_to_eo_orient_flip(evas_orient, &orient, &flip);
    efl_orientation_set(obj, orient);
-   efl_flip_set(obj, flip);
+   efl_orientation_flip_set(obj, flip);
 }
 
 EAPI Evas_Image_Orient

diff --git a/src/lib/elementary/efl_ui_image_zoomable.eo b/src/lib/elementary/efl_ui_image_zoomable.eo
index 264f6bb..bbe5124 100644 (file)
--- a/src/lib/elementary/efl_ui_image_zoomable.eo
+++ b/src/lib/elementary/efl_ui_image_zoomable.eo
@@ -65,7 +65,7 @@ class Efl.Ui.Image_Zoomable (Efl.Ui.Widget, Efl.Ui.Image, Efl.Ui.Zoom,
       Efl.Access.Widget.Action.elm_actions { get; }
       Efl.File.file { get; set; }
       Efl.Orientation.orientation { get; set; }
-      Efl.Flipable.flip { get; set; }
+      Efl.Orientation.flip { get; set; }
       Efl.Layout.Group.group_size_min { get; }
       Efl.Layout.Group.group_size_max { get; }
          Efl.Layout.Signal.signal_callback_add;

diff --git a/src/lib/evas/canvas/efl_canvas_image_internal.eo b/src/lib/evas/canvas/efl_canvas_image_internal.eo
index f21053a..86302c6 100644 (file)
--- a/src/lib/evas/canvas/efl_canvas_image_internal.eo
+++ b/src/lib/evas/canvas/efl_canvas_image_internal.eo
@@ -1,8 +1,7 @@
 abstract Efl.Canvas.Image.Internal (Efl.Canvas.Object, Efl.Canvas.Filter.Internal,
                                     Efl.Image, Efl.Gfx.Buffer,
                                     Efl.Gfx.Fill, Efl.Gfx.View,
-                                    Efl.Orientation, Efl.Flipable,
-                                    Efl.File)
+                                    Efl.Orientation, Efl.File)
 {
    [[Efl canvas internal image class]]
    data: Evas_Image_Data;
@@ -13,7 +12,7 @@ abstract Efl.Canvas.Image.Internal (Efl.Canvas.Object, Efl.Canvas.Filter.Interna
       Efl.Object.debug_name_override;
       Efl.File.save;
       Efl.Orientation.orientation { get; set; }
-      Efl.Flipable.flip { get; set; }
+      Efl.Orientation.flip { get; set; }
       Efl.Image.smooth_scale { get; set; }
       Efl.Image.ratio { get; }
       Efl.Image.border { get; set; }

diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c
index d87af3c..163438d 100755 (executable)
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -471,7 +471,7 @@ _efl_canvas_image_internal_efl_orientation_orientation_get(Eo *obj EINA_UNUSED,
 }
 
 EOLIAN static void
-_efl_canvas_image_internal_efl_flipable_flip_set(Eo *obj, Evas_Image_Data *o, Efl_Flip flip)
+_efl_canvas_image_internal_efl_orientation_flip_set(Eo *obj, Evas_Image_Data *o, Efl_Flip flip)
 {
    Evas_Image_Orient orient;
 
@@ -482,7 +482,7 @@ _efl_canvas_image_internal_efl_flipable_flip_set(Eo *obj, Evas_Image_Data *o, Ef
 }
 
 EOLIAN static Efl_Flip
-_efl_canvas_image_internal_efl_flipable_flip_get(Eo *obj EINA_UNUSED, Evas_Image_Data *o)
+_efl_canvas_image_internal_efl_orientation_flip_get(Eo *obj EINA_UNUSED, Evas_Image_Data *o)
 {
    return o->flip_value;
 }