tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=aca28e01a1b6bf254fa2f4c7f8d5693e83799019
commit aca28e01a1b6bf254fa2f4c7f8d5693e83799019 Merge: 3adf6fd 3c5b0bc Author: Tom Hacohen <[email protected]> Date: Thu Jun 16 20:15:22 2016 +0100 Merge in the new text API changes and new Efl.Ui.Text widget This set of commits include the renaming of textblock to the new convention, addition of a new interface for interactive text editing, and a new entry widget that uses this new API. A better write up will follow when the change is fully done. But the gist of it is that now you just manipulate text cursors to manipulate the text and selections. Edje_Entry is no longer used, the logic is outside. Formats and markup are no longer used, they proved to be problematic for text editing; we'll add wrappers for setting and getting markup. Instead of formats we use the more strict subset, which is format ranges, or as we called them "annotations" that essentially let you apply a format on a range of text. There are a few things missing that will soon follow. Namely: 1. Style is currently hardcoded. We need to change it to load from Edje, and just use the old entry theme instead of the custom one. 2. Text filtering is not yet implemented. 3. There are a few known issues that need to be fixed. 4. Markup set/get support. 5. Change the IMF API and other APIs that we didn't know much about that looked a bit messy. data/elementary/themes/edc/elm/entry.edc | 104 + src/Makefile_Elementary.am | 17 +- src/Makefile_Evas.am | 4 +- src/bin/elementary/Makefile.am | 1 + src/bin/elementary/test.c | 3 +- src/bin/elementary/test_efl_ui_text.c | 6 + src/bin/elementary/test_entry.c | 125 + src/lib/edje/edje_calc.c | 16 +- src/lib/elementary/Elementary.h.in | 2 + src/lib/elementary/Makefile.am | 3 + .../elementary/efl_ui_internal_text_interactive.c | 1398 +++++ .../elementary/efl_ui_internal_text_interactive.eo | 14 + .../elementary/efl_ui_internal_text_interactive.h | 6 + src/lib/elementary/efl_ui_text.c | 5648 ++++++++++++++++++++ src/lib/elementary/efl_ui_text.eo | 468 ++ src/lib/elementary/efl_ui_text_interactive.eo | 53 + src/lib/elementary/elm_entry_common.h | 4 + src/lib/evas/Evas_Common.h | 772 --- src/lib/evas/Evas_Eo.h | 5 +- src/lib/evas/Evas_Legacy.h | 57 +- src/lib/evas/canvas/efl_canvas_text.eo | 306 ++ src/lib/evas/canvas/efl_canvas_text_cursor.eo | 212 + src/lib/evas/canvas/evas_object_textblock.c | 2119 ++++++-- src/lib/evas/canvas/evas_textblock.eo | 331 -- src/lib/evas/canvas/evas_textblock_hyphenation.x | 4 +- src/lib/evas/canvas/evas_textblock_legacy.h | 915 ++++ src/lib/evas/canvas/evas_types.eot | 2 + src/tests/evas/evas_test_textblock.c | 350 +- 28 files changed, 11290 insertions(+), 1655 deletions(-) --
