enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

efl: replace composite with composites and dedup implements 

Since using 'composites' now automatically implements what has not
been implemented yet, remove the unnecessary duplicates.
This commit is contained in:
Daniel Kolesa 2019-09-19 17:32:56 +02:00
parent bc793753cb
commit b74f98e8b7
13 changed files with 26 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/elementary/efl_ui_collection.eo
View File

@ -1,12 +1,10 @@
class @beta Efl.Ui.Collection extends Efl.Ui.Layout_Base implements class @beta Efl.Ui.Collection extends Efl.Ui.Layout_Base implements
Efl.Ui.Scrollable_Interactive,
Efl.Ui.Scrollbar,
Efl.Pack_Linear, Efl.Pack_Layout, Efl.Pack_Linear, Efl.Pack_Layout,
Efl.Ui.Layout_Orientable, Efl.Ui.Layout_Orientable,
Efl.Ui.Multi_Selectable, Efl.Ui.Multi_Selectable,
Efl.Ui.Focus.Manager_Sub, Efl.Ui.Focus.Manager_Sub,
Efl.Ui.Widget_Focus_Manager Efl.Ui.Widget_Focus_Manager
composite composites
Efl.Ui.Scrollable_Interactive, Efl.Ui.Scrollable_Interactive,
Efl.Ui.Scrollbar, Efl.Ui.Scrollbar,
Efl.Ui.Focus.Manager Efl.Ui.Focus.Manager

6
src/lib/elementary/efl_ui_image_zoomable.eo
View File

