evas: Remove Evas_Text_Style_Type from EO

It belongs to legacy only... Evas.Text is not part of EO.

Ref T5312
This commit is contained in:
Jean-Philippe Andre 2017-05-12 18:39:34 +09:00
parent 3df12eb690
commit 07263e881c
3 changed files with 54 additions and 43 deletions

View File

@ -4975,6 +4975,38 @@ EAPI void evas_object_text_text_set(Eo *obj, const char *text);
*/
EAPI const char *evas_object_text_text_get(const Eo *obj);
/**
* Types of styles to be applied on text objects. The
* EVAS_TEXT_STYLE_SHADOW_DIRECTION_* ones are to be OR'ed together with others
* imposing shadow, to change the shadow's direction.
*
* @see evas_object_text_style_set()
* @see evas_object_text_style_get()
*/
typedef enum
{
EVAS_TEXT_STYLE_PLAIN = 0, /**< plain, standard text */
EVAS_TEXT_STYLE_SHADOW, /**< text with shadow underneath */
EVAS_TEXT_STYLE_OUTLINE, /**< text with an outline */
EVAS_TEXT_STYLE_SOFT_OUTLINE, /**< text with a soft outline */
EVAS_TEXT_STYLE_GLOW, /**< text with a glow effect */
EVAS_TEXT_STYLE_OUTLINE_SHADOW, /**< text with both outline and shadow effects */
EVAS_TEXT_STYLE_FAR_SHADOW, /**< text with (far) shadow underneath */
EVAS_TEXT_STYLE_OUTLINE_SOFT_SHADOW, /**< text with outline and soft shadow effects combined */
EVAS_TEXT_STYLE_SOFT_SHADOW, /**< text with (soft) shadow underneath */
EVAS_TEXT_STYLE_FAR_SOFT_SHADOW, /**< text with (far soft) shadow underneath */
// Shadow direction modifiers
EVAS_TEXT_STYLE_SHADOW_DIRECTION_BOTTOM_RIGHT = 0 /* 0 >> 4 */, /**< shadow growing to bottom right */
EVAS_TEXT_STYLE_SHADOW_DIRECTION_BOTTOM = 16 /* 1 >> 4 */, /**< shadow growing to the bottom */
EVAS_TEXT_STYLE_SHADOW_DIRECTION_BOTTOM_LEFT = 32 /* 2 >> 4 */, /**< shadow growing to bottom left */
EVAS_TEXT_STYLE_SHADOW_DIRECTION_LEFT = 48 /* 3 >> 4 */, /**< shadow growing to the left */
EVAS_TEXT_STYLE_SHADOW_DIRECTION_TOP_LEFT = 64 /* 4 >> 4 */, /**< shadow growing to top left */
EVAS_TEXT_STYLE_SHADOW_DIRECTION_TOP = 80 /* 5 >> 4 */, /**< shadow growing to the top */
EVAS_TEXT_STYLE_SHADOW_DIRECTION_TOP_RIGHT = 96 /* 6 >> 4 */, /**< shadow growing to top right */
EVAS_TEXT_STYLE_SHADOW_DIRECTION_RIGHT = 112 /* 7 >> 4 */ /**< shadow growing to the right */
} Evas_Text_Style_Type;
#include "canvas/evas_text.eo.legacy.h"
/**

View File

@ -1,3 +1,5 @@
type @extern Evas.Text_Style_Type : __undefined_type;
class Evas.Text (Efl.Canvas.Object, Efl.Text, Efl.Text.Properties, Efl.Canvas.Filter.Internal)
{
[[Evas text class]]
@ -11,12 +13,12 @@ class Evas.Text (Efl.Canvas.Object, Efl.Text, Efl.Text.Properties, Efl.Canvas.Fi
underneath it, will just be shown if the object is set to one of
the following styles:
- @Evas.Text_Style_Type.shadow
- @Evas.Text_Style_Type.outline_shadow
- @Evas.Text_Style_Type.far_shadow
- @Evas.Text_Style_Type.outline_soft_shadow
- @Evas.Text_Style_Type.soft_shadow
- @Evas.Text_Style_Type.far_soft_shadow
- $EVAS_TEXT_STYLE_TYPE_SHADOW
- $EVAS_TEXT_STYLE_TYPE_OUTLINE_SHADOW
- $EVAS_TEXT_STYLE_TYPE_FAR_SHADOW
- $EVAS_TEXT_STYLE_TYPE_OUTLINE_SOFT_SHADOW
- $EVAS_TEXT_STYLE_TYPE_SOFT_SHADOW
- $EVAS_TEXT_STYLE_TYPE_FAR_SOFT_SHADOW
One can also change the direction where the shadow grows to, with
@.style
@ -75,10 +77,11 @@ class Evas.Text (Efl.Canvas.Object, Efl.Text, Efl.Text.Properties, Efl.Canvas.Fi
Outline effects (colored lines around text glyphs) will just be
shown if the object is set to one of the following styles:
- @Evas.Text_Style_Type.outline
- @Evas.Text_Style_Type.soft_outline
- @Evas.Text_Style_Type.outline_shadow
- @Evas.Text_Style_Type.outline_soft_shadow]]
- $EVAS_TEXT_STYLE_TYPE_OUTLINE
- $EVAS_TEXT_STYLE_TYPE_SOFT_OUTLINE
- $EVAS_TEXT_STYLE_TYPE_OUTLINE_SHADOW
- $EVAS_TEXT_STYLE_TYPE_OUTLINE_SOFT_SHADOW
]]
set {
}
get {
@ -95,8 +98,8 @@ class Evas.Text (Efl.Canvas.Object, Efl.Text, Efl.Text.Properties, Efl.Canvas.Fi
'Glow 2' effects, which are glowing colors decorating the text's
(immediate) surroundings, will just be shown if the object is set
to the @Evas.Text_Style_Type.glow style. See also
@.glow_color.]]
to the $EVAS_TEXT_STYLE_TYPE_GLOW style. See also @.glow_color.
]]
set {
}
get {
@ -143,7 +146,7 @@ class Evas.Text (Efl.Canvas.Object, Efl.Text, Efl.Text.Properties, Efl.Canvas.Fi
Glow effects, which are glowing colors decorating the text's
surroundings, will just be shown if the object is set to the
@Evas.Text_Style_Type.glow style.
$EVAS_TEXT_STYLE_TYPE_GLOW style.
Note: Glow effects are placed from a short distance of the text
itself, but not touching it. For glowing effects right on the
@ -221,7 +224,12 @@ class Evas.Text (Efl.Canvas.Object, Efl.Text, Efl.Text.Properties, Efl.Canvas.Fi
}
}
last_up_to_pos @const {
[[Returns the logical position of the last char in the text up to the pos given. This is NOT the position of the last char because of the possibility of RTL in the text.]]
[[Returns the logical position of the last char in the text up to
the pos given.
This is NOT the position of the last char because of the possibility
of RTL in the text.
]]
return: int(-1); [[Logical position of the last char]]
params {
@in x: Evas.Coord; [[X coordinate]]

View File

@ -4,35 +4,6 @@ struct @extern Evas.Video_Surface; [[Evas video surface data structure]] /* FIX
type Evas.Modifier_Mask: ullong; [[An Evas modifier mask type]]
type Evas.Coord: int; [[A type for coordinates]]
enum Evas.Text_Style_Type {
[[Types of styles to be applied on text objects. The
EVAS_TEXT_STYLE_SHADOW_DIRECTION_* ones are to be ORed together with
others imposing shadow, to change shadow's direction
]]
legacy: Evas_Text_Style;
plain, [[plain, standard text]]
shadow, [[text with shadow underneath]]
outline, [[text with an outline]]
soft_outline, [[text with a soft outline]]
glow, [[text with a glow effect]]
outline_shadow, [[text with both outline and shadow effects]]
far_shadow, [[text with (far) shadow underneath]]
outline_soft_shadow, [[text with outline and soft shadow effects combined]]
soft_shadow, [[text with (soft) shadow underneath]]
far_soft_shadow, [[text with (far soft) shadow underneath]]
/* OR these to modify shadow direction (3 bits needed) */
shadow_direction_bottom_right = (0x0 << 4), [[shadow growing to bottom right]]
shadow_direction_bottom = (0x1 << 4), [[shadow growing to the bottom]]
shadow_direction_bottom_left = (0x2 << 4), [[shadow growing to bottom left]]
shadow_direction_left = (0x3 << 4), [[shadow growing to the left]]
shadow_direction_top_left = (0x4 << 4), [[shadow growing to top left]]
shadow_direction_top = (0x5 << 4), [[shadow growing to the top]]
shadow_direction_top_right = (0x6 << 4), [[shadow growing to top right]]
shadow_direction_right = (0x7 << 4) [[shadow growing to the right]]
}
enum Evas.Font.Hinting_Flags {
[[Flags for Font Hinting]]
legacy: Evas_Font_Hinting;