summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Hirt <daniel.hirt@samsung.com>2016-04-27 10:22:22 +0300
committerDaniel Hirt <daniel.hirt@samsung.com>2016-05-16 11:17:55 +0300
commitc3684c248d627627b3699c0f23804518f78e710b (patch)
tree0b8eefbf90e0970ef19d3d94555fbad3c3f7c27e
parent4e003cfc25848d23aac6c16fc779742aeb679ac8 (diff)
downloadefl-c3684c248d627627b3699c0f23804518f78e710b.tar.gz
Evas textblock: port cursor_pen_geometry_get to eo
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c15
-rw-r--r--src/lib/evas/canvas/evas_textblock.eo11
2 files changed, 23 insertions, 3 deletions
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index 51769dc794..1f6e4300d8 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -10942,13 +10942,22 @@ _evas_textblock_cursor_char_geometry_get(Eo *eo_obj,
}
EAPI int
-evas_textblock_cursor_pen_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch)
+evas_textblock_cursor_pen_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cpen_x, Evas_Coord *cy, Evas_Coord *cadv, Evas_Coord *ch)
{
if (!cur) return -1;
- Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJECT_CLASS);
+ return evas_obj_textblock_cursor_pen_geometry_get(cur->obj, cur, cpen_x, cy, cadv, ch);
+}
+
+EOLIAN static int
+_evas_textblock_cursor_pen_geometry_get(Eo *eo_obj,
+ Evas_Textblock_Data *o EINA_UNUSED, const Evas_Textblock_Cursor *cur,
+ Evas_Coord *cpen_x, Evas_Coord *cy, Evas_Coord *cadv, Evas_Coord *ch)
+{
+ if (!cur) return -1;
+ Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
evas_object_async_block(obj);
return _evas_textblock_cursor_char_pen_geometry_common_get(
- ENFN->font_pen_coords_get, cur, cx, cy, cw, ch);
+ ENFN->font_pen_coords_get, cur, cpen_x, cy, cadv, ch);
}
EAPI int
diff --git a/src/lib/evas/canvas/evas_textblock.eo b/src/lib/evas/canvas/evas_textblock.eo
index 840b7a656c..8c2f5739db 100644
--- a/src/lib/evas/canvas/evas_textblock.eo
+++ b/src/lib/evas/canvas/evas_textblock.eo
@@ -543,6 +543,17 @@ class Evas.Textblock (Evas.Object)
@out ch: int; [[the h of the char.]]
}
}
+ cursor_pen_geometry_get {
+ [[Returns the geometry of the pen at cur.]]
+ return: int; [[line number on success, -1 otherwise.]]
+ params {
+ @in cur: const(Evas.Textblock.Cursor) *; [[the position of the char.]]
+ @out cpen_x: int; [[the x of the char.]]
+ @out cy: int; [[the y of the char.]]
+ @out cadv: int; [[the w of the char.]]
+ @out ch: int; [[the h of the char.]]
+ }
+ }
style_user_peek @const {
[[Get (don't remove) the style at the top of the user style stack.