Fix SVACE issue in text-controller

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / text / controller / text-controller.cpp

diff --git a/dali-toolkit/internal/text/controller/text-controller.cpp b/dali-toolkit/internal/text/controller/text-controller.cpp
index 5362804..b66cd3c 100644 (file)
--- a/dali-toolkit/internal/text/controller/text-controller.cpp
+++ b/dali-toolkit/internal/text/controller/text-controller.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 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.
@@ -35,6 +35,7 @@
 #include <dali-toolkit/internal/text/controller/text-controller-input-properties.h>
 #include <dali-toolkit/internal/text/controller/text-controller-placeholder-handler.h>
 #include <dali-toolkit/internal/text/controller/text-controller-relayouter.h>
+#include <dali-toolkit/internal/text/controller/text-controller-spannable-handler.h>
 #include <dali-toolkit/internal/text/controller/text-controller-text-updater.h>
 #include <dali-toolkit/internal/text/text-editable-control-interface.h>
 #include <dali-toolkit/internal/text/text-geometry.h>
@@ -472,6 +473,11 @@ void Controller::GetText(std::string& text) const
   mImpl->GetText(text);
 }
 
+void Controller::SetSpannedText(const Text::Spanned& spannedText)
+{
+  SpannableHandler::SetSpannedText(*this, spannedText);
+}
+
 void Controller::SetPlaceholderText(PlaceholderType type, const std::string& text)
 {
   PlaceholderHandler::SetPlaceholderText(*this, type, text);
@@ -516,17 +522,20 @@ void Controller::SetDefaultFontFamily(const std::string& defaultFontFamily)
 {
   EnsureCreated(mImpl->mFontDefaults);
 
-  mImpl->mFontDefaults->mFontDescription.family = defaultFontFamily;
-  DALI_LOG_INFO(gLogFilter, Debug::General, "Controller::SetDefaultFontFamily %s\n", defaultFontFamily.c_str());
-  mImpl->mFontDefaults->familyDefined = !defaultFontFamily.empty();
+  if(mImpl->mFontDefaults->mFontDescription.family != defaultFontFamily)
+  {
+    mImpl->mFontDefaults->mFontDescription.family = defaultFontFamily;
+    DALI_LOG_INFO(gLogFilter, Debug::General, "Controller::SetDefaultFontFamily %s\n", defaultFontFamily.c_str());
+    mImpl->mFontDefaults->familyDefined = !defaultFontFamily.empty();
 
-  // Update the cursor position if it's in editing mode
-  UpdateCursorPosition(mImpl->mEventData);
+    // Update the cursor position if it's in editing mode
+    UpdateCursorPosition(mImpl->mEventData);
 
-  // Clear the font-specific data
-  mImpl->ClearFontData();
+    // Clear the font-specific data
+    mImpl->ClearFontData();
 
-  mImpl->RequestRelayout();
+    mImpl->RequestRelayout();
+  }
 }
 
 const std::string& Controller::GetDefaultFontFamily() const
@@ -1278,7 +1287,7 @@ int Controller::GetLineCount(float width)
   return mImpl->mModel->GetNumberOfLines();
 }
 
-const ModelInterface* const Controller::GetTextModel() const
+const ModelInterface* Controller::GetTextModel() const
 {
   return mImpl->mModel.Get();
 }
@@ -1420,6 +1429,16 @@ Rect<float> Controller::GetLineBoundingRectangle(const uint32_t lineIndex)
   return GetLineBoundingRect(mImpl->mModel, lineIndex);
 }
 
+Rect<float> Controller::GetCharacterBoundingRectangle(const uint32_t charIndex)
+{
+  return GetCharacterBoundingRect(mImpl->mModel, charIndex);
+}
+
+int Controller::GetCharacterIndexAtPosition(float visualX, float visualY)
+{
+  return GetCharIndexAtPosition(mImpl->mModel, visualX, visualY);
+}
+
 Rect<> Controller::GetTextBoundingRectangle(CharacterIndex startIndex, CharacterIndex endIndex)
 {
   Vector<Vector2> sizeList;
@@ -1716,7 +1735,6 @@ Controller::Controller(ControlInterface*           controlInterface,
 
 Controller::~Controller()
 {
-  delete mImpl;
 }
 
 } // namespace Dali::Toolkit::Text