From 7f57e8e6019adde04e2b575b4faf851009d46aaf Mon Sep 17 00:00:00 2001 From: Marcel Hollerbach Date: Fri, 31 Jan 2020 16:11:57 +0100 Subject: [PATCH] move stabelized items out of @beta fixes T8570 fixes T8567 fixes T8566 fixes T8521 fixes T8501 fixes T8460 fixes T8455 fixes T8454 fixes T8254 fixes T7945 fixes T7944 fixes T7943 fixes T7942 fixes T7941 fixes T7940 fixes T7939 fixes T7938 fixes T7937 fixes T7936 fixes T7935 fixes T7934 fixes T7933 fixes T7858 fixes T7857 fixes T7856 fixes T7855 fixes T8599 Reviewed-by: Xavi Artigas Differential Revision: https://phab.enlightenment.org/D11264 --- src/lib/efl/interfaces/efl_gfx_types.eot | 2 +- src/lib/efl/interfaces/efl_input_text.eo | 2 +- .../interfaces/efl_text_font_properties.eo | 27 ++++++++++----- src/lib/efl/interfaces/efl_text_format.eo | 15 +++++--- src/lib/efl/interfaces/efl_text_markup.eo | 3 +- src/lib/efl/interfaces/efl_text_style.eo | 34 +++++++++++++------ src/lib/efl/interfaces/efl_text_types.eot | 9 +++-- src/lib/elementary/efl_text_interactive.eo | 3 +- src/lib/elementary/efl_ui_pager.eo | 2 ++ src/lib/elementary/efl_ui_progressbar.eo | 4 ++- .../elementary/efl_ui_spotlight_container.eo | 2 ++ src/lib/elementary/efl_ui_stack.eo | 1 + .../efl_ui_widget_scrollable_content.eo | 2 +- src/lib/eo/eina_types.eot | 6 ++-- src/lib/evas/canvas/efl_canvas_textblock.eo | 4 ++- src/lib/evas/canvas/efl_text_cursor.eo | 21 ++++++++---- src/lib/evas/canvas/efl_text_formatter.eo | 7 ++-- 17 files changed, 98 insertions(+), 46 deletions(-) diff --git a/src/lib/efl/interfaces/efl_gfx_types.eot b/src/lib/efl/interfaces/efl_gfx_types.eot index e9189aad31..ba9ca089b1 100644 --- a/src/lib/efl/interfaces/efl_gfx_types.eot +++ b/src/lib/efl/interfaces/efl_gfx_types.eot @@ -219,7 +219,7 @@ enum @beta Efl.Gfx.Color_Class_Layer { shadow [[Shadow color]] } -type @beta Efl.Font.Size: int; [[Efl font size type]] +type Efl.Font.Size: int; [[Efl font size type @since 1.24]] error @extern @beta Efl.Gfx.Image.Load_Error.NONE = "XXX"; [[No error on load]] error @extern @beta Efl.Gfx.Image.Load_Error.GENERIC = "XXX"; [[A non-specific error occurred]] diff --git a/src/lib/efl/interfaces/efl_input_text.eo b/src/lib/efl/interfaces/efl_input_text.eo index 7526658635..ce4a42eefb 100644 --- a/src/lib/efl/interfaces/efl_input_text.eo +++ b/src/lib/efl/interfaces/efl_input_text.eo @@ -259,4 +259,4 @@ interface @beta Efl.Input_Text { } } } -} \ No newline at end of file +} diff --git a/src/lib/efl/interfaces/efl_text_font_properties.eo b/src/lib/efl/interfaces/efl_text_font_properties.eo index 71d8e3d5d9..95ccbf2953 100644 --- a/src/lib/efl/interfaces/efl_text_font_properties.eo +++ b/src/lib/efl/interfaces/efl_text_font_properties.eo @@ -1,8 +1,10 @@ import efl_gfx_types; -enum @beta Efl.Text_Font_Weight { +enum Efl.Text_Font_Weight { [[The weight of a particular font is the thickness of the character outlines relative to their height. The given numerical values follow the TrueType scale (from 100 to 900) and are approximate. - It is up to each font to provide all of them.]] + It is up to each font to provide all of them. + @since 1.24 + ]] normal, [[Normal font weight (400).]] thin, [[Thin font weight (100).]] ultralight, [[Ultralight font weight (200).]] @@ -18,9 +20,11 @@ enum @beta Efl.Text_Font_Weight { extrablack, [[Extrablack font weight (950).]] } -enum @beta Efl.Text_Font_Width { +enum Efl.Text_Font_Width { [[Font width relative to its height. - It is up to each font to provide all these widths.]] + It is up to each font to provide all these widths. + @since 1.24 + ]] normal, [[Normal font width.]] ultracondensed, [[Ultracondensed font width.]] extracondensed, [[Extracondensed font width.]] @@ -32,8 +36,10 @@ enum @beta Efl.Text_Font_Width { ultraexpanded, [[Ultraexpanded font width.]] } -enum @beta Efl.Text_Font_Slant { - [[Type of font slant.]] +enum Efl.Text_Font_Slant { + [[Type of font slant. + @since 1.24 + ]] normal, [[Normal font slant: Sets the text to the normal font (non-italicized).]] oblique, [[Oblique font slant: Sets the text to use a simulated version of an italic font, created by algorithmically slanting the normal version.]] @@ -41,14 +47,17 @@ enum @beta Efl.Text_Font_Slant { If not available, it will simulate italics with oblique instead.]] } -enum @beta Efl.Text_Font_Bitmap_Scalable { - [[When are bitmap fonts allowed to be scaled.]] +enum Efl.Text_Font_Bitmap_Scalable { + [[When are bitmap fonts allowed to be scaled. + @since 1.24 + ]] none = 0, [[Disable scaling for bitmap fonts.]] color = (1 << 0), [[Enable scaling for color bitmap fonts.]] } -interface @beta Efl.Text_Font_Properties { +interface Efl.Text_Font_Properties { [[Properties related to font handling. + @since 1.24 ]] c_prefix: efl_text; methods { diff --git a/src/lib/efl/interfaces/efl_text_format.eo b/src/lib/efl/interfaces/efl_text_format.eo index 14d80a107c..73fa97a67d 100644 --- a/src/lib/efl/interfaces/efl_text_format.eo +++ b/src/lib/efl/interfaces/efl_text_format.eo @@ -1,5 +1,7 @@ -enum @beta Efl.Text_Format_Wrap { - [[Wrapping policy for the text.]] +enum Efl.Text_Format_Wrap { + [[Wrapping policy for the text. + @since 1.24 + ]] none, [[No wrapping.]] char, [[Wrap at character boundaries.]] word, [[Wrap at word boundaries.]] @@ -8,19 +10,22 @@ enum @beta Efl.Text_Format_Wrap { at any character.]] } -enum @beta Efl.Text_Format_Horizontal_Alignment_Auto_Type { - [[Automatic horizontal alignment setting for the text (Left-To-Right or Right-To-Left).]] +enum Efl.Text_Format_Horizontal_Alignment_Auto_Type { + [[Automatic horizontal alignment setting for the text (Left-To-Right or Right-To-Left). + @since 1.24 + ]] none, [[No auto-alignment rule: Horizontal Alignment is decided by @Efl.Text_Format.text_horizontal_align]] auto, [[Respects LTR/RTL (bidirectional) characters found inside the text content.]] locale, [[Respects the system's language settings.]] opposite [[Text is placed at opposite side of LTR/RTL (bidirectional) settings.]] } -interface @beta Efl.Text_Format { +interface Efl.Text_Format { [[The look and layout of the text. The text format can affect the geometry of the text object, as well as how characters are presented. + @since 1.24 ]] c_prefix: efl_text; methods { diff --git a/src/lib/efl/interfaces/efl_text_markup.eo b/src/lib/efl/interfaces/efl_text_markup.eo index a0ec020cf5..0f11e86a96 100644 --- a/src/lib/efl/interfaces/efl_text_markup.eo +++ b/src/lib/efl/interfaces/efl_text_markup.eo @@ -1,5 +1,6 @@ -interface @beta Efl.Text_Markup { +interface Efl.Text_Markup { [[Markup data that populates the text object's style and format + @since 1.24 ]] methods { @property markup { diff --git a/src/lib/efl/interfaces/efl_text_style.eo b/src/lib/efl/interfaces/efl_text_style.eo index bb168fd5dd..d0cd196e9a 100644 --- a/src/lib/efl/interfaces/efl_text_style.eo +++ b/src/lib/efl/interfaces/efl_text_style.eo @@ -1,22 +1,29 @@ -enum @beta Efl.Text_Style_Background_Type +enum Efl.Text_Style_Background_Type { - [[Type of background to use behind each line of text.]] + [[Type of background to use behind each line of text. + + @since 1.24 + ]] none = 0, [[Do not use background.]] solid_color, [[Use a solid-color rectangle as background. Requires @Efl.Text_Style.text_background_color.]] } -enum @beta Efl.Text_Style_Strikethrough_Type +enum Efl.Text_Style_Strikethrough_Type { - [[Whether to add a strike-through decoration to the displayed text or not.]] + [[Whether to add a strike-through decoration to the displayed text or not. + @since 1.24 + ]] none = 0, [[Do not use strike-through.]] single, [[Strike-through with a single line. Requires @Efl.Text_Style.text_strikethrough_color.]] } -enum @beta Efl.Text_Style_Effect_Type +enum Efl.Text_Style_Effect_Type { - [[Effect to apply to the displayed text.]] + [[Effect to apply to the displayed text. + @since 1.24 + ]] none = 0, [[No effect.]] shadow, [[Shadow effect. Uses @Efl.Text_Style.text_shadow_color and @Efl.Text_Style.text_shadow_direction.]] @@ -40,9 +47,11 @@ enum @beta Efl.Text_Style_Effect_Type @Efl.Text_Style.text_outline_color.]] } -enum @beta Efl.Text_Style_Shadow_Direction +enum Efl.Text_Style_Shadow_Direction { - [[Direction of the shadow effect.]] + [[Direction of the shadow effect. + @since 1.24 + ]] bottom_right = 0, [[Shadow towards bottom right.]] bottom, [[Shadow towards bottom.]] bottom_left, [[Shadow towards bottom left.]] @@ -53,9 +62,11 @@ enum @beta Efl.Text_Style_Shadow_Direction right, [[Shadow towards right.]] } -enum @beta Efl.Text_Style_Underline_Type +enum Efl.Text_Style_Underline_Type { - [[Type of underline for the displayed text.]] + [[Type of underline for the displayed text. + @since 1.24 + ]] none = 0, [[Text without underline.]] single, [[Underlined with a single line. Requires @Efl.Text_Style.text_underline_color.]] @@ -66,10 +77,11 @@ enum @beta Efl.Text_Style_Underline_Type @Efl.Text_Style.text_underline_dashed_gap.]] } -interface @beta Efl.Text_Style { +interface Efl.Text_Style { [[Decorations to add to the text. Decorations include text color, glow, outline, underline, strike-through and shadows. + @since 1.24 ]] c_prefix: efl_text; methods { diff --git a/src/lib/efl/interfaces/efl_text_types.eot b/src/lib/efl/interfaces/efl_text_types.eot index 9f3e0d2690..d56dccf417 100644 --- a/src/lib/efl/interfaces/efl_text_types.eot +++ b/src/lib/efl/interfaces/efl_text_types.eot @@ -10,16 +10,19 @@ enum Efl.Text_Bidirectional_Type { inherit [[Inherit text type]] } -enum @beta Efl.Text_Change_Type { - [[Text change type.]] +enum Efl.Text_Change_Type { + [[Text change type. + @since 1.24 + ]] insert = 0, [[the content was inserted.]] remove [[the content was removed.]] } -struct @beta Efl.Text_Change_Info { +struct Efl.Text_Change_Info { [[This structure includes all the information about content changes. It's meant to be used to implement undo/redo. + @since 1.24 ]] content: string; [[The content added/removed]] position: size; [[The position where it was added/removed]] diff --git a/src/lib/elementary/efl_text_interactive.eo b/src/lib/elementary/efl_text_interactive.eo index cc15cdc15b..9e917ca7ec 100644 --- a/src/lib/elementary/efl_text_interactive.eo +++ b/src/lib/elementary/efl_text_interactive.eo @@ -1,11 +1,12 @@ import efl_text_types; -interface @beta Efl.Text_Interactive extends Efl.Text, Efl.Text_Font_Properties, +interface Efl.Text_Interactive extends Efl.Text, Efl.Text_Font_Properties, Efl.Text_Format, Efl.Text_Style { [[Interface for interactive (editable) text inputs (text entries). It handles cursors, edition and selection. + @since 1.24 ]] methods { @property main_cursor { diff --git a/src/lib/elementary/efl_ui_pager.eo b/src/lib/elementary/efl_ui_pager.eo index 2adf506c86..1f9a7a06e0 100644 --- a/src/lib/elementary/efl_ui_pager.eo +++ b/src/lib/elementary/efl_ui_pager.eo @@ -3,6 +3,8 @@ class Efl.Ui.Pager extends Efl.Ui.Spotlight.Container [[A spotlight with predefined @Efl.Ui.Spotlight.Container.spotlight_manager The container will slide in the content sideways, the old content will slide out. + + @since 1.24 ]] implements { Efl.Object.constructor; diff --git a/src/lib/elementary/efl_ui_progressbar.eo b/src/lib/elementary/efl_ui_progressbar.eo index 3f6917b95c..9108298901 100644 --- a/src/lib/elementary/efl_ui_progressbar.eo +++ b/src/lib/elementary/efl_ui_progressbar.eo @@ -1,4 +1,4 @@ -class @beta Efl.Ui.Progressbar extends Efl.Ui.Layout_Base implements Efl.Ui.Range_Display, Efl.Ui.Format, +class Efl.Ui.Progressbar extends Efl.Ui.Layout_Base implements Efl.Ui.Range_Display, Efl.Ui.Format, Efl.Ui.Layout_Orientable, Efl.Access.Value, Efl.Text, Efl.Content, Efl.Text_Markup { @@ -13,6 +13,8 @@ class @beta Efl.Ui.Progressbar extends Efl.Ui.Layout_Base implements Efl.Ui.Rang @.infinite_mode can be set when the progress state is unknown. An optional textual label can be shown to indicate the exact numerical value of the progress. + + @since 1.24 ]] methods { @property infinite_mode { diff --git a/src/lib/elementary/efl_ui_spotlight_container.eo b/src/lib/elementary/efl_ui_spotlight_container.eo index 9acfc0c631..fc05047e9d 100644 --- a/src/lib/elementary/efl_ui_spotlight_container.eo +++ b/src/lib/elementary/efl_ui_spotlight_container.eo @@ -25,6 +25,8 @@ class Efl.Ui.Spotlight.Container extends Efl.Ui.Widget implements Efl.Pack_Linea This class can be used to create other widgets like Pagers, Tabbed pagers or Stacks, where each sub-widget represents a "page" full of other widgets. All these cases can be implemented with a different @.spotlight_manager and use the same @Efl.Ui.Spotlight.Container. + + @since 1.24 ]] c_prefix: efl_ui_spotlight; methods { diff --git a/src/lib/elementary/efl_ui_stack.eo b/src/lib/elementary/efl_ui_stack.eo index ccb6b4cc15..c60dffc37e 100644 --- a/src/lib/elementary/efl_ui_stack.eo +++ b/src/lib/elementary/efl_ui_stack.eo @@ -3,6 +3,7 @@ class Efl.Ui.Stack extends Efl.Ui.Spotlight.Container [[A spotlight with predefined @Efl.Ui.Spotlight.Container.spotlight_manager The container will alpha-blend the new content over the old content. + @since 1.24 ]] implements { Efl.Object.constructor; diff --git a/src/lib/elementary/efl_ui_widget_scrollable_content.eo b/src/lib/elementary/efl_ui_widget_scrollable_content.eo index 90bed2176d..82de9eae00 100644 --- a/src/lib/elementary/efl_ui_widget_scrollable_content.eo +++ b/src/lib/elementary/efl_ui_widget_scrollable_content.eo @@ -1,7 +1,7 @@ import eina_types; parse efl_text_format; -mixin @beta Efl.Ui.Widget_Scrollable_Content requires Efl.Object +mixin Efl.Ui.Widget_Scrollable_Content requires Efl.Object { [[Mixin helper to add scrollable content to widgets. diff --git a/src/lib/eo/eina_types.eot b/src/lib/eo/eina_types.eot index fcdf1ec572..04d728a8d3 100644 --- a/src/lib/eo/eina_types.eot +++ b/src/lib/eo/eina_types.eot @@ -86,8 +86,10 @@ struct @extern Eina.Matrix4 { ww: double; [[WW value.]] } -struct @extern @beta Eina.Range { - [[A range sequence of values.]] +struct @extern Eina.Range { + [[A range sequence of values. + @since 1.24 + ]] start: size; [[Start of the range.]] length: size; [[Length of the range.]] } diff --git a/src/lib/evas/canvas/efl_canvas_textblock.eo b/src/lib/evas/canvas/efl_canvas_textblock.eo index 7d20786c5f..ca3d218e34 100644 --- a/src/lib/evas/canvas/efl_canvas_textblock.eo +++ b/src/lib/evas/canvas/efl_canvas_textblock.eo @@ -1,6 +1,6 @@ import efl_text_types; -class @beta Efl.Canvas.Textblock extends Efl.Canvas.Object implements Efl.Text, +class Efl.Canvas.Textblock extends Efl.Canvas.Object implements Efl.Text, Efl.Canvas.Filter.Internal, Efl.Text_Font_Properties, Efl.Text_Style, Efl.Text_Format, Efl.Text_Markup, Efl.Ui.I18n @@ -12,6 +12,8 @@ class @beta Efl.Canvas.Textblock extends Efl.Canvas.Object implements Efl.Text, This can be accomplished using @Efl.Text_Font_Properties.font_family, @Efl.Text_Font_Properties.font_size and @Efl.Text_Style.text_color. Alternatively, @.style_apply can be used providing the attributes $font, $font_size and $color. + + @since 1.24 ]] methods { @property is_empty { diff --git a/src/lib/evas/canvas/efl_text_cursor.eo b/src/lib/evas/canvas/efl_text_cursor.eo index 2c77f84a14..4337185001 100644 --- a/src/lib/evas/canvas/efl_text_cursor.eo +++ b/src/lib/evas/canvas/efl_text_cursor.eo @@ -1,15 +1,19 @@ -enum @beta Efl.Text.Cursor_Type +enum Efl.Text.Cursor_Type { [[Shape of the text cursor. This is normally used in @Efl.Text.Cursor methods to retrieve the cursor's geometry. + @since 1.24 ]] before, [[Cursor is a vertical bar (I-beam) placed before the selected character.]] under [[Cursor is an horizontal line (underscore) placed under the selected character.]] } -enum @beta Efl.Text.Cursor_Move_Type +enum Efl.Text.Cursor_Move_Type { - [[Text cursor movement types.]] + [[Text cursor movement types. + + @since 1.24 + ]] character_next, [[Advances to the next character.]] character_previous, [[Advances to the previous character.]] cluster_next, [[Advances to the next grapheme cluster @@ -28,8 +32,11 @@ enum @beta Efl.Text.Cursor_Move_Type paragraph_previous [[Advances to the end of the previous paragraph.]] } -abstract @beta Efl.Text.Cursor extends Efl.Object implements Efl.Duplicate{ - [[Cursor API.]] +abstract Efl.Text.Cursor extends Efl.Object implements Efl.Duplicate{ + [[Cursor API. + + @since 1.24 + ]] c_prefix: efl_text_cursor; methods { @@ -69,8 +76,8 @@ abstract @beta Efl.Text.Cursor extends Efl.Object implements Efl.Duplicate{ } @property cursor_geometry { - [[Returns the geometry of cursor, if cursor is shown for the text - of the same direction as paragraph,else ("split cursor") will return + [[Returns the geometry of cursor, if cursor is shown for the text + of the same direction as paragraph,else ("split cursor") will return and you need to consider the lower ("split cursor") @.lower_cursor_geometry Split cursor geometry is valid only in @Efl.Text.Cursor_Type.before cursor mode.]] diff --git a/src/lib/evas/canvas/efl_text_formatter.eo b/src/lib/evas/canvas/efl_text_formatter.eo index fca4e84b3b..139b9ba1a7 100644 --- a/src/lib/evas/canvas/efl_text_formatter.eo +++ b/src/lib/evas/canvas/efl_text_formatter.eo @@ -1,6 +1,6 @@ import efl_text_types; -abstract @beta Efl.Text.Formatter extends Efl.Object { +abstract Efl.Text.Formatter extends Efl.Object { [[Text Formatter API to manage text formatting(attributes). Use it to insert and remove style attributes (font, size, color, ...) using @Efl.Text.Cursor on EFL Widgets. @@ -8,7 +8,10 @@ abstract @beta Efl.Text.Formatter extends Efl.Object { Cursor instances are already bound to a text object so there's no need to provide it to this class. Style is specified using format strings as described in @Efl.Canvas.Textblock.style_apply. - There is no need to instantiate this class. Use directly the @.attribute_insert and @.attribute_clear static methods.]] + There is no need to instantiate this class. Use directly the @.attribute_insert and @.attribute_clear static methods. + + @since 1.24 + ]] methods { attribute_insert @static { [[Inserts an attribute format in a specified range [$start, $end - 1].