X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Fbidirectional-support.h;h=4f92c62c38528e06badf1d4bb9693fef9488dbef;hp=39ec9d61dc250f7f437a84aaaeb23b690c9e8632;hb=0e1683ef848d1d877e26633609fa95e0d2ab36b5;hpb=b899c4999231a14190e804e13b941527c3c437a1

diff --git a/dali-toolkit/internal/text/bidirectional-support.h b/dali-toolkit/internal/text/bidirectional-support.h
old mode 100644
new mode 100755
index 39ec9d6..4f92c62
--- a/dali-toolkit/internal/text/bidirectional-support.h
+++ b/dali-toolkit/internal/text/bidirectional-support.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_TEXT_BIDIRECTIONAL_SUPPORT_H__
-#define __DALI_TOOLKIT_TEXT_BIDIRECTIONAL_SUPPORT_H__
+#ifndef DALI_TOOLKIT_TEXT_BIDIRECTIONAL_SUPPORT_H
+#define DALI_TOOLKIT_TEXT_BIDIRECTIONAL_SUPPORT_H
 
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/common/dali-vector.h>
+#include <dali/public-api/actors/actor-enumerations.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/text/bidirectional-line-info-run.h>
@@ -45,35 +46,34 @@ namespace Text
  * @param[in] startIndex The character from where the bidirectional info is set.
  * @param[in] numberOfCharacters The number of characters.
  * @param[out] bidirectionalInfo Vector with the bidirectional infor for each paragraph.
+ * @param[in] matchSystemLanguageDirection Whether match for system language direction or not.
+ * @param[in] layoutDirection The direction of the system language.
  */
 void SetBidirectionalInfo( const Vector<Character>& text,
                            const Vector<ScriptRun>& scripts,
                            const Vector<LineBreakInfo>& lineBreakInfo,
                            CharacterIndex startIndex,
                            Length numberOfCharacters,
-                           Vector<BidirectionalParagraphInfoRun>& bidirectionalInfo );
+                           Vector<BidirectionalParagraphInfoRun>& bidirectionalInfo,
+                           bool matchSystemLanguageDirection = false,
+                           Dali::LayoutDirection::Type layoutDirection = LayoutDirection::LEFT_TO_RIGHT );
 
 /**
- * Sets the visual to logical map tables.
+ * @brief Sets the visual to logical map table for a given line.
  *
- * Any map tables previously set are removed.
- * It sets the paragraph's direction to each line.
- *
- * @pre The @p logicalModel needs to have a text set.
- * @pre The @p logicalModel needs to have the bidirectional info indices for each paragraph set.
- * @pre The @p visualModel needs to have the laid-out lines info set.
- *
- * @param[in] bidirectionalInfo Vector with the bidirectional infor for each paragraph.
+ * @param[in] bidirectionalParagraphInfo The paragraph's bidirectional info.
+ * @param[out] lineInfoRuns Line runs with the visual to logical conversion maps.
+ * @param[in] bidiLineIndex Index to the line's bidirectional info.
  * @param[in] startIndex The character from where the bidirectional info is set.
  * @param[in] numberOfCharacters The number of characters.
- * @param[in,out] lineRuns The line runs converted to characters.
- * @param[out] lineInfoRuns line runs with the visual to logical conversion maps.
+ * @param[in] direction The direction of the line.
  */
-void ReorderLines( const Vector<BidirectionalParagraphInfoRun>& bidirectionalInfo,
-                   CharacterIndex startIndex,
-                   Length numberOfCharacters,
-                   Vector<LineRun>& lineRuns,
-                   Vector<BidirectionalLineInfoRun>& lineInfoRuns );
+void ReorderLine( const BidirectionalParagraphInfoRun& bidirectionalParagraphInfo,
+                  Vector<BidirectionalLineInfoRun>& lineInfoRuns,
+                  BidirectionalLineRunIndex bidiLineIndex,
+                  CharacterIndex startIndex,
+                  Length numberOfCharacters,
+                  CharacterDirection direction );
 
 /**
  * @brief Replaces any character in the right to left paragraphs which could be mirrored.
@@ -95,7 +95,7 @@ bool GetMirroredText( const Vector<Character>& text,
                       Vector<Character>& mirroredText );
 
 /**
- * @brief Retrieves the character's directions.
+ * @brief Retrieves the characters' directions.
  *
  * @pre The @p logicalModel needs to have a text set.
  * @pre The @p logicalModel needs to have the bidirectional info indices for each paragraph set.
@@ -118,4 +118,4 @@ void GetCharactersDirection( const Vector<BidirectionalParagraphInfoRun>& bidire
 
 } // namespace Dali
 
-#endif // __DALI_TOOLKIT_TEXT_BIDIRECTIONAL_SUPPORT_H__
+#endif // DALI_TOOLKIT_TEXT_BIDIRECTIONAL_SUPPORT_H