jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=8572cd5def291aa14c79bb21ea578d024eb36999
commit 8572cd5def291aa14c79bb21ea578d024eb36999
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date: Wed Sep 6 11:52:35 2017 +0900
evas/edje/elm: Remove all uses of clipped groups
This removes the uses of the *EO* class, obviously not the use of the
clipped smart objects.
---
src/lib/edje/edje_object.eo | 2 +-
src/lib/edje/edje_smart.c | 3 +--
src/lib/elementary/elm_interface_scrollable.c | 1 +
src/lib/elementary/elm_pan.eo | 2 +-
src/lib/evas/canvas/evas_box.eo | 2 +-
src/lib/evas/canvas/evas_grid.eo | 2 +-
src/lib/evas/canvas/evas_object_box.c | 1 +
src/lib/evas/canvas/evas_object_grid.c | 1 +
src/lib/evas/canvas/evas_object_table.c | 1 +
src/lib/evas/canvas/evas_table.eo | 2 +-
10 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/lib/edje/edje_object.eo b/src/lib/edje/edje_object.eo
index 68033df08a..4a30f6d7d4 100644
--- a/src/lib/edje/edje_object.eo
+++ b/src/lib/edje/edje_object.eo
@@ -2,7 +2,7 @@ import edje_types;
// FIXME: This EO doc needs a direct link to the "edcref" doc
-class Edje.Object (Efl.Canvas.Group.Clipped, Efl.File, Efl.Container, Efl.Part,
+class Edje.Object (Efl.Canvas.Group, Efl.File, Efl.Container, Efl.Part,
Efl.Observer, Efl.Ui.Base, Efl.Canvas.Layout_Calc,
Efl.Canvas.Layout_Signal, Efl.Canvas.Layout_Group,
Efl.Player)
diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c
index 136f2d1249..9ef755ecf8 100644
--- a/src/lib/edje/edje_smart.c
+++ b/src/lib/edje/edje_smart.c
@@ -3,8 +3,6 @@
#include "edje_private.h"
-#include <Eo.h>
-
#ifdef MY_CLASS
# undef MY_CLASS
#endif
@@ -32,6 +30,7 @@ _edje_object_efl_object_constructor(Eo *obj, Edje *ed)
Evas *e;
void *tmp;
+ efl_canvas_group_unclipped_set(obj, EINA_FALSE);
obj = efl_constructor(efl_super(obj, MY_CLASS));
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
ed->base = evas_object_smart_data_get(obj);
diff --git a/src/lib/elementary/elm_interface_scrollable.c
b/src/lib/elementary/elm_interface_scrollable.c
index 9089f10cd4..d1a2ac73ef 100644
--- a/src/lib/elementary/elm_interface_scrollable.c
+++ b/src/lib/elementary/elm_interface_scrollable.c
@@ -198,6 +198,7 @@ _elm_pan_add(Evas *evas)
EOLIAN static Eo *
_elm_pan_efl_object_constructor(Eo *obj, Elm_Pan_Smart_Data *_pd EINA_UNUSED)
{
+ efl_canvas_group_unclipped_set(obj, EINA_FALSE);
obj = efl_constructor(efl_super(obj, MY_PAN_CLASS));
efl_canvas_object_type_set(obj, MY_PAN_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
diff --git a/src/lib/elementary/elm_pan.eo b/src/lib/elementary/elm_pan.eo
index 648b9f40c7..dcc13f18bc 100644
--- a/src/lib/elementary/elm_pan.eo
+++ b/src/lib/elementary/elm_pan.eo
@@ -1,4 +1,4 @@
-class Elm.Pan (Efl.Canvas.Group.Clipped)
+class Elm.Pan (Efl.Canvas.Group)
{
[[Elementary pan class]]
legacy_prefix: elm_pan;
diff --git a/src/lib/evas/canvas/evas_box.eo b/src/lib/evas/canvas/evas_box.eo
index 36fca8a4dc..75c882734a 100644
--- a/src/lib/evas/canvas/evas_box.eo
+++ b/src/lib/evas/canvas/evas_box.eo
@@ -4,7 +4,7 @@ type @extern Evas_Object_Box_Layout: __undefined_type; [[Evas
object box layout
type @extern Eina_Free_Cb: __undefined_type; [[Eina free callback type]] /*
FIXME: Function pointers are not supported */
type @extern va_list: __undefined_type; [[va_list type]] /* FIXME: va_list is
not supported */
-class Evas.Box (Efl.Canvas.Group.Clipped)
+class Evas.Box (Efl.Canvas.Group)
{
[[Evas box class]]
legacy_prefix: evas_object_box;
diff --git a/src/lib/evas/canvas/evas_grid.eo b/src/lib/evas/canvas/evas_grid.eo
index 7d7ea916c1..b060a916cf 100644
--- a/src/lib/evas/canvas/evas_grid.eo
+++ b/src/lib/evas/canvas/evas_grid.eo
@@ -1,4 +1,4 @@
-class Evas.Grid (Efl.Canvas.Group.Clipped)
+class Evas.Grid (Efl.Canvas.Group)
{
[[Evas grid class]]
legacy_prefix: evas_object_grid;
diff --git a/src/lib/evas/canvas/evas_object_box.c
b/src/lib/evas/canvas/evas_object_box.c
index 8e053bc4cc..08e630be7c 100644
--- a/src/lib/evas/canvas/evas_object_box.c
+++ b/src/lib/evas/canvas/evas_object_box.c
@@ -484,6 +484,7 @@ evas_object_box_add(Evas *evas)
EOLIAN static Eo *
_evas_box_efl_object_constructor(Eo *obj, Evas_Object_Box_Data *class_data
EINA_UNUSED)
{
+ efl_canvas_group_unclipped_set(obj, EINA_FALSE);
obj = efl_constructor(efl_super(obj, MY_CLASS));
evas_object_smart_callbacks_descriptions_set(obj, _signals);
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
diff --git a/src/lib/evas/canvas/evas_object_grid.c
b/src/lib/evas/canvas/evas_object_grid.c
index 4be08ca22f..9b31c42f21 100644
--- a/src/lib/evas/canvas/evas_object_grid.c
+++ b/src/lib/evas/canvas/evas_object_grid.c
@@ -285,6 +285,7 @@ evas_object_grid_add(Evas *evas)
EOLIAN static Eo *
_evas_grid_efl_object_constructor(Eo *obj, Evas_Grid_Data *class_data
EINA_UNUSED)
{
+ efl_canvas_group_unclipped_set(obj, EINA_FALSE);
obj = efl_constructor(efl_super(obj, MY_CLASS));
evas_object_smart_attach(obj, _evas_object_grid_smart_class_new());
diff --git a/src/lib/evas/canvas/evas_object_table.c
b/src/lib/evas/canvas/evas_object_table.c
index d19aaa2866..b6ad3dcd68 100644
--- a/src/lib/evas/canvas/evas_object_table.c
+++ b/src/lib/evas/canvas/evas_object_table.c
@@ -988,6 +988,7 @@ evas_object_table_add(Evas *evas)
EOLIAN static Eo *
_evas_table_efl_object_constructor(Eo *obj, Evas_Table_Data *class_data
EINA_UNUSED)
{
+ efl_canvas_group_unclipped_set(obj, EINA_FALSE);
obj = efl_constructor(efl_super(obj, MY_CLASS));
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
diff --git a/src/lib/evas/canvas/evas_table.eo
b/src/lib/evas/canvas/evas_table.eo
index 768e2bcaab..6aafbeb481 100644
--- a/src/lib/evas/canvas/evas_table.eo
+++ b/src/lib/evas/canvas/evas_table.eo
@@ -9,7 +9,7 @@ enum Evas.Object_Table.Homogeneous_Mode {
item = 2 [[Item mode]]
}
-class Evas.Table (Efl.Canvas.Group.Clipped)
+class Evas.Table (Efl.Canvas.Group)
{
[[Evas table class]]
legacy_prefix: evas_object_table;
--
