jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=d97c07d6750e88e9804845d555c150ef3a70651a
commit d97c07d6750e88e9804845d555c150ef3a70651a Author: Jean-Philippe Andre <[email protected]> Date: Thu Jun 16 10:52:18 2016 +0900 Efl: Move Efl.Canvas to efl/interfaces Not sure this is a good name for this interface, but it definitely doesn't belong inside lib/evas/ Thanks Jiyoun for the question / report :) --- src/Makefile_Efl.am | 1 + src/Makefile_Evas.am | 1 - src/lib/efl/Efl.h | 2 ++ src/lib/{evas/canvas => efl/interfaces}/efl_canvas.eo | 0 src/lib/efl/interfaces/efl_interfaces_main.c | 1 + src/lib/evas/Evas_Eo.h | 2 -- src/lib/evas/canvas/evas_main.c | 1 - 7 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am index 924d491..9fbc616 100644 --- a/src/Makefile_Efl.am +++ b/src/Makefile_Efl.am @@ -8,6 +8,7 @@ efl_eolian_legacy_files = \ $(NULL) efl_eolian_files = \ + lib/efl/interfaces/efl_canvas.eo \ lib/efl/interfaces/efl_control.eo \ lib/efl/interfaces/efl_file.eo \ lib/efl/interfaces/efl_image_load.eo \ diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am index f2168c1..87dcb70 100644 --- a/src/Makefile_Evas.am +++ b/src/Makefile_Evas.am @@ -3,7 +3,6 @@ evas_eolian_pub_files = \ lib/evas/canvas/evas_object.eo \ - lib/evas/canvas/efl_canvas.eo \ lib/evas/canvas/efl_canvas_polygon.eo \ lib/evas/canvas/efl_canvas_rectangle.eo \ lib/evas/canvas/evas_textblock.eo \ diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h index 8effe42..547f975 100644 --- a/src/lib/efl/Efl.h +++ b/src/lib/efl/Efl.h @@ -123,6 +123,8 @@ static inline void efl_gfx_color16_type_set(Efl_Gfx_Color *color, #include "interfaces/efl_gfx.x" +#include "interfaces/efl_canvas.eo.h" + /* Packing & containers */ #include "interfaces/efl_container.eo.h" #include "interfaces/efl_pack.eo.h" diff --git a/src/lib/evas/canvas/efl_canvas.eo b/src/lib/efl/interfaces/efl_canvas.eo similarity index 100% rename from src/lib/evas/canvas/efl_canvas.eo rename to src/lib/efl/interfaces/efl_canvas.eo diff --git a/src/lib/efl/interfaces/efl_interfaces_main.c b/src/lib/efl/interfaces/efl_interfaces_main.c index 10ae01a..9acc833 100644 --- a/src/lib/efl/interfaces/efl_interfaces_main.c +++ b/src/lib/efl/interfaces/efl_interfaces_main.c @@ -27,6 +27,7 @@ #include "interfaces/efl_gfx_filter.eo.c" #include "interfaces/efl_gfx_size_hint.eo.c" +#include "interfaces/efl_canvas.eo.c" #include "interfaces/efl_vpath.eo.c" diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h index c620f5c..2468db1 100644 --- a/src/lib/evas/Evas_Eo.h +++ b/src/lib/evas/Evas_Eo.h @@ -9,8 +9,6 @@ #include "canvas/efl_ui_selectable.eo.h" #include "canvas/efl_ui_zoomable.eo.h" -#include "canvas/efl_canvas.eo.h" - #include "canvas/evas_canvas.eo.h" /** diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c index 16d3314..2251e8d 100644 --- a/src/lib/evas/canvas/evas_main.c +++ b/src/lib/evas/canvas/evas_main.c @@ -874,5 +874,4 @@ evas_output_viewport_get(const Evas *eo_e, Evas_Coord *x, Evas_Coord *y, Evas_Co if (h) *h = e->viewport.h; } -#include "canvas/efl_canvas.eo.c" #include "canvas/evas_canvas.eo.c" --
