forked from enlightenment/efl
efl.text.font: rename to efl.text.font.properties
Reviewers: segfaultxavi, woohyun, zmike, bu5hm4n Subscribers: cedric, #reviewers, #committers Tags: #efl Maniphest Tasks: T7855 Differential Revision: https://phab.enlightenment.org/D10966
This commit is contained in:
parent
3bd4f04ec7
commit
55e9d31569
|
@ -149,7 +149,7 @@ _efl_canvas_layout_part_text_efl_text_format_ellipsis_get(const Eo *obj,
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static void
|
EOLIAN static void
|
||||||
_efl_canvas_layout_part_text_efl_text_font_font_family_set(Eo *obj,
|
_efl_canvas_layout_part_text_efl_text_font_properties_font_family_set(Eo *obj,
|
||||||
void *_pd EINA_UNUSED, const char *font)
|
void *_pd EINA_UNUSED, const char *font)
|
||||||
{
|
{
|
||||||
Edje_User_Defined *eud;
|
Edje_User_Defined *eud;
|
||||||
|
@ -165,7 +165,7 @@ _efl_canvas_layout_part_text_efl_text_font_font_family_set(Eo *obj,
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static const char *
|
EOLIAN static const char *
|
||||||
_efl_canvas_layout_part_text_efl_text_font_font_family_get(const Eo *obj,
|
_efl_canvas_layout_part_text_efl_text_font_properties_font_family_get(const Eo *obj,
|
||||||
void *_pd EINA_UNUSED)
|
void *_pd EINA_UNUSED)
|
||||||
{
|
{
|
||||||
PROXY_DATA_GET(obj, pd);
|
PROXY_DATA_GET(obj, pd);
|
||||||
|
@ -175,7 +175,7 @@ _efl_canvas_layout_part_text_efl_text_font_font_family_get(const Eo *obj,
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static void
|
EOLIAN static void
|
||||||
_efl_canvas_layout_part_text_efl_text_font_font_size_set(Eo *obj,
|
_efl_canvas_layout_part_text_efl_text_font_properties_font_size_set(Eo *obj,
|
||||||
void *_pd EINA_UNUSED, Efl_Font_Size size)
|
void *_pd EINA_UNUSED, Efl_Font_Size size)
|
||||||
{
|
{
|
||||||
Edje_User_Defined *eud;
|
Edje_User_Defined *eud;
|
||||||
|
@ -191,7 +191,7 @@ _efl_canvas_layout_part_text_efl_text_font_font_size_set(Eo *obj,
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Efl_Font_Size
|
EOLIAN static Efl_Font_Size
|
||||||
_efl_canvas_layout_part_text_efl_text_font_font_size_get(const Eo *obj,
|
_efl_canvas_layout_part_text_efl_text_font_properties_font_size_get(const Eo *obj,
|
||||||
void *_pd EINA_UNUSED)
|
void *_pd EINA_UNUSED)
|
||||||
{
|
{
|
||||||
PROXY_DATA_GET(obj, pd);
|
PROXY_DATA_GET(obj, pd);
|
||||||
|
|
|
@ -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,
|
class @beta Efl.Canvas.Layout_Part_Text extends Efl.Canvas.Layout_Part implements Efl.Text,
|
||||||
Efl.Text_Markup, Efl.Text_Format, Efl.Text_Font, Efl.Text_Style
|
Efl.Text_Markup, Efl.Text_Format, Efl.Text.Font.Properties, Efl.Text_Style
|
||||||
{
|
{
|
||||||
[[Represents a TEXT part of a layout
|
[[Represents a TEXT part of a layout
|
||||||
|
|
||||||
|
@ -38,8 +38,8 @@ Efl.Text_Markup, Efl.Text_Format, Efl.Text_Font, Efl.Text_Style
|
||||||
Efl.Text_Markup.markup { get; set; }
|
Efl.Text_Markup.markup { get; set; }
|
||||||
Efl.Text_Format.ellipsis { set; get; }
|
Efl.Text_Format.ellipsis { set; get; }
|
||||||
Efl.Text_Format.wrap { set; get; }
|
Efl.Text_Format.wrap { set; get; }
|
||||||
Efl.Text_Font.font_family { set; get; }
|
Efl.Text.Font.Properties.font_family { set; get; }
|
||||||
Efl.Text_Font.font_size { set; get; }
|
Efl.Text.Font.Properties.font_size { set; get; }
|
||||||
Efl.Text_Style.text_color { set; get; }
|
Efl.Text_Style.text_color { set; get; }
|
||||||
Efl.Text_Style.text_background_type { set; get; }
|
Efl.Text_Style.text_background_type { set; get; }
|
||||||
Efl.Text_Style.text_background_color { set; get;}
|
Efl.Text_Style.text_background_color { set; get;}
|
||||||
|
|
|
@ -207,7 +207,7 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
|
||||||
#include "interfaces/efl_io_queue.eo.h"
|
#include "interfaces/efl_io_queue.eo.h"
|
||||||
|
|
||||||
/* Text interfaces */
|
/* Text interfaces */
|
||||||
#include "interfaces/efl_text_font.eo.h"
|
#include "interfaces/efl_text_font_properties.eo.h"
|
||||||
#include "interfaces/efl_text_style.eo.h"
|
#include "interfaces/efl_text_style.eo.h"
|
||||||
#include "interfaces/efl_text_format.eo.h"
|
#include "interfaces/efl_text_format.eo.h"
|
||||||
#include "interfaces/efl_text_markup.eo.h"
|
#include "interfaces/efl_text_markup.eo.h"
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
#include "interfaces/efl_player.eo.c"
|
#include "interfaces/efl_player.eo.c"
|
||||||
#include "interfaces/efl_audio_control.eo.c"
|
#include "interfaces/efl_audio_control.eo.c"
|
||||||
#include "interfaces/efl_text.eo.c"
|
#include "interfaces/efl_text.eo.c"
|
||||||
#include "interfaces/efl_text_font.eo.c"
|
#include "interfaces/efl_text_font_properties.eo.c"
|
||||||
#include "interfaces/efl_text_style.eo.c"
|
#include "interfaces/efl_text_style.eo.c"
|
||||||
#include "interfaces/efl_text_format.eo.c"
|
#include "interfaces/efl_text_format.eo.c"
|
||||||
#include "interfaces/efl_text_markup.eo.c"
|
#include "interfaces/efl_text_markup.eo.c"
|
||||||
|
|
|
@ -46,7 +46,7 @@ enum @beta Efl.Text_Font_Bitmap_Scalable {
|
||||||
color = (1 << 0), [[Enable scalable feature for color bitmap fonts.]]
|
color = (1 << 0), [[Enable scalable feature for color bitmap fonts.]]
|
||||||
}
|
}
|
||||||
|
|
||||||
interface @beta Efl.Text_Font {
|
interface @beta Efl.Text.Font.Properties {
|
||||||
[[Font settings for text.
|
[[Font settings for text.
|
||||||
]]
|
]]
|
||||||
c_prefix: efl_text;
|
c_prefix: efl_text;
|
|
@ -40,7 +40,7 @@ pub_eo_files = [
|
||||||
'efl_player.eo',
|
'efl_player.eo',
|
||||||
'efl_audio_control.eo',
|
'efl_audio_control.eo',
|
||||||
'efl_text.eo',
|
'efl_text.eo',
|
||||||
'efl_text_font.eo',
|
'efl_text_font_properties.eo',
|
||||||
'efl_text_style.eo',
|
'efl_text_style.eo',
|
||||||
'efl_text_format.eo',
|
'efl_text_format.eo',
|
||||||
'efl_text_markup.eo',
|
'efl_text_markup.eo',
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
import efl_text_types;
|
import efl_text_types;
|
||||||
|
|
||||||
interface @beta Efl.Text_Interactive extends Efl.Text, Efl.Text_Font,
|
interface @beta Efl.Text_Interactive extends Efl.Text, Efl.Text.Font.Properties,
|
||||||
Efl.Text_Format, Efl.Text_Style
|
Efl.Text_Format, Efl.Text_Style
|
||||||
{
|
{
|
||||||
[[Interface for interactive (editable) text inputs (text entries).
|
[[Interface for interactive (editable) text inputs (text entries).
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import efl_text_types;
|
import efl_text_types;
|
||||||
|
|
||||||
class @beta Efl.Canvas.Textblock extends Efl.Canvas.Object implements Efl.Text,
|
class @beta Efl.Canvas.Textblock extends Efl.Canvas.Object implements Efl.Text,
|
||||||
Efl.Canvas.Filter.Internal, Efl.Text_Font,
|
Efl.Canvas.Filter.Internal, Efl.Text.Font.Properties,
|
||||||
Efl.Text_Style, Efl.Text_Format,
|
Efl.Text_Style, Efl.Text_Format,
|
||||||
Efl.Text_Markup, Efl.Ui.I18n
|
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].
|
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.
|
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.font_family, @Efl.Text_Font.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.
|
@Efl.Text_Style.text_color.
|
||||||
Alternatively, @.style_apply can be used providing the attributes $font, $font_size and $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.
|
[[Applies several style attributes at once using a formatting string.
|
||||||
Given style attributes override previous values, leaving other attributes unaffected.
|
Given style attributes override previous values, leaving other attributes unaffected.
|
||||||
This is akin to setting individual style attributes using properties like
|
This is akin to setting individual style attributes using properties like
|
||||||
@Efl.Text_Font.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.
|
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.
|
- $font: Name of the font to use.
|
||||||
Default value is empty, meaning that no text will be rendered.
|
Default value is empty, meaning that no text will be rendered.
|
||||||
Requires $font_size and $font_color.
|
Requires $font_size and $font_color.
|
||||||
See @Efl.Text_Font.font_family.
|
See @Efl.Text.Font.Properties.font_family.
|
||||||
|
|
||||||
- $font_fallbacks: Comma-delimited list of fonts to try if finding the primary font fails.
|
- $font_fallbacks: Comma-delimited list of fonts to try if finding the primary font fails.
|
||||||
Example: $[font_fallbacks=consolas,courier,monospace].
|
Example: $[font_fallbacks=consolas,courier,monospace].
|
||||||
Default value is empty.
|
Default value is empty.
|
||||||
See @Efl.Text_Font.font_fallbacks.
|
See @Efl.Text.Font.Properties.font_fallbacks.
|
||||||
|
|
||||||
- $font_size: Height of font, in points.
|
- $font_size: Height of font, in points.
|
||||||
Default value is 0.
|
Default value is 0.
|
||||||
Requires $font and $font_color.
|
Requires $font and $font_color.
|
||||||
See @Efl.Text_Font.font_size.
|
See @Efl.Text.Font.Properties.font_size.
|
||||||
|
|
||||||
- $font_source: Path to the file containing the font to use.
|
- $font_source: Path to the file containing the font to use.
|
||||||
Example: $[font_source=/usr/share/fonts/Sans.ttf].
|
Example: $[font_source=/usr/share/fonts/Sans.ttf].
|
||||||
Default value is empty.
|
Default value is empty.
|
||||||
See @Efl.Text_Font.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,
|
- $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.
|
$light, $book, $medium, $semibold, $bold, $ultrabold, $extrabold, $black and $extrablack.
|
||||||
Default value is $normal.
|
Default value is $normal.
|
||||||
See @Efl.Text_Font.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.
|
- $font_style: Style of the font. The value must be one of: $normal, $oblique and $italic.
|
||||||
Default value is $normal.
|
Default value is $normal.
|
||||||
See @Efl.Text_Font.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:
|
- $font_width: How wide the font is, relative to its height. The value must be one of:
|
||||||
$normal, $ultracondensed, $extracondensed, $condensed, $semicondensed, $semiexpanded, $expanded,
|
$normal, $ultracondensed, $extracondensed, $condensed, $semicondensed, $semiexpanded, $expanded,
|
||||||
$extraexpanded and $ultraexpanded.
|
$extraexpanded and $ultraexpanded.
|
||||||
Default value is $normal.
|
Default value is $normal.
|
||||||
See @Efl.Text_Font.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
|
- $lang: A 2-letter ISO 639-1 language code, $auto (to use the system locale setting) or $none (to disable
|
||||||
language support).
|
language support).
|
||||||
Example: $[lang=he].
|
Example: $[lang=he].
|
||||||
Default value is empty.
|
Default value is empty.
|
||||||
See @Efl.Text_Font.font_lang.
|
See @Efl.Text.Font.Properties.font_lang.
|
||||||
|
|
||||||
- $color: Color code for the text (See bottom for the complete list of supported codes).
|
- $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.
|
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 {
|
@property all_styles {
|
||||||
[[A string representing the complete set of attributes applied to this text object.
|
[[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
|
This includes the default attributes plus any additional style applied with @.style_apply
|
||||||
or individual style properties like @Efl.Text_Font.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.
|
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_dirty;
|
||||||
Efl.Canvas.Filter.Internal.filter_input_render;
|
Efl.Canvas.Filter.Internal.filter_input_render;
|
||||||
Efl.Canvas.Filter.Internal.filter_state_prepare;
|
Efl.Canvas.Filter.Internal.filter_state_prepare;
|
||||||
Efl.Text_Font.font_family { get; set; }
|
Efl.Text.Font.Properties.font_family { get; set; }
|
||||||
Efl.Text_Font.font_size { get; set; }
|
Efl.Text.Font.Properties.font_size { get; set; }
|
||||||
Efl.Text_Font.font_source { get; set; }
|
Efl.Text.Font.Properties.font_source { get; set; }
|
||||||
Efl.Text_Font.font_fallbacks { get; set; }
|
Efl.Text.Font.Properties.font_fallbacks { get; set; }
|
||||||
Efl.Text_Font.font_lang { get; set; }
|
Efl.Text.Font.Properties.font_lang { get; set; }
|
||||||
Efl.Text_Font.font_weight { get; set; }
|
Efl.Text.Font.Properties.font_weight { get; set; }
|
||||||
Efl.Text_Font.font_slant { get; set; }
|
Efl.Text.Font.Properties.font_slant { get; set; }
|
||||||
Efl.Text_Font.font_width { get; set; }
|
Efl.Text.Font.Properties.font_width { get; set; }
|
||||||
Efl.Text_Font.font_bitmap_scalable { get; set; }
|
Efl.Text.Font.Properties.font_bitmap_scalable { get; set; }
|
||||||
Efl.Text_Style.text_color { get; set; }
|
Efl.Text_Style.text_color { get; set; }
|
||||||
Efl.Text_Style.text_background_type { get; set; }
|
Efl.Text_Style.text_background_type { get; set; }
|
||||||
Efl.Text_Style.text_background_color { get; set; }
|
Efl.Text_Style.text_background_color { get; set; }
|
||||||
|
|
|
@ -16140,7 +16140,7 @@ _canvas_text_format_changed(Eo *eo_obj, Efl_Canvas_Textblock_Data *o)
|
||||||
/* Efl.Text.Font interface implementation */
|
/* Efl.Text.Font interface implementation */
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_efl_canvas_textblock_efl_text_font_font_family_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, const char *font)
|
_efl_canvas_textblock_efl_text_font_properties_font_family_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, const char *font)
|
||||||
{
|
{
|
||||||
ASYNC_BLOCK;
|
ASYNC_BLOCK;
|
||||||
Eina_Bool changed = EINA_FALSE;
|
Eina_Bool changed = EINA_FALSE;
|
||||||
|
@ -16172,13 +16172,13 @@ _efl_canvas_textblock_efl_text_font_font_family_set(Eo *obj EINA_UNUSED, Efl_Can
|
||||||
}
|
}
|
||||||
|
|
||||||
static const char *
|
static const char *
|
||||||
_efl_canvas_textblock_efl_text_font_font_family_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o)
|
_efl_canvas_textblock_efl_text_font_properties_font_family_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o)
|
||||||
{
|
{
|
||||||
return o->default_format.info.font;
|
return o->default_format.info.font;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_efl_canvas_textblock_efl_text_font_font_size_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o, int size)
|
_efl_canvas_textblock_efl_text_font_properties_font_size_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o, int size)
|
||||||
{
|
{
|
||||||
ASYNC_BLOCK;
|
ASYNC_BLOCK;
|
||||||
EINA_SAFETY_ON_FALSE_RETURN(size > 0);
|
EINA_SAFETY_ON_FALSE_RETURN(size > 0);
|
||||||
|
@ -16190,13 +16190,13 @@ _efl_canvas_textblock_efl_text_font_font_size_set(Eo *obj EINA_UNUSED, Efl_Canva
|
||||||
}
|
}
|
||||||
|
|
||||||
static Efl_Font_Size
|
static Efl_Font_Size
|
||||||
_efl_canvas_textblock_efl_text_font_font_size_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o)
|
_efl_canvas_textblock_efl_text_font_properties_font_size_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o)
|
||||||
{
|
{
|
||||||
return o->default_format.info.size;
|
return o->default_format.info.size;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_efl_canvas_textblock_efl_text_font_font_source_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, const char *font_source EINA_UNUSED)
|
_efl_canvas_textblock_efl_text_font_properties_font_source_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, const char *font_source EINA_UNUSED)
|
||||||
{
|
{
|
||||||
Eina_Stringshare *nfont_source;
|
Eina_Stringshare *nfont_source;
|
||||||
if (o->default_format.info.font_source != font_source)
|
if (o->default_format.info.font_source != font_source)
|
||||||
|
@ -16217,13 +16217,13 @@ _efl_canvas_textblock_efl_text_font_font_source_set(Eo *obj EINA_UNUSED, Efl_Can
|
||||||
}
|
}
|
||||||
|
|
||||||
static const char*
|
static const char*
|
||||||
_efl_canvas_textblock_efl_text_font_font_source_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
|
_efl_canvas_textblock_efl_text_font_properties_font_source_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
|
||||||
{
|
{
|
||||||
return _FMT_INFO(font_source);
|
return _FMT_INFO(font_source);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_efl_canvas_textblock_efl_text_font_font_fallbacks_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, const char *font_fallbacks EINA_UNUSED)
|
_efl_canvas_textblock_efl_text_font_properties_font_fallbacks_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, const char *font_fallbacks EINA_UNUSED)
|
||||||
{
|
{
|
||||||
Eina_Stringshare *nfont_fallbacks;
|
Eina_Stringshare *nfont_fallbacks;
|
||||||
if (o->default_format.info.font_fallbacks != font_fallbacks)
|
if (o->default_format.info.font_fallbacks != font_fallbacks)
|
||||||
|
@ -16244,13 +16244,13 @@ _efl_canvas_textblock_efl_text_font_font_fallbacks_set(Eo *obj EINA_UNUSED, Efl_
|
||||||
}
|
}
|
||||||
|
|
||||||
static const char*
|
static const char*
|
||||||
_efl_canvas_textblock_efl_text_font_font_fallbacks_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
|
_efl_canvas_textblock_efl_text_font_properties_font_fallbacks_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
|
||||||
{
|
{
|
||||||
return _FMT_INFO(font_fallbacks);
|
return _FMT_INFO(font_fallbacks);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_efl_canvas_textblock_efl_text_font_font_lang_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, const char *font_lang EINA_UNUSED)
|
_efl_canvas_textblock_efl_text_font_properties_font_lang_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, const char *font_lang EINA_UNUSED)
|
||||||
{
|
{
|
||||||
if (_FMT_INFO(font_lang) != font_lang)
|
if (_FMT_INFO(font_lang) != font_lang)
|
||||||
{
|
{
|
||||||
|
@ -16262,13 +16262,13 @@ _efl_canvas_textblock_efl_text_font_font_lang_set(Eo *obj EINA_UNUSED, Efl_Canva
|
||||||
}
|
}
|
||||||
|
|
||||||
static const char*
|
static const char*
|
||||||
_efl_canvas_textblock_efl_text_font_font_lang_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
|
_efl_canvas_textblock_efl_text_font_properties_font_lang_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
|
||||||
{
|
{
|
||||||
return _FMT_INFO(font_lang);
|
return _FMT_INFO(font_lang);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_efl_canvas_textblock_efl_text_font_font_weight_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Font_Weight font_weight EINA_UNUSED)
|
_efl_canvas_textblock_efl_text_font_properties_font_weight_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Font_Weight font_weight EINA_UNUSED)
|
||||||
{
|
{
|
||||||
if (_FMT_INFO(font_weight) == font_weight) return;
|
if (_FMT_INFO(font_weight) == font_weight) return;
|
||||||
_FMT_INFO(font_weight) = font_weight;
|
_FMT_INFO(font_weight) = font_weight;
|
||||||
|
@ -16276,13 +16276,13 @@ _efl_canvas_textblock_efl_text_font_font_weight_set(Eo *obj EINA_UNUSED, Efl_Can
|
||||||
}
|
}
|
||||||
|
|
||||||
static Efl_Text_Font_Weight
|
static Efl_Text_Font_Weight
|
||||||
_efl_canvas_textblock_efl_text_font_font_weight_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
|
_efl_canvas_textblock_efl_text_font_properties_font_weight_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
|
||||||
{
|
{
|
||||||
return _FMT_INFO(font_weight);
|
return _FMT_INFO(font_weight);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_efl_canvas_textblock_efl_text_font_font_slant_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Font_Slant font_slant EINA_UNUSED)
|
_efl_canvas_textblock_efl_text_font_properties_font_slant_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Font_Slant font_slant EINA_UNUSED)
|
||||||
{
|
{
|
||||||
ASYNC_BLOCK;
|
ASYNC_BLOCK;
|
||||||
if (_FMT_INFO(font_slant) == font_slant) return;
|
if (_FMT_INFO(font_slant) == font_slant) return;
|
||||||
|
@ -16291,13 +16291,13 @@ _efl_canvas_textblock_efl_text_font_font_slant_set(Eo *obj EINA_UNUSED, Efl_Canv
|
||||||
}
|
}
|
||||||
|
|
||||||
static Efl_Text_Font_Slant
|
static Efl_Text_Font_Slant
|
||||||
_efl_canvas_textblock_efl_text_font_font_slant_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
|
_efl_canvas_textblock_efl_text_font_properties_font_slant_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
|
||||||
{
|
{
|
||||||
return _FMT_INFO(font_slant);
|
return _FMT_INFO(font_slant);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_efl_canvas_textblock_efl_text_font_font_width_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Font_Width font_width EINA_UNUSED)
|
_efl_canvas_textblock_efl_text_font_properties_font_width_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Font_Width font_width EINA_UNUSED)
|
||||||
{
|
{
|
||||||
ASYNC_BLOCK;
|
ASYNC_BLOCK;
|
||||||
if (_FMT_INFO(font_width) == font_width) return;
|
if (_FMT_INFO(font_width) == font_width) return;
|
||||||
|
@ -16306,13 +16306,13 @@ _efl_canvas_textblock_efl_text_font_font_width_set(Eo *obj EINA_UNUSED, Efl_Canv
|
||||||
}
|
}
|
||||||
|
|
||||||
static Efl_Text_Font_Width
|
static Efl_Text_Font_Width
|
||||||
_efl_canvas_textblock_efl_text_font_font_width_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
|
_efl_canvas_textblock_efl_text_font_properties_font_width_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
|
||||||
{
|
{
|
||||||
return _FMT_INFO(font_width);
|
return _FMT_INFO(font_width);
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static void
|
EOLIAN static void
|
||||||
_efl_canvas_textblock_efl_text_font_font_bitmap_scalable_set(Eo *obj, Efl_Canvas_Textblock_Data *o, Efl_Text_Font_Bitmap_Scalable bitmap_scalable)
|
_efl_canvas_textblock_efl_text_font_properties_font_bitmap_scalable_set(Eo *obj, Efl_Canvas_Textblock_Data *o, Efl_Text_Font_Bitmap_Scalable bitmap_scalable)
|
||||||
{
|
{
|
||||||
if (_FMT_INFO(bitmap_scalable) == bitmap_scalable) return;
|
if (_FMT_INFO(bitmap_scalable) == bitmap_scalable) return;
|
||||||
_FMT_INFO(bitmap_scalable) = bitmap_scalable;
|
_FMT_INFO(bitmap_scalable) = bitmap_scalable;
|
||||||
|
@ -16320,7 +16320,7 @@ _efl_canvas_textblock_efl_text_font_font_bitmap_scalable_set(Eo *obj, Efl_Canvas
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Efl_Text_Font_Bitmap_Scalable
|
EOLIAN static Efl_Text_Font_Bitmap_Scalable
|
||||||
_efl_canvas_textblock_efl_text_font_font_bitmap_scalable_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o)
|
_efl_canvas_textblock_efl_text_font_properties_font_bitmap_scalable_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o)
|
||||||
{
|
{
|
||||||
return _FMT_INFO(bitmap_scalable);
|
return _FMT_INFO(bitmap_scalable);
|
||||||
}
|
}
|
||||||
|
|
|
@ -293,6 +293,6 @@ static const Efl_Class_Description _evas_text_class_desc = {
|
||||||
NULL
|
NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
EFL_DEFINE_CLASS(evas_text_class_get, &_evas_text_class_desc, EFL_CANVAS_OBJECT_CLASS, EFL_TEXT_INTERFACE, EFL_TEXT_FONT_INTERFACE, EFL_CANVAS_FILTER_INTERNAL_MIXIN, NULL);
|
EFL_DEFINE_CLASS(evas_text_class_get, &_evas_text_class_desc, EFL_CANVAS_OBJECT_CLASS, EFL_TEXT_INTERFACE, EFL_TEXT_FONT_PROPERTIES_INTERFACE, EFL_CANVAS_FILTER_INTERNAL_MIXIN, NULL);
|
||||||
|
|
||||||
#include "evas_text_eo.legacy.c"
|
#include "evas_text_eo.legacy.c"
|
||||||
|
|
|
@ -23,7 +23,7 @@ extern "C" {
|
||||||
#include "efl_loop_consumer.eo.h"
|
#include "efl_loop_consumer.eo.h"
|
||||||
#include "efl_object.eo.h"
|
#include "efl_object.eo.h"
|
||||||
#include "efl_text.eo.h"
|
#include "efl_text.eo.h"
|
||||||
#include "efl_text_font.eo.h"
|
#include "efl_text_font_properties.eo.h"
|
||||||
#include "efl_ui_i18n.eo.h"
|
#include "efl_ui_i18n.eo.h"
|
||||||
#include "evas_text_eo.h"
|
#include "evas_text_eo.h"
|
||||||
}
|
}
|
||||||
|
@ -49,7 +49,7 @@ extern "C" {
|
||||||
#include "efl_loop_consumer.eo.hh"
|
#include "efl_loop_consumer.eo.hh"
|
||||||
#include "efl_object.eo.hh"
|
#include "efl_object.eo.hh"
|
||||||
#include "efl_text.eo.hh"
|
#include "efl_text.eo.hh"
|
||||||
#include "efl_text_font.eo.hh"
|
#include "efl_text_font_properties.eo.hh"
|
||||||
#include "efl_ui_i18n.eo.hh"
|
#include "efl_ui_i18n.eo.hh"
|
||||||
#ifndef EVAS_TEXT_FWD_GUARD
|
#ifndef EVAS_TEXT_FWD_GUARD
|
||||||
#define EVAS_TEXT_FWD_GUARD
|
#define EVAS_TEXT_FWD_GUARD
|
||||||
|
|
|
@ -122,6 +122,6 @@ static const Efl_Class_Description _evas_textgrid_class_desc = {
|
||||||
NULL
|
NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
EFL_DEFINE_CLASS(evas_textgrid_class_get, &_evas_textgrid_class_desc, EFL_CANVAS_OBJECT_CLASS, EFL_TEXT_FONT_INTERFACE, NULL);
|
EFL_DEFINE_CLASS(evas_textgrid_class_get, &_evas_textgrid_class_desc, EFL_CANVAS_OBJECT_CLASS, EFL_TEXT_FONT_PROPERTIES_INTERFACE, NULL);
|
||||||
|
|
||||||
#include "evas_textgrid_eo.legacy.c"
|
#include "evas_textgrid_eo.legacy.c"
|
||||||
|
|
|
@ -20,7 +20,7 @@ extern "C" {
|
||||||
#include "efl_loop.eo.h"
|
#include "efl_loop.eo.h"
|
||||||
#include "efl_loop_consumer.eo.h"
|
#include "efl_loop_consumer.eo.h"
|
||||||
#include "efl_object.eo.h"
|
#include "efl_object.eo.h"
|
||||||
#include "efl_text_font.eo.h"
|
#include "efl_text_font_properties.eo.h"
|
||||||
#include "efl_ui_i18n.eo.h"
|
#include "efl_ui_i18n.eo.h"
|
||||||
#include "evas_textgrid_eo.h"
|
#include "evas_textgrid_eo.h"
|
||||||
}
|
}
|
||||||
|
@ -43,7 +43,7 @@ extern "C" {
|
||||||
#include "efl_loop.eo.hh"
|
#include "efl_loop.eo.hh"
|
||||||
#include "efl_loop_consumer.eo.hh"
|
#include "efl_loop_consumer.eo.hh"
|
||||||
#include "efl_object.eo.hh"
|
#include "efl_object.eo.hh"
|
||||||
#include "efl_text_font.eo.hh"
|
#include "efl_text_font_properties.eo.hh"
|
||||||
#include "efl_ui_i18n.eo.hh"
|
#include "efl_ui_i18n.eo.hh"
|
||||||
#ifndef EVAS_TEXTGRID_FWD_GUARD
|
#ifndef EVAS_TEXTGRID_FWD_GUARD
|
||||||
#define EVAS_TEXTGRID_FWD_GUARD
|
#define EVAS_TEXTGRID_FWD_GUARD
|
||||||
|
|
Loading…
Reference in New Issue