bu5hm4n pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=3c54f6458f80e2221962b01f2d4e4067a6978402
commit 3c54f6458f80e2221962b01f2d4e4067a6978402 Author: Ali Alzyod <[email protected]> Date: Tue Dec 31 07:15:29 2019 +0000 Efl.Text.Font.Properties: rename Efl.Text_Font_Properties Efl.Text.Font.Properties: rename Efl.Text_Font_Properties Reviewed-by: Marcel Hollerbach <[email protected]> Differential Revision: https://phab.enlightenment.org/D10990 --- src/lib/edje/efl_canvas_layout_part_text.eo | 6 ++-- src/lib/efl/interfaces/efl_text_font_properties.eo | 2 +- src/lib/elementary/efl_text_interactive.eo | 2 +- src/lib/evas/canvas/efl_canvas_textblock.eo | 42 +++++++++++----------- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/lib/edje/efl_canvas_layout_part_text.eo b/src/lib/edje/efl_canvas_layout_part_text.eo index a593424062..6c9c4cb06e 100644 --- a/src/lib/edje/efl_canvas_layout_part_text.eo +++ b/src/lib/edje/efl_canvas_layout_part_text.eo @@ -11,7 +11,7 @@ enum @beta Efl.Canvas.Layout_Part_Text_Expand } class @beta Efl.Canvas.Layout_Part_Text extends Efl.Canvas.Layout_Part implements Efl.Text, -Efl.Text_Markup, Efl.Text_Format, Efl.Text.Font.Properties, Efl.Text_Style +Efl.Text_Markup, Efl.Text_Format, Efl.Text_Font_Properties, Efl.Text_Style { [[Represents a TEXT part of a layout @@ -38,8 +38,8 @@ Efl.Text_Markup, Efl.Text_Format, Efl.Text.Font.Properties, Efl.Text_Style Efl.Text_Markup.markup { get; set; } Efl.Text_Format.ellipsis { set; get; } Efl.Text_Format.wrap { set; get; } - Efl.Text.Font.Properties.font_family { set; get; } - Efl.Text.Font.Properties.font_size { set; get; } + Efl.Text_Font_Properties.font_family { set; get; } + Efl.Text_Font_Properties.font_size { set; get; } Efl.Text_Style.text_color { set; get; } Efl.Text_Style.text_background_type { set; get; } Efl.Text_Style.text_background_color { set; get;} diff --git a/src/lib/efl/interfaces/efl_text_font_properties.eo b/src/lib/efl/interfaces/efl_text_font_properties.eo index b7957a8ac9..160b182803 100644 --- a/src/lib/efl/interfaces/efl_text_font_properties.eo +++ b/src/lib/efl/interfaces/efl_text_font_properties.eo @@ -43,7 +43,7 @@ enum @beta Efl.Text_Font_Bitmap_Scalable { color = (1 << 0), [[Enable scalable feature for color bitmap fonts.]] } -interface @beta Efl.Text.Font.Properties { +interface @beta Efl.Text_Font_Properties { [[Font settings for text. ]] c_prefix: efl_text; diff --git a/src/lib/elementary/efl_text_interactive.eo b/src/lib/elementary/efl_text_interactive.eo index 85b5a811d7..933aad0cb1 100644 --- a/src/lib/elementary/efl_text_interactive.eo +++ b/src/lib/elementary/efl_text_interactive.eo @@ -1,6 +1,6 @@ import efl_text_types; -interface @beta Efl.Text_Interactive extends Efl.Text, Efl.Text.Font.Properties, +interface @beta Efl.Text_Interactive extends Efl.Text, Efl.Text_Font_Properties, Efl.Text_Format, Efl.Text_Style { [[Interface for interactive (editable) text inputs (text entries). diff --git a/src/lib/evas/canvas/efl_canvas_textblock.eo b/src/lib/evas/canvas/efl_canvas_textblock.eo index 724103040a..031f74a13e 100644 --- a/src/lib/evas/canvas/efl_canvas_textblock.eo +++ b/src/lib/evas/canvas/efl_canvas_textblock.eo @@ -1,7 +1,7 @@ import efl_text_types; class @beta Efl.Canvas.Textblock extends Efl.Canvas.Object implements Efl.Text, - Efl.Canvas.Filter.Internal, Efl.Text.Font.Properties, + Efl.Canvas.Filter.Internal, Efl.Text_Font_Properties, Efl.Text_Style, Efl.Text_Format, Efl.Text_Markup, Efl.Ui.I18n { @@ -9,7 +9,7 @@ class @beta Efl.Canvas.Textblock extends Efl.Canvas.Object implements Efl.Text, if you need user interaction consider the classes in $[Efl.Ui]. Note: No text will be rendered until a font, a font size and a font color are specified. - This can be accomplished using @Efl.Text.Font.Properties.font_family, @Efl.Text.Font.Properties.font_size and + 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. ]] @@ -92,7 +92,7 @@ class @beta Efl.Canvas.Textblock extends Efl.Canvas.Object implements Efl.Text, [[Applies several style attributes at once using a formatting string. Given style attributes override previous values, leaving other attributes unaffected. This is akin to setting individual style attributes using properties like - @Efl.Text.Font.Properties.font_slant or @Efl.Text_Format.wrap, for example. + @Efl.Text_Font_Properties.font_slant or @Efl.Text_Format.wrap, for example. The formatting string is a whitespace-separated list of $[attribute=value] pairs. @@ -101,43 +101,43 @@ class @beta Efl.Canvas.Textblock extends Efl.Canvas.Object implements Efl.Text, - $font: Name of the font to use. Default value is empty, meaning that no text will be rendered. Requires $font_size and $font_color. - See @Efl.Text.Font.Properties.font_family. + See @Efl.Text_Font_Properties.font_family. - $font_fallbacks: Comma-delimited list of fonts to try if finding the primary font fails. Example: $[font_fallbacks=consolas,courier,monospace]. Default value is empty. - See @Efl.Text.Font.Properties.font_fallbacks. + See @Efl.Text_Font_Properties.font_fallbacks. - $font_size: Height of font, in points. Default value is 0. Requires $font and $font_color. - See @Efl.Text.Font.Properties.font_size. + See @Efl.Text_Font_Properties.font_size. - $font_source: Path to the file containing the font to use. Example: $[font_source=/usr/share/fonts/Sans.ttf]. Default value is empty. - See @Efl.Text.Font.Properties.font_source. + See @Efl.Text_Font_Properties.font_source. - $font_weight: Thickness of the font. The value must be one of: $normal, $thin, $ultralight, $extralight, $light, $book, $medium, $semibold, $bold, $ultrabold, $extrabold, $black and $extrablack. Default value is $normal. - See @Efl.Text.Font.Properties.font_weight. + See @Efl.Text_Font_Properties.font_weight. - $font_style: Style of the font. The value must be one of: $normal, $oblique and $italic. Default value is $normal. - See @Efl.Text.Font.Properties.font_slant. + See @Efl.Text_Font_Properties.font_slant. - $font_width: How wide the font is, relative to its height. The value must be one of: $normal, $ultracondensed, $extracondensed, $condensed, $semicondensed, $semiexpanded, $expanded, $extraexpanded and $ultraexpanded. Default value is $normal. - See @Efl.Text.Font.Properties.font_weight. + See @Efl.Text_Font_Properties.font_weight. - $lang: A 2-letter ISO 639-1 language code, $auto (to use the system locale setting) or $none (to disable language support). Example: $[lang=he]. Default value is empty. - See @Efl.Text.Font.Properties.font_lang. + See @Efl.Text_Font_Properties.font_lang. - $color: Color code for the text (See bottom for the complete list of supported codes). Default value is $[rgba(0,0,0,0)] meaning that no text will be rendered. @@ -340,7 +340,7 @@ class @beta Efl.Canvas.Textblock extends Efl.Canvas.Object implements Efl.Text, @property all_styles { [[A string representing the complete set of attributes applied to this text object. This includes the default attributes plus any additional style applied with @.style_apply - or individual style properties like @Efl.Text.Font.Properties.font_slant or @Efl.Text_Format.wrap. + or individual style properties like @Efl.Text_Font_Properties.font_slant or @Efl.Text_Format.wrap. See @.style_apply for the description of all attributes. ]] @@ -455,15 +455,15 @@ class @beta Efl.Canvas.Textblock extends Efl.Canvas.Object implements Efl.Text, Efl.Canvas.Filter.Internal.filter_dirty; Efl.Canvas.Filter.Internal.filter_input_render; Efl.Canvas.Filter.Internal.filter_state_prepare; - Efl.Text.Font.Properties.font_family { get; set; } - Efl.Text.Font.Properties.font_size { get; set; } - Efl.Text.Font.Properties.font_source { get; set; } - Efl.Text.Font.Properties.font_fallbacks { get; set; } - Efl.Text.Font.Properties.font_lang { get; set; } - Efl.Text.Font.Properties.font_weight { get; set; } - Efl.Text.Font.Properties.font_slant { get; set; } - Efl.Text.Font.Properties.font_width { get; set; } - Efl.Text.Font.Properties.font_bitmap_scalable { get; set; } + Efl.Text_Font_Properties.font_family { get; set; } + Efl.Text_Font_Properties.font_size { get; set; } + Efl.Text_Font_Properties.font_source { get; set; } + Efl.Text_Font_Properties.font_fallbacks { get; set; } + Efl.Text_Font_Properties.font_lang { get; set; } + Efl.Text_Font_Properties.font_weight { get; set; } + Efl.Text_Font_Properties.font_slant { get; set; } + Efl.Text_Font_Properties.font_width { get; set; } + Efl.Text_Font_Properties.font_bitmap_scalable { get; set; } Efl.Text_Style.text_color { get; set; } Efl.Text_Style.text_background_type { get; set; } Efl.Text_Style.text_background_color { get; set; } --
