From 0dabbfe177ee5a1deb38ab6aa0c994ecad68d1cf Mon Sep 17 00:00:00 2001 From: Jaehyun Cho Date: Wed, 5 Sep 2018 16:54:40 +0900 Subject: [PATCH] Revert "efl: Remove unnecessary abstract/class inheritance" This reverts commit 4067fafe07c4d22ac2e2672921c268ae8866029f. As commented on D6982, the original patch changes the widget's behavior. e.g. Efl.Ui.Win cannot be called with Efl.Config_Gloabal APIs. Elm.Combobox cannot provide events of Button and Hover. Until the above changes are resolved, the original patch is reverted. --- src/lib/edje/efl_canvas_layout_part_external.eo | 3 ++- src/lib/elementary/efl_ui_win.eo | 2 +- src/lib/elementary/elm_combobox.eo | 5 +++-- src/lib/evas/canvas/efl_canvas_object.eo | 4 ++-- src/lib/evas/canvas/evas_canvas.eo | 4 ++-- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/lib/edje/efl_canvas_layout_part_external.eo b/src/lib/edje/efl_canvas_layout_part_external.eo index 4a80b1cfe9..e3d3b48a32 100644 --- a/src/lib/edje/efl_canvas_layout_part_external.eo +++ b/src/lib/edje/efl_canvas_layout_part_external.eo @@ -1,4 +1,5 @@ -class Efl.Canvas.Layout_Part_External (Efl.Canvas.Layout_Part, Efl.Content) +class Efl.Canvas.Layout_Part_External (Efl.Canvas.Layout_Part, Efl.Content, + Efl.Canvas.Object) { [[Class representing an external part in Edje layouts. diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo index 9650d01538..567eb6e1e6 100644 --- a/src/lib/elementary/efl_ui_win.eo +++ b/src/lib/elementary/efl_ui_win.eo @@ -157,7 +157,7 @@ enum Efl.Ui.Win_Move_Resize_Mode class Efl.Ui.Win (Efl.Ui.Widget, Efl.Canvas.Scene, Efl.Canvas.Pointer, Efl.Access.Window, Efl.Access.Component, Efl.Access.Widget.Action, Efl.Content, Efl.Input.State, Efl.Input.Interface, Efl.Screen, - Efl.Gfx.Size_Hint, Efl.Text, Efl.Part, + Efl.Gfx.Size_Hint, Efl.Text, Efl.Config_Global, Efl.Part, Efl.Ui.Widget_Focus_Manager, Efl.Ui.Focus.Manager_Window_Root) { [[Efl UI window class]] diff --git a/src/lib/elementary/elm_combobox.eo b/src/lib/elementary/elm_combobox.eo index 123da1a3a7..62d447024d 100644 --- a/src/lib/elementary/elm_combobox.eo +++ b/src/lib/elementary/elm_combobox.eo @@ -1,5 +1,6 @@ -class Elm.Combobox (Elm.Genlist, Efl.Ui.Selectable, Efl.Access.Widget.Action, - Efl.Ui.Autorepeat, Efl.Ui.Legacy) +class Elm.Combobox (Efl.Ui.Button, Efl.Ui.Selectable, + Efl.Access.Widget.Action, + Elm.Entry, Elm.Genlist, Elm.Hover, Efl.Ui.Legacy) { [[Elementary combobox class]] legacy_prefix: elm_combobox; diff --git a/src/lib/evas/canvas/efl_canvas_object.eo b/src/lib/evas/canvas/efl_canvas_object.eo index af5599c6e8..6d13d1c861 100644 --- a/src/lib/evas/canvas/efl_canvas_object.eo +++ b/src/lib/evas/canvas/efl_canvas_object.eo @@ -2,9 +2,9 @@ import efl_text_types; struct Efl.Canvas.Object_Animation_Event; [[Information of animation events]] -abstract Efl.Canvas.Object (Efl.Loop_Consumer, Efl.Gfx.Entity, Efl.Gfx.Color, Efl.Gfx.Stack, Efl.Animator, +abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx.Entity, Efl.Gfx.Color, Efl.Gfx.Stack, Efl.Animator, Efl.Input.Interface, Efl.Gfx.Size_Hint, - Efl.Gfx.Map, Efl.Ui.Base, Efl.Canvas.Pointer) + Efl.Gfx.Map, Efl.Loop_Consumer, Efl.Ui.Base, Efl.Canvas.Pointer) { [[Efl canvas object abstract class]] legacy_prefix: evas_object; diff --git a/src/lib/evas/canvas/evas_canvas.eo b/src/lib/evas/canvas/evas_canvas.eo index 33f555fc1d..0c0ff5b370 100644 --- a/src/lib/evas/canvas/evas_canvas.eo +++ b/src/lib/evas/canvas/evas_canvas.eo @@ -1,7 +1,7 @@ import efl_input_types; -class Evas.Canvas (Efl.Loop_Consumer, Efl.Canvas.Scene, Efl.Animator, Efl.Input.Interface, - Efl.Canvas.Pointer) +class Evas.Canvas (Efl.Object, Efl.Canvas.Scene, Efl.Animator, Efl.Input.Interface, + Efl.Loop_Consumer, Efl.Canvas.Pointer) { [[Evas canvas class]] legacy_prefix: evas;