@ -2,10 +2,8 @@
struct @extern Elm.Photocam.Error; [[Photocam error information.]] struct @extern Elm.Photocam.Error; [[Photocam error information.]]
struct @extern Elm.Photocam.Progress; [[Photocam progress information.]] struct @extern Elm.Photocam.Progress; [[Photocam progress information.]]
class @beta Efl.Ui.Image_Zoomable extends Efl.Ui.Image implements Efl.Ui.Zoom, class @beta Efl.Ui.Image_Zoomable extends Efl.Ui.Image implements Efl.Ui.Zoom
Efl.Ui.Scrollable_Interactive, composites Efl.Ui.Scrollable_Interactive, Efl.Ui.Scrollbar
Efl.Ui.Scrollbar
composite Efl.Ui.Scrollable_Interactive, Efl.Ui.Scrollbar
{ {
[[Elementary Image Zoomable class]] [[Elementary Image Zoomable class]]
methods { methods {

10
src/lib/elementary/efl_ui_list_view.eo
View File

@ -7,10 +7,12 @@ struct @beta Efl.Ui.List_View_Item_Event
child: Efl.Model; [[TBD]] child: Efl.Model; [[TBD]]
index: int; [[TBD]] index: int; [[TBD]]
} }
class @beta Efl.Ui.List_View extends Efl.Ui.Layout_Base implements Efl.Ui.Scrollable_Interactive, Efl.Ui.Scrollbar, class @beta Efl.Ui.List_View extends Efl.Ui.Layout_Base implements
Efl.Access.Widget.Action, Efl.Access.Selection, Efl.Ui.Focus.Composition, Efl.Ui.Focus.Manager_Sub, Efl.Access.Widget.Action, Efl.Access.Selection,
Efl.Ui.Container_Selectable, Efl.Ui.List_View_Model, Efl.Ui.Widget_Focus_Manager Efl.Ui.Focus.Composition, Efl.Ui.Focus.Manager_Sub,
composite Efl.Ui.Container_Selectable, Efl.Ui.List_View_Model,
Efl.Ui.Widget_Focus_Manager
composites
Efl.Ui.Scrollable_Interactive, Efl.Ui.Scrollbar Efl.Ui.Scrollable_Interactive, Efl.Ui.Scrollbar
{ {
methods { methods {

4
src/lib/elementary/efl_ui_panel.eo
View File

@ -16,9 +16,9 @@ struct @beta Efl.Ui.Panel_Scroll_Info
} }
class @beta Efl.Ui.Panel extends Efl.Ui.Layout_Base class @beta Efl.Ui.Panel extends Efl.Ui.Layout_Base
implements Efl.Ui.Focus.Layer, Efl.Ui.Scrollable_Interactive, Efl.Content, implements Efl.Ui.Focus.Layer, Efl.Content,
Efl.Access.Widget.Action Efl.Access.Widget.Action
composite Efl.Ui.Scrollable_Interactive composites Efl.Ui.Scrollable_Interactive
{ {
[[Elementary panel class]] [[Elementary panel class]]
methods { methods {

3
src/lib/elementary/efl_ui_radio_box.eo
View File

@ -1,5 +1,4 @@
class @beta Efl.Ui.Radio_Box extends Efl.Ui.Box implements Efl.Ui.Radio_Group class @beta Efl.Ui.Radio_Box extends Efl.Ui.Box composites Efl.Ui.Radio_Group
composite Efl.Ui.Radio_Group
{ {
[[A standard @Efl.Ui.Box container which automatically handles grouping of any @Efl.Ui.Radio [[A standard @Efl.Ui.Box container which automatically handles grouping of any @Efl.Ui.Radio
widget added to it in addition to regular widgets. widget added to it in addition to regular widgets.

4
src/lib/elementary/efl_ui_scroller.eo
View File

@ -1,10 +1,8 @@
class @beta Efl.Ui.Scroller extends Efl.Ui.Layout_Base implements class @beta Efl.Ui.Scroller extends Efl.Ui.Layout_Base implements
Efl.Ui.Scrollable_Interactive,
Efl.Ui.Scrollbar,
Efl.Ui.Focus.Manager_Sub, Efl.Ui.Focus.Manager_Sub,
Efl.Ui.Widget_Focus_Manager, Efl.Ui.Widget_Focus_Manager,
Efl.Content Efl.Content
composite composites
Efl.Ui.Scrollable_Interactive, Efl.Ui.Scrollable_Interactive,
Efl.Ui.Scrollbar Efl.Ui.Scrollbar
{ {

4
src/lib/elementary/efl_ui_tab_bar.eo
View File

@ -1,6 +1,6 @@
class @beta Efl.Ui.Tab_Bar extends Efl.Ui.Layout_Base class @beta Efl.Ui.Tab_Bar extends Efl.Ui.Layout_Base
implements Efl.Ui.Single_Selectable, Efl.Pack_Linear implements Efl.Ui.Single_Selectable
composite Efl.Pack_Linear, Efl.Pack composites Efl.Pack_Linear, Efl.Pack
{ {
[[A selectable box of items. [[A selectable box of items.

4
src/lib/elementary/efl_ui_tags.eo
View File

@ -1,6 +1,6 @@
class @beta Efl.Ui.Tags extends Efl.Ui.Layout_Base class @beta Efl.Ui.Tags extends Efl.Ui.Layout_Base
implements Efl.Text, Efl.Ui.Format implements Efl.Ui.Format
composite Efl.Text composites Efl.Text
{ {
[[A widget displaying a list of tags. The user can remove tags by clicking [[A widget displaying a list of tags. The user can remove tags by clicking
on each tag "close" button and add new tags by typing text in the text on each tag "close" button and add new tags by typing text in the text

4
src/lib/elementary/efl_ui_text.eo
View File

@ -3,8 +3,8 @@ import elm_general;
class @beta Efl.Ui.Text extends Efl.Ui.Layout_Base implements Efl.Input.Clickable, class @beta Efl.Ui.Text extends Efl.Ui.Layout_Base implements Efl.Input.Clickable,
Efl.Access.Text, Efl.Access.Editable.Text, Efl.File, Efl.Access.Text, Efl.Access.Editable.Text, Efl.File,
Efl.Ui.Text_Selectable, Efl.Text_Interactive, Efl.Text_Markup Efl.Ui.Text_Selectable
composite composites
Efl.Text_Interactive, Efl.Text_Markup Efl.Text_Interactive, Efl.Text_Markup
{ {
[[A flexible text widget which can be static (as a label) or editable by [[A flexible text widget which can be static (as a label) or editable by

4
src/lib/elementary/efl_ui_video.eo
View File

@ -1,6 +1,6 @@
class @beta Efl.Ui.Video extends Efl.Ui.Layout_Base class @beta Efl.Ui.Video extends Efl.Ui.Layout_Base
implements Efl.File, Efl.Player, Efl.Access.Widget.Action implements Efl.File, Efl.Access.Widget.Action
composite Efl.Player composites Efl.Player
{ {
[[Efl UI video class]] [[Efl UI video class]]
methods { methods {

3
src/lib/elementary/efl_ui_widget_focus_manager.eo
View File

@ -1,7 +1,6 @@
mixin Efl.Ui.Widget_Focus_Manager mixin Efl.Ui.Widget_Focus_Manager
requires Efl.Ui.Widget requires Efl.Ui.Widget
extends Efl.Ui.Focus.Manager composites Efl.Ui.Focus.Manager
composite Efl.Ui.Focus.Manager
{ {
[[Helper mixin for widgets which also can act as focus managers. [[Helper mixin for widgets which also can act as focus managers.

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

@ -137,9 +137,9 @@ enum Efl.Ui.Win_Move_Resize_Mode
class Efl.Ui.Win extends Efl.Ui.Widget implements Efl.Canvas.Scene, Efl.Access.Window, class Efl.Ui.Win extends Efl.Ui.Widget implements Efl.Canvas.Scene, Efl.Access.Window,
Efl.Access.Component, Efl.Access.Widget.Action, Efl.Access.Component, Efl.Access.Widget.Action,
Efl.Content, Efl.Input.State, Efl.Input.Interface, Efl.Screen, Efl.Content, Efl.Input.State, Efl.Input.Interface, Efl.Screen,
Efl.Text, Efl.Config, Efl.Text, Efl.Ui.Widget_Focus_Manager,
Efl.Ui.Widget_Focus_Manager, Efl.Ui.Focus.Manager_Window_Root Efl.Ui.Focus.Manager_Window_Root
composite Efl.Config composites Efl.Config
{ {
[[Efl UI window class. [[Efl UI window class.

2
src/tests/eolian/data/unimpl.eo
View File

@ -1,4 +1,4 @@
class Unimpl implements Iface composite Iface { class Unimpl composites Iface {
implements { implements {
Iface.foo; Iface.foo;
} }