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

View File

@ -1,12 +1,10 @@
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.Ui.Layout_Orientable,
Efl.Ui.Multi_Selectable,
Efl.Ui.Focus.Manager_Sub,
Efl.Ui.Widget_Focus_Manager
composite
composites
Efl.Ui.Scrollable_Interactive,
Efl.Ui.Scrollbar,
Efl.Ui.Focus.Manager

View File

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

View File

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

View File

@ -16,9 +16,9 @@ struct @beta Efl.Ui.Panel_Scroll_Info
}
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
composite Efl.Ui.Scrollable_Interactive
composites Efl.Ui.Scrollable_Interactive
{
[[Elementary panel class]]
methods {

View File

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

View File

@ -1,10 +1,8 @@
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.Widget_Focus_Manager,
Efl.Content
composite
composites
Efl.Ui.Scrollable_Interactive,
Efl.Ui.Scrollbar
{

View File

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

View File

@ -1,6 +1,6 @@
class @beta Efl.Ui.Tags extends Efl.Ui.Layout_Base
implements Efl.Text, Efl.Ui.Format
composite Efl.Text
implements Efl.Ui.Format
composites Efl.Text
{
[[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

View File

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

View File

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

View File

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

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,
Efl.Access.Component, Efl.Access.Widget.Action,
Efl.Content, Efl.Input.State, Efl.Input.Interface, Efl.Screen,
Efl.Text, Efl.Config,
Efl.Ui.Widget_Focus_Manager, Efl.Ui.Focus.Manager_Window_Root
composite Efl.Config
Efl.Text, Efl.Ui.Widget_Focus_Manager,
Efl.Ui.Focus.Manager_Window_Root
composites Efl.Config
{
[[Efl UI window class.

View File

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