discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=f85325d924d93e84ffee08b7bffd39d33347998f
commit f85325d924d93e84ffee08b7bffd39d33347998f
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date: Mon Feb 12 16:02:06 2018 -0500
interfaces: remove Efl.Text.Properties
this is provided in Efl.Text.Font
---
src/Makefile_Efl.am | 1 -
src/Makefile_Efl_Mono.am | 2 -
src/bin/elementary/test_gfx_filters.c | 6 +--
src/lib/edje/edje_text.c | 40 +++++++++---------
src/lib/efl/CMakeLists.txt | 1 -
src/lib/efl/Efl.h | 1 -
src/lib/efl/interfaces/efl_interfaces_main.c | 1 -
src/lib/efl/interfaces/efl_text_font.eo | 2 +-
src/lib/efl/interfaces/efl_text_properties.eo | 60 ---------------------------
src/lib/evas/canvas/efl_canvas_text.eo | 2 +-
src/lib/evas/canvas/evas_object_text.c | 20 ++++-----
src/lib/evas/canvas/evas_object_textgrid.c | 20 ++++-----
src/lib/evas/canvas/evas_text.eo | 6 +--
src/lib/evas/canvas/evas_textgrid.eo | 8 ++--
14 files changed, 52 insertions(+), 118 deletions(-)
diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
index 6ba5189534..e26d52cb6a 100644
--- a/src/Makefile_Efl.am
+++ b/src/Makefile_Efl.am
@@ -34,7 +34,6 @@ efl_eolian_files = \
lib/efl/interfaces/efl_text_annotate.eo \
lib/efl/interfaces/efl_text_markup.eo \
lib/efl/interfaces/efl_text_markup_util.eo \
- lib/efl/interfaces/efl_text_properties.eo \
lib/efl/interfaces/efl_gfx_stack.eo \
lib/efl/interfaces/efl_gfx_view.eo \
lib/efl/interfaces/efl_gfx_buffer.eo \
diff --git a/src/Makefile_Efl_Mono.am b/src/Makefile_Efl_Mono.am
index ac7c68604f..de3b331e62 100644
--- a/src/Makefile_Efl_Mono.am
+++ b/src/Makefile_Efl_Mono.am
@@ -131,7 +131,6 @@ lib/efl/interfaces/efl_io_queue.eo.cs \
lib/efl/interfaces/efl_io_reader.eo.cs \
lib/efl/interfaces/efl_io_sizer.eo.cs \
lib/efl/interfaces/efl_io_writer.eo.cs \
-lib/efl/interfaces/efl_text_properties.eo.cs \
lib/efl/interfaces/efl_gfx_buffer.eo.cs \
lib/efl/interfaces/efl_gfx_shape.eo.cs \
lib/efl/interfaces/efl_gfx_gradient.eo.cs \
@@ -189,7 +188,6 @@ lib/evas/canvas/evas_image.eo.cs \
lib/evas/canvas/efl_canvas_image.eo.cs \
lib/evas/canvas/evas_table.eo.cs \
lib/evas/canvas/evas_text.eo.cs \
-lib/efl/interfaces/efl_text_properties.eo.cs \
$(evas_canvas_eolian_type_files:%.eot=%.eot.cs) \
lib/eo/eina_types.eot.cs
diff --git a/src/bin/elementary/test_gfx_filters.c
b/src/bin/elementary/test_gfx_filters.c
index 958688f308..f9b6b9b80d 100644
--- a/src/bin/elementary/test_gfx_filters.c
+++ b/src/bin/elementary/test_gfx_filters.c
@@ -296,8 +296,8 @@ _font_size_change(void *data, const Efl_Event *ev)
const char *font;
text = efl_key_wref_get(win, "text");
- efl_text_properties_font_get(text, &font, NULL);
- efl_text_properties_font_set(text, font, elm_spinner_value_get(ev->object));
+ efl_text_font_get(text, &font, NULL);
+ efl_text_font_set(text, font, elm_spinner_value_get(ev->object));
}
static void
@@ -460,7 +460,7 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *eve
// Note: No TEXT object with EO APIs
o = text = evas_object_text_add(evas_object_evas_get(win));
efl_event_callback_add(o, EFL_GFX_EVENT_RESIZE, _text_resize, NULL);
- efl_text_properties_font_set(o, "Sans:style=Bold", default_font_size);
+ efl_text_font_set(o, "Sans:style=Bold", default_font_size);
efl_gfx_scale_set(text, elm_config_scale_get());
efl_text_set(o, "EFL");
efl_gfx_visible_set(o, 1);
diff --git a/src/lib/edje/edje_text.c b/src/lib/edje/edje_text.c
index 8f88f490e0..176c20df1b 100644
--- a/src/lib/edje/edje_text.c
+++ b/src/lib/edje/edje_text.c
@@ -141,7 +141,7 @@ _edje_text_fit_x(Edje *ed, Edje_Real_Part *ep,
if (ep->part->scale) evas_object_scale_set(ep->object, TO_DOUBLE(sc));
evas_obj_text_ellipsis_set(ep->object, params->type.text->ellipsis);
- efl_text_properties_font_set(ep->object, font, size);
+ efl_text_font_set(ep->object, font, size);
efl_text_set(ep->object, text);
efl_gfx_size_set(ep->object, EINA_SIZE2D(sw, sh));
@@ -333,8 +333,8 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
ep->typedata.text->cache.in_size = size;
if (chosen_desc->text.fit_x && (ep->typedata.text->cache.in_str &&
eina_stringshare_strlen(ep->typedata.text->cache.in_str) > 0))
{
- if (inlined_font) efl_text_properties_font_source_set(ep->object,
ed->path);
- else efl_text_properties_font_source_set(ep->object, NULL);
+ if (inlined_font) efl_text_font_source_set(ep->object, ed->path);
+ else efl_text_font_source_set(ep->object, NULL);
if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc));
@@ -342,16 +342,16 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
/* the fit shoult not depend on font size, because it give the differet
* size calculation. As base font size for calculate fit size I take
* 10 (ten), because this value used for calculate fit by Y below */
- efl_text_properties_font_set(ep->object, font, 10);
+ efl_text_font_set(ep->object, font, 10);
part_get_geometry(ep, &tw, &th);
size = (10 * sw) / tw;
- efl_text_properties_font_set(ep->object, font, size);
+ efl_text_font_set(ep->object, font, size);
part_get_geometry(ep, &tw, &th);
while ((tw > sw) && (size > 1))
{
size--;
- efl_text_properties_font_set(ep->object, font, size);
+ efl_text_font_set(ep->object, font, size);
part_get_geometry(ep, &tw, &th);
}
}
@@ -363,12 +363,12 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
*/
if (!chosen_desc->text.fit_x) size = sh;
- if (inlined_font) efl_text_properties_font_source_set(ep->object,
ed->path);
- else efl_text_properties_font_source_set(ep->object, NULL);
+ if (inlined_font) efl_text_font_source_set(ep->object, ed->path);
+ else efl_text_font_source_set(ep->object, NULL);
if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc));
- efl_text_properties_font_set(ep->object, font, size);
+ efl_text_font_set(ep->object, font, size);
efl_text_set(ep->object, text);
part_get_geometry(ep, &tw, &th);
@@ -386,11 +386,11 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
size += dif;
if (size <= 0) break;
- if (inlined_font)
efl_text_properties_font_source_set(ep->object, ed->path);
- else efl_text_properties_font_source_set(ep->object, NULL);
+ if (inlined_font) efl_text_font_source_set(ep->object,
ed->path);
+ else efl_text_font_source_set(ep->object, NULL);
if (ep->part->scale) efl_gfx_scale_set(ep->object,
TO_DOUBLE(sc));
- efl_text_properties_font_set(ep->object, font, size);
+ efl_text_font_set(ep->object, font, size);
part_get_geometry(ep, &tw, &th);
if ((size > 0) && (th == 0)) break;
@@ -402,7 +402,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
int current;
if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc));
- efl_text_properties_font_set(ep->object, font, 10);
+ efl_text_font_set(ep->object, font, 10);
part_get_geometry(ep, &tw, &th);
@@ -424,7 +424,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
current = (top + bottom) / 2;
if (ep->part->scale) efl_gfx_scale_set(ep->object,
TO_DOUBLE(sc));
- efl_text_properties_font_set(ep->object, font, current);
+ efl_text_font_set(ep->object, font, current);
part_get_geometry(ep, &tw, &th);
@@ -440,7 +440,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
current++;
if (ep->part->scale) efl_gfx_scale_set(ep->object,
TO_DOUBLE(sc));
- efl_text_properties_font_set(ep->object, font, current);
+ efl_text_font_set(ep->object, font, current);
part_get_geometry(ep, &tw, &th);
} while (th <= sh);
@@ -460,8 +460,8 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
/* Handle ellipsis */
if (!chosen_desc->text.min_x)
{
- if (inlined_font) efl_text_properties_font_source_set(ep->object,
ed->path);
- else efl_text_properties_font_source_set(ep->object, NULL);
+ if (inlined_font) efl_text_font_source_set(ep->object, ed->path);
+ else efl_text_font_source_set(ep->object, NULL);
text = _edje_text_fit_x(ed, ep, params, chosen_desc,
text, font, size,
@@ -485,12 +485,12 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
ep->typedata.text->cache.fit_y = chosen_desc->text.fit_y;
arrange_text:
- if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path);
- else efl_text_properties_font_source_set(ep->object, NULL);
+ if (inlined_font) efl_text_font_source_set(ep->object, ed->path);
+ else efl_text_font_source_set(ep->object, NULL);
if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc));
- efl_text_properties_font_set(ep->object, font, size);
+ efl_text_font_set(ep->object, font, size);
efl_text_set(ep->object, text);
part_get_geometry(ep, &tw, &th);
diff --git a/src/lib/efl/CMakeLists.txt b/src/lib/efl/CMakeLists.txt
index dde72d7039..909cea5b5b 100644
--- a/src/lib/efl/CMakeLists.txt
+++ b/src/lib/efl/CMakeLists.txt
@@ -48,7 +48,6 @@ set(PUBLIC_EO_FILES
interfaces/efl_player.eo
interfaces/efl_screen.eo
interfaces/efl_text.eo
- interfaces/efl_text_properties.eo
interfaces/efl_text_types.eot
interfaces/efl_types.eot
interfaces/efl_ui_item.eo
diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h
index 5f47825b0c..cf3f17305d 100644
--- a/src/lib/efl/Efl.h
+++ b/src/lib/efl/Efl.h
@@ -86,7 +86,6 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
#include "interfaces/efl_player.eo.h"
#include "interfaces/efl_text.eo.h"
#include "interfaces/efl_text_types.eot.h"
-#include "interfaces/efl_text_properties.eo.h"
#include "interfaces/efl_orientation.eo.h"
#include "interfaces/efl_ui_base.eo.h"
#include "interfaces/efl_ui_direction.eo.h"
diff --git a/src/lib/efl/interfaces/efl_interfaces_main.c
b/src/lib/efl/interfaces/efl_interfaces_main.c
index 1419f747b3..8934b2ecde 100644
--- a/src/lib/efl/interfaces/efl_interfaces_main.c
+++ b/src/lib/efl/interfaces/efl_interfaces_main.c
@@ -18,7 +18,6 @@
#include "interfaces/efl_playable.eo.c"
#include "interfaces/efl_player.eo.c"
#include "interfaces/efl_text.eo.c"
-#include "interfaces/efl_text_properties.eo.c"
#include "interfaces/efl_text_font.eo.c"
#include "interfaces/efl_text_style.eo.c"
#include "interfaces/efl_text_format.eo.c"
diff --git a/src/lib/efl/interfaces/efl_text_font.eo
b/src/lib/efl/interfaces/efl_text_font.eo
index 8a27829541..4daf73aef2 100644
--- a/src/lib/efl/interfaces/efl_text_font.eo
+++ b/src/lib/efl/interfaces/efl_text_font.eo
@@ -1,5 +1,5 @@
// src/lib/efl/interfaces/efl_text_font.eo
-
+import efl_gfx_types;
enum Efl.Text.Font.Weight {
[[Type of font weight]]
normal, [[Normal font weight]]
diff --git a/src/lib/efl/interfaces/efl_text_properties.eo
b/src/lib/efl/interfaces/efl_text_properties.eo
deleted file mode 100644
index 8552fae4dd..0000000000
--- a/src/lib/efl/interfaces/efl_text_properties.eo
+++ /dev/null
@@ -1,60 +0,0 @@
-import efl_gfx_types;
-
-interface Efl.Text.Properties
-{
- [[Efl text properties interface]]
- methods {
- @property font {
- set {
- [[Set the font family, filename and size for a given text object.
-
- This function allows the font name and size of a text object to
- be set. The font string has to follow fontconfig's convention for
- naming fonts, as it's the underlying library used to query system
- fonts by Evas (see the fc-list command's output, on your system,
- to get an idea). Alternatively, youe can use the full path to a
font
- file.
-
- See also @.font.get, @.font_source.get.
- ]]
- }
- get {
- [[Retrieve the font family and size in use on a given text object.
-
- This function allows the font name and size of a text object to
- be queried. Remember that the font name string is still owned by
- Evas and should not have free() called on it by the caller of the
- function.
-
- See also @.font.set.
- ]]
- }
- values {
- font: string; [[The font family name or filename.]]
- size: Efl.Font.Size; [[The font size, in points.]]
- }
- }
- @property font_source {
- set {
- [[Set the font (source) file to be used on a given text object.
-
- This function allows the font file to be explicitly set for a
- given text object, overriding system lookup, which will first
- occur in the given file's contents.
-
- See also @.font.set.
- ]]
- }
- get {
- [[Get the font file's path which is being used on a given text
- object.
-
- See @.font.get for more details.
- ]]
- }
- values {
- font_source: string; [[The font file's path.]]
- }
- }
- }
-}
diff --git a/src/lib/evas/canvas/efl_canvas_text.eo
b/src/lib/evas/canvas/efl_canvas_text.eo
index 73367b0f58..87eac29e73 100644
--- a/src/lib/evas/canvas/efl_canvas_text.eo
+++ b/src/lib/evas/canvas/efl_canvas_text.eo
@@ -2,7 +2,7 @@ import efl_text_types;
struct Efl.Canvas.Text.Style; [[EFL text style data structure]]
-class Efl.Canvas.Text (Efl.Canvas.Object, Efl.Text, Efl.Text.Properties,
+class Efl.Canvas.Text (Efl.Canvas.Object, Efl.Text,
Efl.Canvas.Filter.Internal, Efl.Text.Font,
Efl.Text.Style, Efl.Text.Format, Efl.Text.Cursor,
Efl.Text.Annotate, Efl.Text.Markup, Efl.Ui.Base)
diff --git a/src/lib/evas/canvas/evas_object_text.c
b/src/lib/evas/canvas/evas_object_text.c
index 5145be615d..b9fc13cf9f 100644
--- a/src/lib/evas/canvas/evas_object_text.c
+++ b/src/lib/evas/canvas/evas_object_text.c
@@ -392,7 +392,7 @@ _evas_text_efl_object_constructor(Eo *eo_obj,
Evas_Text_Data *o EINA_UNUSED)
}
EOLIAN static void
-_evas_text_efl_text_properties_font_source_set(Eo *eo_obj, Evas_Text_Data *o,
const char *font_source)
+_evas_text_efl_text_font_font_source_set(Eo *eo_obj, Evas_Text_Data *o, const
char *font_source)
{
Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj,
EFL_CANVAS_OBJECT_CLASS);
if (((o->cur.source) && (font_source) &&
@@ -409,7 +409,7 @@ _evas_text_efl_text_properties_font_source_set(Eo *eo_obj,
Evas_Text_Data *o, co
}
EOLIAN static const char*
-_evas_text_efl_text_properties_font_source_get(Eo *eo_obj EINA_UNUSED,
Evas_Text_Data *o)
+_evas_text_efl_text_font_font_source_get(Eo *eo_obj EINA_UNUSED,
Evas_Text_Data *o)
{
return o->cur.source;
}
@@ -465,7 +465,7 @@ _evas_text_font_reload(Eo *eo_obj, Evas_Text_Data *o)
}
EOLIAN static void
-_evas_text_efl_text_properties_font_set(Eo *eo_obj, Evas_Text_Data *o, const
char *font, Evas_Font_Size size)
+_evas_text_efl_text_font_font_set(Eo *eo_obj, Evas_Text_Data *o, const char
*font, Evas_Font_Size size)
{
Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj,
EFL_CANVAS_OBJECT_CLASS);
Evas_Font_Description *fdesc;
@@ -503,7 +503,7 @@ _evas_text_efl_text_properties_font_set(Eo *eo_obj,
Evas_Text_Data *o, const cha
}
EOLIAN static void
-_evas_text_efl_text_properties_font_get(Eo *eo_obj EINA_UNUSED, Evas_Text_Data
*o, const char **font, Evas_Font_Size *size)
+_evas_text_efl_text_font_font_get(Eo *eo_obj EINA_UNUSED, Evas_Text_Data *o,
const char **font, Evas_Font_Size *size)
{
if (font) *font = o->cur.font;
if (size) *size = o->cur.size;
@@ -1054,11 +1054,11 @@ _evas_text_efl_object_dbg_info_get(Eo *eo_obj,
Evas_Text_Data *o EINA_UNUSED, Ef
const char *text;
int size;
- efl_text_properties_font_get(eo_obj, &text, &size);
+ efl_text_font_get(eo_obj, &text, &size);
EFL_DBG_INFO_APPEND(group, "Font", EINA_VALUE_TYPE_STRING, text);
EFL_DBG_INFO_APPEND(group, "Text size", EINA_VALUE_TYPE_INT, size);
- text = efl_text_properties_font_source_get(eo_obj);
+ text = efl_text_font_source_get(eo_obj);
EFL_DBG_INFO_APPEND(group, "Font source", EINA_VALUE_TYPE_STRING, text);
text = efl_text_get(eo_obj);
@@ -2348,27 +2348,27 @@ _evas_object_text_recalc(Evas_Object *eo_obj,
Eina_Unicode *text)
EAPI void
evas_object_text_font_source_set(Eo *obj, const char *font_source)
{
- efl_text_properties_font_source_set((Eo *) obj, font_source);
+ efl_text_font_source_set((Eo *) obj, font_source);
}
EAPI const char *
evas_object_text_font_source_get(const Eo *obj)
{
const char *font_source = 0;
- font_source = efl_text_properties_font_source_get((Eo *) obj);
+ font_source = efl_text_font_source_get((Eo *) obj);
return font_source;
}
EAPI void
evas_object_text_font_set(Eo *obj, const char *font, Evas_Font_Size size)
{
- efl_text_properties_font_set((Eo *) obj, font, size);
+ efl_text_font_set((Eo *) obj, font, size);
}
EAPI void
evas_object_text_font_get(const Eo *obj, const char **font, Evas_Font_Size
*size)
{
- efl_text_properties_font_get((Eo *) obj, font, size);
+ efl_text_font_get((Eo *) obj, font, size);
}
EAPI void
diff --git a/src/lib/evas/canvas/evas_object_textgrid.c
b/src/lib/evas/canvas/evas_object_textgrid.c
index 2402170a6c..e0ea4c93ea 100644
--- a/src/lib/evas/canvas/evas_object_textgrid.c
+++ b/src/lib/evas/canvas/evas_object_textgrid.c
@@ -966,7 +966,7 @@ _evas_textgrid_size_get(Eo *eo_obj EINA_UNUSED,
Evas_Textgrid_Data *o, int *w, i
}
EOLIAN static void
-_evas_textgrid_efl_text_properties_font_source_set(Eo *eo_obj,
Evas_Textgrid_Data *o, const char *font_source)
+_evas_textgrid_efl_text_font_font_source_set(Eo *eo_obj, Evas_Textgrid_Data
*o, const char *font_source)
{
Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj,
EFL_CANVAS_OBJECT_CLASS);
@@ -984,7 +984,7 @@ _evas_textgrid_efl_text_properties_font_source_set(Eo
*eo_obj, Evas_Textgrid_Dat
}
EOLIAN static const char*
-_evas_textgrid_efl_text_properties_font_source_get(Eo *eo_obj EINA_UNUSED,
Evas_Textgrid_Data *o)
+_evas_textgrid_efl_text_font_font_source_get(Eo *eo_obj EINA_UNUSED,
Evas_Textgrid_Data *o)
{
return o->cur.font_source;
}
@@ -1221,7 +1221,7 @@ _evas_textgrid_font_reload(Eo *eo_obj, Evas_Textgrid_Data
*o)
}
EOLIAN static void
-_evas_textgrid_efl_text_properties_font_set(Eo *eo_obj,
+_evas_textgrid_efl_text_font_font_set(Eo *eo_obj,
Evas_Textgrid_Data *o,
const char *font_name,
Evas_Font_Size font_size)
@@ -1258,7 +1258,7 @@ _evas_textgrid_efl_text_properties_font_set(Eo *eo_obj,
}
EOLIAN static void
-_evas_textgrid_efl_text_properties_font_get(Eo *eo_obj EINA_UNUSED,
Evas_Textgrid_Data *o, const char **font_name, Evas_Font_Size *font_size)
+_evas_textgrid_efl_text_font_font_get(Eo *eo_obj EINA_UNUSED,
Evas_Textgrid_Data *o, const char **font_name, Evas_Font_Size *font_size)
{
if (font_name) *font_name = o->cur.font_name;
if (font_size) *font_size = o->cur.font_size;
@@ -1471,11 +1471,11 @@ _evas_textgrid_efl_object_dbg_info_get(Eo *eo_obj,
Evas_Textgrid_Data *o EINA_UN
const char *text;
int size;
- efl_text_properties_font_get(eo_obj, &text, &size);
+ efl_text_font_get(eo_obj, &text, &size);
EFL_DBG_INFO_APPEND(group, "Font", EINA_VALUE_TYPE_STRING, text);
EFL_DBG_INFO_APPEND(group, "Text size", EINA_VALUE_TYPE_INT, size);
- text = efl_text_properties_font_source_get(eo_obj);
+ text = efl_text_font_source_get(eo_obj);
EFL_DBG_INFO_APPEND(group, "Font source", EINA_VALUE_TYPE_STRING, text);
{
@@ -1490,27 +1490,27 @@ _evas_textgrid_efl_object_dbg_info_get(Eo *eo_obj,
Evas_Textgrid_Data *o EINA_UN
EAPI void
evas_object_textgrid_font_source_set(Eo *obj, const char *font_source)
{
- efl_text_properties_font_source_set((Eo *) obj, font_source);
+ efl_text_font_source_set((Eo *) obj, font_source);
}
EAPI const char *
evas_object_textgrid_font_source_get(const Eo *obj)
{
const char *font_source = NULL;
- font_source = efl_text_properties_font_source_get((Eo *) obj);
+ font_source = efl_text_font_source_get((Eo *) obj);
return font_source;
}
EAPI void
evas_object_textgrid_font_set(Eo *obj, const char *font_name, Evas_Font_Size
font_size)
{
- efl_text_properties_font_set((Eo *) obj, font_name, font_size);
+ efl_text_font_set((Eo *) obj, font_name, font_size);
}
EAPI void
evas_object_textgrid_font_get(const Eo *obj, const char **font_name,
Evas_Font_Size *font_size)
{
- efl_text_properties_font_get((Eo *) obj, font_name, font_size);
+ efl_text_font_get((Eo *) obj, font_name, font_size);
}
EOLIAN static void
diff --git a/src/lib/evas/canvas/evas_text.eo b/src/lib/evas/canvas/evas_text.eo
index 91e952da5a..b310c187d9 100644
--- a/src/lib/evas/canvas/evas_text.eo
+++ b/src/lib/evas/canvas/evas_text.eo
@@ -1,6 +1,6 @@
type @extern Evas.Text_Style_Type : __undefined_type; [[External text style
type]]
-class Evas.Text (Efl.Canvas.Object, Efl.Text, Efl.Text.Properties,
+class Evas.Text (Efl.Canvas.Object, Efl.Text,
Efl.Text.Font, Efl.Canvas.Filter.Internal, Efl.Ui.Base)
{
[[Evas text class]]
@@ -274,8 +274,8 @@ class Evas.Text (Efl.Canvas.Object, Efl.Text,
Efl.Text.Properties,
Efl.Gfx.size { set; }
Efl.Gfx.scale { set; }
Efl.Text.text { get; set; }
- Efl.Text.Properties.font { get; set; }
- Efl.Text.Properties.font_source { get; set; }
+ Efl.Text.Font.font { get; set; }
+ Efl.Text.Font.font_source { get; set; }
Efl.Text.Font.font_bitmap_scalable { get; set; }
Efl.Gfx.Filter.filter_program { set; }
Efl.Canvas.Filter.Internal.filter_dirty;
diff --git a/src/lib/evas/canvas/evas_textgrid.eo
b/src/lib/evas/canvas/evas_textgrid.eo
index 51b4583ea4..0543a6eb9c 100644
--- a/src/lib/evas/canvas/evas_textgrid.eo
+++ b/src/lib/evas/canvas/evas_textgrid.eo
@@ -20,7 +20,7 @@ enum Evas.Textgrid.Font_Style {
/* XXX: Actual definition is in C. */
struct Evas.Textgrid.Cell; [[Evas textgrid cell data structure]]
-class Evas.Textgrid (Efl.Canvas.Object, Efl.Text.Properties, Efl.Text.Font,
+class Evas.Textgrid (Efl.Canvas.Object, Efl.Text.Font,
Efl.Ui.Base)
{
[[Evas textgrid class]]
@@ -75,7 +75,7 @@ class Evas.Textgrid (Efl.Canvas.Object, Efl.Text.Properties,
Efl.Text.Font,
$width and $height can be $null. On error, they are
set to 0.
- See also @Efl.Text.Properties.font.set and
@.supported_font_styles.set
+ See also @Efl.Text.Font.font.set and @.supported_font_styles.set
@since 1.7]]
}
@@ -199,8 +199,8 @@ class Evas.Textgrid (Efl.Canvas.Object,
Efl.Text.Properties, Efl.Text.Font,
implements {
Efl.Object.constructor;
Efl.Object.destructor;
- Efl.Text.Properties.font { get; set; }
- Efl.Text.Properties.font_source { get; set; }
+ Efl.Text.Font.font { get; set; }
+ Efl.Text.Font.font_source { get; set; }
Efl.Text.Font.font_bitmap_scalable { get; set; }
Efl.Gfx.scale { set; }
}
--
