summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Hirt <hirt.danny@gmail.com>2017-08-23 19:56:14 +0300
committerDaniel Hirt <hirt.danny@gmail.com>2017-08-23 19:56:14 +0300
commit85b9f62a4d1708c46703f26094c6087040611e94 (patch)
tree3c241a6fed60ca25f44ca750c6eb0ba59fc950a3
parenta9c4a4a6610f8506eb014627abd1405d6f2d4839 (diff)
downloadefl-85b9f62a4d1708c46703f26094c6087040611e94.tar.gz
save work
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c25
1 files changed, 25 insertions, 0 deletions
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index c7c82d1ba6..e7453de946 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -1,3 +1,4 @@
+#define TEXT_PAR_USE_ASYNC
/**
* @internal
* @subsection Evas_Object_Textblock_Internal Internal Textblock Object Tutorial
@@ -64,6 +65,7 @@
#define EFL_CANVAS_OBJECT_BETA
#define EFL_CANVAS_FILTER_INTERNAL_PROTECTED
+#define TEXT_PAR_ASYNC
#include "evas_common_private.h"
#include "evas_private.h"
@@ -577,6 +579,12 @@ struct _Efl_Text_Annotate_Annotation
#define _FMT(x) (o->default_format.format.x)
#define _FMT_INFO(x) (o->default_format.info.x)
+#ifdef TEXT_PAR_USE_ASYNC
+# include "Ecore.h"
+typedef struct _Async_Layout_Data Async_Layout_Data;
+#endif
+
+
/* Size of the index array */
#define TEXTBLOCK_PAR_INDEX_SIZE 10
struct _Evas_Object_Textblock
@@ -637,6 +645,9 @@ struct _Evas_Object_Textblock
Eina_Hash *sources;
Text_Item_Filter *text_items; // inlist
} gfx_filter;
+#ifdef TEXT_PAR_USE_ASYNC
+
+#endif
Eina_Bool redraw : 1;
Eina_Bool changed : 1;
Eina_Bool obstacle_changed : 1;
@@ -649,6 +660,9 @@ struct _Evas_Object_Textblock
Eina_Bool changed_paragraph_direction : 1;
Eina_Bool multiline : 1;
Eina_Bool wrap_changed : 1;
+#ifdef TEXT_PAR_USE_ASYNC
+
+#endif
};
struct _Evas_Textblock_Selection_Iterator
@@ -2874,6 +2888,16 @@ struct _Ctxt
Eina_Bool handle_obstacles : 1;
};
+#ifdef TEXT_PAR_USE_ASYNC
+# include "Ecore.h"
+struct _Async_Layout_Data
+{
+ Eo *obj;
+ Ctxt *c;
+ int style_pad_l, style_pad_r, style_pad_t, style_pad_b;
+};
+#endif
+
static void _layout_text_add_logical_item(Ctxt *c, Evas_Object_Textblock_Text_Item *ti, Eina_List *rel);
static void _text_item_update_sizes(Ctxt *c, Evas_Object_Textblock_Text_Item *ti);
static Evas_Object_Textblock_Format_Item *_layout_do_format(const Evas_Object *obj EINA_UNUSED, Ctxt *c, Evas_Object_Textblock_Format **_fmt, Evas_Object_Textblock_Node_Format *n, int *style_pad_l, int *style_pad_r, int *style_pad_t, int *style_pad_b, Eina_Bool create_item);
@@ -5529,6 +5553,7 @@ _layout_par(Ctxt *c)
}
}
+ /* FIXME: need to resolve later */
c->y = c->par->y;