[dali_2.1.0] Merge branch 'devel/master'

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / text-controls / text-field-property-handler.cpp

diff --git a/dali-toolkit/internal/controls/text-controls/text-field-property-handler.cpp b/dali-toolkit/internal/controls/text-controls/text-field-property-handler.cpp
index 04a5082..dc253f0 100644 (file)
--- a/dali-toolkit/internal/controls/text-controls/text-field-property-handler.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-field-property-handler.cpp
@@ -15,6 +15,7 @@
  */
 
 #include <dali-toolkit/internal/controls/text-controls/text-field-property-handler.h>
+#include <dali-toolkit/internal/controls/text-controls/common-text-utils.h>
 
 #include <dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h>
 #include <dali-toolkit/devel-api/text/rendering-backend.h>
@@ -408,6 +409,7 @@ void TextField::PropertyHandler::SetProperty(Toolkit::TextField textField, Prope
       DALI_LOG_INFO(gTextFieldLogFilter, Debug::General, "TextField %p ENABLE_MARKUP %d\n", impl.mController.Get(), enableMarkup);
 
       impl.mController->SetMarkupProcessorEnabled(enableMarkup);
+      CommonTextUtils::SynchronizeTextAnchorsInParent(textField, impl.mController, impl.mAnchorActors);
       break;
     }
     case Toolkit::TextField::Property::INPUT_FONT_FAMILY:
@@ -507,6 +509,15 @@ void TextField::PropertyHandler::SetProperty(Toolkit::TextField textField, Prope
       if(map)
       {
         impl.mController->SetHiddenInputOption(*map);
+        auto mode = map->Find(Toolkit::HiddenInput::Property::MODE);
+        if(mode && (mode->Get<int>() != Toolkit::HiddenInput::Mode::HIDE_NONE))
+        {
+          textField.SetProperty(Toolkit::DevelControl::Property::ACCESSIBILITY_ROLE, Accessibility::Role::PASSWORD_TEXT);
+        }
+        else
+        {
+          textField.SetProperty(Toolkit::DevelControl::Property::ACCESSIBILITY_ROLE, Accessibility::Role::ENTRY);
+        }
       }
       break;
     }