Fixes TextView's includes.

[platform/core/uifw/dali-toolkit.git] / base / dali-toolkit / internal / controls / text-view / text-view-processor.cpp

diff --git a/base/dali-toolkit/internal/controls/text-view/text-view-processor.cpp b/base/dali-toolkit/internal/controls/text-view/text-view-processor.cpp
index 6551917..0c3f074 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-view/text-view-processor.cpp
+++ b/base/dali-toolkit/internal/controls/text-view/text-view-processor.cpp
@@ -15,15 +15,15 @@
  *
  */
 
+// FILE HEADER
+#include <dali-toolkit/internal/controls/text-view/text-view-processor.h>
+
 // INTERNAL INCLUDES
-#include <dali/integration-api/debug.h>
-#include "text-view-processor.h"
-#include "text-view-word-processor.h"
-#include "text-view-word-group-processor.h"
-#include "text-view-line-processor.h"
-#include "text-view-processor-helper-functions.h"
-#include "text-processor.h"
-#include "text-view-processor-dbg.h"
+#include <dali-toolkit/internal/controls/text-view/text-view-word-processor.h>
+#include <dali-toolkit/internal/controls/text-view/text-view-word-group-processor.h>
+#include <dali-toolkit/internal/controls/text-view/text-view-line-processor.h>
+#include <dali-toolkit/internal/controls/text-view/text-view-processor-helper-functions.h>
+#include <dali-toolkit/internal/controls/text-view/text-processor.h>
 
 namespace Dali
 {
@@ -1129,7 +1129,7 @@ void InitializeTextActorInfo( TextView::RelayoutData& relayoutData )
 
             if( characterLayout.mIsColorGlyph ||
                 !character.IsWhiteSpace() || // A new line character is also a white space.
-                ( character.IsWhiteSpace() && characterLayout.mStyledText.mStyle.GetUnderline() ) )
+                ( character.IsWhiteSpace() && characterLayout.mStyledText.mStyle.IsUnderlineEnabled() ) )
             {
               // Do not create a glyph-actor if it's a white space (without underline) or a new line character.
 
@@ -1176,7 +1176,8 @@ void InitializeTextActorInfo( TextView::RelayoutData& relayoutData )
                     // If still there is no text-actor, create one.
                     if( !textActor )
                     {
-                      textActor = TextActor::New( Text(), characterLayout.mStyledText.mStyle, false, true );
+                      TextActorParameters parameters( characterLayout.mStyledText.mStyle, TextActorParameters::FONT_DETECTION_OFF );
+                      textActor = TextActor::New( NULL, parameters );
                     }
                     else
                     {