[dali_1.0.8] Merge branch 'tizen'

[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 482877a..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
@@ -1,28 +1,29 @@
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+/*
+ * Copyright (c) 2014 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// 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
 {
@@ -1128,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.
 
@@ -1175,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
                     {