bu5hm4n
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "efl: Remove unnecessary abstract/class inheritance" 

This reverts commit 4067fafe07.

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.
This commit is contained in:
Jaehyun Cho 2018-09-05 16:54:40 +09:00
parent 743e0468e9
commit 0dabbfe177
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/lib/edje/efl_canvas_layout_part_external.eo
View File

@ -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.

2
src/lib/elementary/efl_ui_win.eo
View File

@ -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]]

5
src/lib/elementary/elm_combobox.eo
View File

@ -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;

4
src/lib/evas/canvas/efl_canvas_object.eo
View File

@ -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;

4
src/lib/evas/canvas/evas_canvas.eo
View File

@ -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;