summaryrefslogtreecommitdiff
path: root/src/lib/evas/canvas/evas_object_textblock.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/evas/canvas/evas_object_textblock.c')
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c29
1 files changed, 14 insertions, 15 deletions
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index 5a46004..8066f08 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -6263,7 +6263,7 @@ _evas_textblock_eo_base_constructor(Eo *eo_obj, Evas_Textblock_Data *class_data
6263 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); 6263 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
6264 Evas_Textblock_Data *o; 6264 Evas_Textblock_Data *o;
6265 6265
6266 eo_obj = eo_do_super_ret(eo_obj, MY_CLASS, eo_obj, eo_constructor()); 6266 eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS));
6267 6267
6268 /* set up methods (compulsory) */ 6268 /* set up methods (compulsory) */
6269 obj->func = &object_func; 6269 obj->func = &object_func;
@@ -7350,8 +7350,9 @@ _obstacle_update(Evas_Textblock_Obstacle *obs, Eo *eo_obj)
7350 Evas_Coord ox, oy, ow, oh; 7350 Evas_Coord ox, oy, ow, oh;
7351 Eo *eo_obs = obs->eo_obs; 7351 Eo *eo_obs = obs->eo_obs;
7352 7352
7353 eo_do(eo_obs, efl_gfx_position_get(&ox, &oy), efl_gfx_size_get(&ow, &oh)); 7353 efl_gfx_position_get(eo_obs, &ox, &oy);
7354 eo_do(eo_obj, efl_gfx_position_get(&x, &y)); 7354 efl_gfx_size_get(eo_obs, &ow, &oh);
7355 efl_gfx_position_get(eo_obj, &x, &y);
7355 7356
7356 obs->x = ox - x; 7357 obs->x = ox - x;
7357 obs->y = oy - y; 7358 obs->y = oy - y;
@@ -7411,8 +7412,7 @@ _obstacle_del_cb(void *data, const Eo_Event *event)
7411static void 7412static void
7412_obstacle_clear(Eo *eo_obj, Evas_Textblock_Obstacle *obs) 7413_obstacle_clear(Eo *eo_obj, Evas_Textblock_Obstacle *obs)
7413{ 7414{
7414 eo_do(obs->eo_obs, eo_event_callback_del(EVAS_OBJECT_EVENT_DEL, 7415 eo_event_callback_del(obs->eo_obs, EVAS_OBJECT_EVENT_DEL, _obstacle_del_cb, eo_obj);
7415 _obstacle_del_cb, eo_obj));
7416} 7416}
7417 7417
7418static void 7418static void
@@ -7448,8 +7448,7 @@ _evas_textblock_obstacle_add(Eo *eo_obj,
7448 if (!obs) return EINA_FALSE; 7448 if (!obs) return EINA_FALSE;
7449 7449
7450 obs->eo_obs = eo_obs; 7450 obs->eo_obs = eo_obs;
7451 eo_do(eo_obs, eo_event_callback_add(EVAS_OBJECT_EVENT_DEL,_obstacle_del_cb, 7451 eo_event_callback_add(eo_obs, EVAS_OBJECT_EVENT_DEL, _obstacle_del_cb, eo_obj);
7452 eo_obj));
7453 7452
7454 obj->obstacles = eina_list_append(obj->obstacles, obs); 7453 obj->obstacles = eina_list_append(obj->obstacles, obs);
7455 _obstacle_update(obs, eo_obj); 7454 _obstacle_update(obs, eo_obj);
@@ -7499,7 +7498,7 @@ _layout_item_obstacle_get(Ctxt *c, Evas_Object_Textblock_Item *it)
7499 EINA_LIST_FOREACH(c->o->obstacles, i, obs) 7498 EINA_LIST_FOREACH(c->o->obstacles, i, obs)
7500 { 7499 {
7501 Eina_Bool is_visible; 7500 Eina_Bool is_visible;
7502 eo_do(obs->eo_obs, is_visible = efl_gfx_visible_get()); 7501 is_visible = efl_gfx_visible_get(obs->eo_obs);
7503 if (!is_visible) 7502 if (!is_visible)
7504 continue; 7503 continue;
7505 if ((obs->y < c->y + it->h) && 7504 if ((obs->y < c->y + it->h) &&
@@ -11553,7 +11552,7 @@ _evas_textblock_line_number_geometry_get(const Eo *eo_obj, Evas_Textblock_Data *
11553static void 11552static void
11554_evas_object_textblock_clear_all(Evas_Object *eo_obj) 11553_evas_object_textblock_clear_all(Evas_Object *eo_obj)
11555{ 11554{
11556 eo_do(eo_obj, evas_obj_textblock_clear()); 11555 evas_obj_textblock_clear(eo_obj);
11557} 11556}
11558 11557
11559EOLIAN static void 11558EOLIAN static void
@@ -11883,7 +11882,7 @@ _evas_textblock_style_insets_get(Eo *eo_obj, Evas_Textblock_Data *o, Evas_Coord
11883EOLIAN static void 11882EOLIAN static void
11884_evas_textblock_eo_base_dbg_info_get(Eo *eo_obj, Evas_Textblock_Data *o EINA_UNUSED, Eo_Dbg_Info *root) 11883_evas_textblock_eo_base_dbg_info_get(Eo *eo_obj, Evas_Textblock_Data *o EINA_UNUSED, Eo_Dbg_Info *root)
11885{ 11884{
11886 eo_do_super(eo_obj, MY_CLASS, eo_dbg_info_get(root)); 11885 eo_dbg_info_get(eo_super(eo_obj, MY_CLASS), root);
11887 if (!root) return; 11886 if (!root) return;
11888 Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME); 11887 Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME);
11889 Eo_Dbg_Info *node; 11888 Eo_Dbg_Info *node;
@@ -11893,9 +11892,9 @@ _evas_textblock_eo_base_dbg_info_get(Eo *eo_obj, Evas_Textblock_Data *o EINA_UNU
11893 char shorttext[48]; 11892 char shorttext[48];
11894 const Evas_Textblock_Style *ts = NULL; 11893 const Evas_Textblock_Style *ts = NULL;
11895 11894
11896 eo_do(eo_obj, ts = evas_obj_textblock_style_get()); 11895 ts = evas_obj_textblock_style_get(eo_obj);
11897 style = evas_textblock_style_get(ts); 11896 style = evas_textblock_style_get(ts);
11898 eo_do(eo_obj, text = evas_obj_textblock_text_markup_get()); 11897 text = evas_obj_textblock_text_markup_get(eo_obj);
11899 strncpy(shorttext, text, 38); 11898 strncpy(shorttext, text, 38);
11900 if (shorttext[37]) 11899 if (shorttext[37])
11901 strcpy(shorttext + 37, "\xe2\x80\xa6"); /* HORIZONTAL ELLIPSIS */ 11900 strcpy(shorttext + 37, "\xe2\x80\xa6"); /* HORIZONTAL ELLIPSIS */
@@ -11905,7 +11904,7 @@ _evas_textblock_eo_base_dbg_info_get(Eo *eo_obj, Evas_Textblock_Data *o EINA_UNU
11905 11904
11906 { 11905 {
11907 int w, h; 11906 int w, h;
11908 eo_do(eo_obj, evas_obj_textblock_size_formatted_get(&w, &h)); 11907 evas_obj_textblock_size_formatted_get(eo_obj, &w, &h);
11909 node = EO_DBG_INFO_LIST_APPEND(group, "Formatted size"); 11908 node = EO_DBG_INFO_LIST_APPEND(group, "Formatted size");
11910 EO_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, w); 11909 EO_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, w);
11911 EO_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, h); 11910 EO_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, h);
@@ -11913,7 +11912,7 @@ _evas_textblock_eo_base_dbg_info_get(Eo *eo_obj, Evas_Textblock_Data *o EINA_UNU
11913 11912
11914 { 11913 {
11915 int w, h; 11914 int w, h;
11916 eo_do(eo_obj, evas_obj_textblock_size_native_get(&w, &h)); 11915 evas_obj_textblock_size_native_get(eo_obj, &w, &h);
11917 node = EO_DBG_INFO_LIST_APPEND(group, "Native size"); 11916 node = EO_DBG_INFO_LIST_APPEND(group, "Native size");
11918 EO_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, w); 11917 EO_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, w);
11919 EO_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, h); 11918 EO_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, h);
@@ -11949,7 +11948,7 @@ EOLIAN static void
11949_evas_textblock_eo_base_destructor(Eo *eo_obj, Evas_Textblock_Data *o EINA_UNUSED) 11948_evas_textblock_eo_base_destructor(Eo *eo_obj, Evas_Textblock_Data *o EINA_UNUSED)
11950{ 11949{
11951 evas_object_textblock_free(eo_obj); 11950 evas_object_textblock_free(eo_obj);
11952 eo_do_super(eo_obj, MY_CLASS, eo_destructor()); 11951 eo_destructor(eo_super(eo_obj, MY_CLASS));
11953} 11952}
11954 11953
11955static void 11954static void