herdsman pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=f437a3075a867b2a62e571f0c4f39450f3dcf835
commit f437a3075a867b2a62e571f0c4f39450f3dcf835
Author: Youngbok Shin <youngb.s...@samsung.com>
Date: Wed May 16 20:21:08 2018 +0300
evas textblock: update format nodes when a Evas Textblock Style is updated
Summary:
A style tag among a text has to be replcaed by its matched tag when
a format node is created. If the matched tag is changed, format nodes
should be updated.
But, if a style text for Evas Textblock Style is changed,
related format nodes are not updated without setting new text.
The patch changes to update format nodes when new style text is set.
@fix
Test Plan: Included in Evas Test Suite.
Reviewers: raster, tasn, herdsman, subodh6129, zmike
Subscribers: zmike, cedric, z-wony, Blackmole
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D4697
Committer's note: rebased.
---
src/lib/evas/canvas/evas_object_textblock.c | 82 ++++++++++++++++++-----------
src/tests/evas/evas_test_textblock.c | 10 ++++
2 files changed, 61 insertions(+), 31 deletions(-)
diff --git a/src/lib/evas/canvas/evas_object_textblock.c
b/src/lib/evas/canvas/evas_object_textblock.c
index 1b66ce507b..9ed2a33918 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -766,6 +766,7 @@ static Eina_Bool
_evas_textblock_cursor_format_is_visible_get(const Efl_Text_Cur
static void _evas_textblock_cursor_at_format_set(Efl_Text_Cursor_Cursor *cur,
const Evas_Object_Textblock_Node_Format *fmt);
static void _evas_textblock_cursor_init(Efl_Text_Cursor_Cursor *cur, const
Evas_Object *tb);
static Evas_Filter_Program *_format_filter_program_get(Efl_Canvas_Text_Data
*o, Evas_Object_Textblock_Format *fmt);
+static const char *_textblock_format_node_from_style_tag(Efl_Canvas_Text_Data
*o, Evas_Object_Textblock_Node_Format *fnode, const char *format, size_t
format_len);
#ifdef HAVE_HYPHEN
/* Hyphenation */
#include "evas_textblock_hyphenation.x"
@@ -6954,6 +6955,47 @@ evas_textblock_style_free(Evas_Textblock_Style *ts)
free(ts);
}
+static void
+_evas_textblock_update_format_nodes_from_style_tag(Efl_Canvas_Text_Data *o)
+{
+ Evas_Object_Textblock_Node_Format *fnode = o->format_nodes;
+
+ if (!o)
+ {
+ ERR("The given address Efl_Canvas_Text_Data is NULL");
+ return;
+ }
+
+ while (fnode)
+ {
+ const char *match;
+ size_t format_len = eina_stringshare_strlen(fnode->orig_format);
+ /* Is this safe to use alloca here? Strings might possibly get large */
+
+ if (fnode->own_closer &&
+ (format_len > 0) && (fnode->orig_format[format_len - 1] == '/'))
+ {
+ format_len--;
+ }
+
+ match = _textblock_format_node_from_style_tag(o, fnode,
fnode->orig_format,
+ format_len);
+
+ if (match && fnode->format && strcmp(match, fnode->format))
+ {
+ if ((*match == '+') || (*match == '-'))
+ {
+ match++;
+ while (*match == ' ') match++;
+ }
+ fnode->is_new = EINA_TRUE;
+ eina_stringshare_replace(&fnode->format, match);
+ }
+
+ fnode = _NODE_FORMAT(EINA_INLIST_GET(fnode)->next);
+ }
+}
+
EAPI void
evas_textblock_style_set(Evas_Textblock_Style *ts, const char *text)
{
@@ -6968,11 +7010,8 @@ evas_textblock_style_set(Evas_Textblock_Style *ts, const
char *text)
EINA_LIST_FOREACH(ts->objects, l, eo_obj)
{
- Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj,
EFL_CANVAS_OBJECT_CLASS);
evas_object_async_block(obj);
- _evas_textblock_invalidate_all(o);
- _evas_textblock_changed(o, eo_obj);
}
_style_replace(ts, text);
@@ -7095,6 +7134,14 @@ evas_textblock_style_set(Evas_Textblock_Style *ts, const
char *text)
p++;
}
}
+
+ EINA_LIST_FOREACH(ts->objects, l, eo_obj)
+ {
+ Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
+ _evas_textblock_update_format_nodes_from_style_tag(o);
+ _evas_textblock_invalidate_all(o);
+ _evas_textblock_changed(o, eo_obj);
+ }
}
EAPI const char *
@@ -7167,34 +7214,7 @@ _textblock_style_generic_set(Evas_Object *eo_obj,
Evas_Textblock_Style *ts,
}
*obj_ts = ts;
- Evas_Object_Textblock_Node_Format *fnode = o->format_nodes;
- while (fnode)
- {
- const char *match;
- size_t format_len = eina_stringshare_strlen(fnode->orig_format);
- /* Is this safe to use alloca here? Strings might possibly get large */
-
- if (fnode->own_closer &&
- (format_len > 0) && (fnode->orig_format[format_len - 1] == '/'))
- {
- format_len--;
- }
-
- match = _textblock_format_node_from_style_tag(o, fnode,
fnode->orig_format,
- format_len);
-
- if (match && fnode->format && strcmp(match, fnode->format))
- {
- if ((*match == '+') || (*match == '-'))
- {
- match++;
- while (*match == ' ') match++;
- }
- fnode->is_new = EINA_TRUE;
- eina_stringshare_replace(&fnode->format, match);
- }
- fnode = _NODE_FORMAT(EINA_INLIST_GET(fnode)->next);
- }
+ _evas_textblock_update_format_nodes_from_style_tag(o);
o->format_changed = EINA_TRUE;
_evas_textblock_invalidate_all(o);
diff --git a/src/tests/evas/evas_test_textblock.c
b/src/tests/evas/evas_test_textblock.c
index 82842febca..03e92adb9a 100644
--- a/src/tests/evas/evas_test_textblock.c
+++ b/src/tests/evas/evas_test_textblock.c
@@ -3702,6 +3702,16 @@ EFL_START_TEST(evas_textblock_style)
evas_object_textblock_size_formatted_get(tb, &nw, &nh);
ck_assert_int_eq(nw, bw);
+ evas_textblock_style_set(newst, "DEFAULT='font=Sans
font_size=30'small_size='+ font_size=10'");
+ evas_object_textblock_text_markup_set(tb, "Test
<small_size>SMALL</small_size>");
+ evas_object_textblock_size_formatted_get(tb, &w, &h);
+ ck_assert_int_gt(w, 0);
+ ck_assert_int_gt(h, 0);
+
+ evas_textblock_style_set(newst, "DEFAULT='font=Sans
font_size=30'small_size='+font_size=50'");
+ evas_object_textblock_size_formatted_get(tb, &nw, &nh);
+ ck_assert_int_gt(nw, w);
+ ck_assert_int_gt(nh, h);
END_TB_TEST();
}
--
