[EGIT] [core/efl] master 01/01: Evas textblock: Fixed compilation with FriBiDi disabled.

[Tom Hacohen]

tasn pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=2e7565b7c386c6b98c62da234e80d7e8693e56e5

commit 2e7565b7c386c6b98c62da234e80d7e8693e56e5
Author: Tom Hacohen <t...@stosb.com>
Date:   Mon Mar 31 11:41:51 2014 +0100

    Evas textblock: Fixed compilation with FriBiDi disabled.
    
    This issue was introduced in d175b8aa69c31fc155f05269350f6703e81886b7
    during the previous merge window.
    
    Thanks a lot to vtorri for reporting.
---
 src/lib/evas/canvas/evas_object_textblock.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/lib/evas/canvas/evas_object_textblock.c 
b/src/lib/evas/canvas/evas_object_textblock.c
index 813d479..c977434 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -10364,8 +10364,14 @@ _size_native_calc_line_finalize(const Evas_Object 
*eo_obj, Eina_List *items,
 loop_advance:
         *w += it->adv;
 
+#ifdef BIDI_SUPPORT
         if (!last_it || (it->visual_pos > last_it->visual_pos))
-           last_it = it;
+#else
+        if (!last_it)
+#endif
+          {
+             last_it = it;
+          }
      }
 
    if (last_it)

--