1 files changed, 12 insertions, 23 deletions
diff --git a/src/lib/edje/efl_canvas_layout.eo b/src/lib/edje/efl_canvas_layout.eo
index d50960a350..ad51c5b38a 100644
--- a/src/lib/edje/efl_canvas_layout.eo
+++ b/src/lib/edje/efl_canvas_layout.eo
@@ -1,5 +1,3 @@
-import edje_types;
-
 // FIXME: This EO doc needs a direct link to the "edcref" doc
 
 class Efl.Canvas.Layout (Efl.Canvas.Group, Efl.File, Efl.Container, Efl.Part,
@@ -10,6 +8,7 @@ class Efl.Canvas.Layout (Efl.Canvas.Group, Efl.File, Efl.Container, Efl.Part,
 {
    [[Edje object class]]
    legacy_prefix: edje_object;
+   event_prefix: efl_layout;
    data: Edje;
    methods {
       @property animation {
@@ -39,22 +38,6 @@ class Efl.Canvas.Layout (Efl.Canvas.Group, Efl.File, Efl.Container, Efl.Part,
          legacy: null;
          return: iterator<string> @owned; [[Part name iterator]]
       }
-
-      /* TEXT PART APIS BEGIN ---------------------------------------------- */
-      @property item_provider {
-         set {
-            [[Sets the function that provides item objects for named items in an edje entry text
-
-              Item objects may be deleted any time by Edje, and will be deleted when the
-              Edje object is deleted (or file is set to a new file).]]
-         }
-         values {
-            func: Edje.Item_Provider_Cb; [[The function to call (or $null to disable) to get item objects]]
-            data: void_ptr; [[The data pointer to pass to the func callback]]
-         }
-      }
-      /* TEXT PART APIS END ------------------------------------------------ */
-
       @property seat {
          get {
             [[Returns the seat device given its Edje's name.
@@ -90,11 +73,16 @@ class Efl.Canvas.Layout (Efl.Canvas.Group, Efl.File, Efl.Container, Efl.Part,
          }
       }
    }
+   events {
+      part,invalid @beta: string; [[Emitted when trying to use an invalid part.
+                                    The value passed is the part name.]]
+   }
    implements {
-      Efl.Gfx.visible { set; }
-      Efl.Gfx.position { set; }
-      Efl.Gfx.size { set; }
+      Efl.Gfx.Entity.visible { set; }
+      Efl.Gfx.Entity.position { set; }
+      Efl.Gfx.Entity.size { set; }
       Efl.Object.constructor;
+      Efl.Object.invalidate;
       Efl.Object.debug_name_override;
       Efl.Canvas.Object.no_render { set; }
       Efl.Canvas.Object.paragraph_direction { set; }
@@ -116,6 +104,7 @@ class Efl.Canvas.Layout (Efl.Canvas.Group, Efl.File, Efl.Container, Efl.Part,
       Efl.Layout.Group.group_size_min { get; }
       Efl.Layout.Group.group_size_max { get; }
       Efl.Layout.Group.group_data { get; }
+      Efl.Layout.Group.part_exist { get; }
       Efl.Layout.Signal.message_send;
       Efl.Layout.Signal.signal_callback_add;
       Efl.Layout.Signal.signal_callback_del;
@@ -123,11 +112,11 @@ class Efl.Canvas.Layout (Efl.Canvas.Group, Efl.File, Efl.Container, Efl.Part,
       Efl.Layout.Signal.signal_process;
       Efl.Ui.Base.mirrored { set; get; }
       Efl.Ui.Base.language { set; get; }
-      Efl.Gfx.scale { set; get; }
+      Efl.Gfx.Entity.scale { set; get; }
       Efl.File.load_error { get; }
       Efl.File.mmap { get; set; }
       Efl.Container.content_remove;
-      Efl.Part.part; [[Returns @Efl.Canvas.Layout.Part.]]
+      Efl.Part.part_get; [[Returns @Efl.Canvas.Layout_Part]]
       Efl.Observer.update;
       Efl.Player.playable { get; }
       Efl.Player.play { get; set; }