X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Ftext-controls%2Ftext-field-impl.cpp;h=15ea36350a96b68680751faac771cf42ee481047;hp=6e08da13dcf83117cfd976ad1d79c4a49649bb80;hb=1c6aa75cb7b66fdab6bff180c19066204171ef1e;hpb=d44300a6f74767fb66b96d5583a60779a50c4c65 diff --git a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp index 6e08da1..15ea363 100644 --- a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Samsung Electronics Co., Ltd. + * Copyright (c) 2022 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. @@ -24,17 +24,19 @@ #include #include #include +#include #include #include #include #include // INTERNAL INCLUDES -#include #include #include -#include #include +#include +#include +#include #include #include #include @@ -48,6 +50,10 @@ using namespace Dali::Toolkit::Text; +#if defined(DEBUG_ENABLED) +Debug::Filter* gTextFieldLogFilter = Debug::Filter::New(Debug::Concise, true, "LOG_TEXT_CONTROLS"); +#endif + namespace Dali { namespace Toolkit @@ -56,10 +62,6 @@ namespace Internal { namespace // unnamed namespace { -#if defined(DEBUG_ENABLED) -Debug::Filter* gLogFilter = Debug::Filter::New(Debug::Concise, true, "LOG_TEXT_CONTROLS"); -#endif - const unsigned int DEFAULT_RENDERING_BACKEND = Dali::Toolkit::DevelText::DEFAULT_RENDERING_BACKEND; } // unnamed namespace @@ -135,10 +137,15 @@ DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextField, "selectedTextStar DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextField, "selectedTextEnd", INTEGER, SELECTED_TEXT_END ) DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextField, "enableEditing", BOOLEAN, ENABLE_EDITING ) DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextField, "fontSizeScale", FLOAT, FONT_SIZE_SCALE ) +DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextField, "enableFontSizeScale", BOOLEAN, ENABLE_FONT_SIZE_SCALE ) DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextField, "primaryCursorPosition", INTEGER, PRIMARY_CURSOR_POSITION ) DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextField, "grabHandleColor", VECTOR4, GRAB_HANDLE_COLOR ) DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextField, "inputFilter", MAP, INPUT_FILTER ) DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextField, "ellipsisPosition", INTEGER, ELLIPSIS_POSITION ) +DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextField, "strikethrough", MAP, STRIKETHROUGH ) +DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextField, "inputStrikethrough", MAP, INPUT_STRIKETHROUGH ) +DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextField, "characterSpacing", FLOAT, CHARACTER_SPACING ) +DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextField, "selectionPopupStyle", MAP, SELECTION_POPUP_STYLE ) DALI_SIGNAL_REGISTRATION(Toolkit, TextField, "textChanged", SIGNAL_TEXT_CHANGED ) DALI_SIGNAL_REGISTRATION(Toolkit, TextField, "maxLengthReached", SIGNAL_MAX_LENGTH_REACHED ) @@ -148,26 +155,56 @@ DALI_SIGNAL_REGISTRATION(Toolkit, TextField, "inputFiltered", SIGNAL_INP DALI_SIGNAL_REGISTRATION(Toolkit, TextField, "cursorPositionChanged", SIGNAL_CURSOR_POSITION_CHANGED) DALI_SIGNAL_REGISTRATION(Toolkit, TextField, "selectionChanged", SIGNAL_SELECTION_CHANGED ) DALI_SIGNAL_REGISTRATION(Toolkit, TextField, "selectionCleared", SIGNAL_SELECTION_CLEARED ) +DALI_SIGNAL_REGISTRATION(Toolkit, TextField, "selectionStarted", SIGNAL_SELECTION_STARTED ) DALI_TYPE_REGISTRATION_END() // clang-format on -const char* const IMAGE_MAP_FILENAME_STRING = "filename"; - -/// Retrieves a filename from a value that is a Property::Map -std::string GetImageFileNameFromPropertyValue(const Property::Value& value) +Toolkit::TextField::InputStyle::Mask ConvertInputStyle(Text::InputStyle::Mask inputStyleMask) { - std::string filename; - const Property::Map* map = value.GetMap(); - if(map) + Toolkit::TextField::InputStyle::Mask fieldInputStyleMask = Toolkit::TextField::InputStyle::NONE; + + if(InputStyle::NONE != static_cast(inputStyleMask & InputStyle::INPUT_COLOR)) { - const Property::Value* filenameValue = map->Find(IMAGE_MAP_FILENAME_STRING); - if(filenameValue) - { - filenameValue->Get(filename); - } + fieldInputStyleMask = static_cast(fieldInputStyleMask | Toolkit::TextField::InputStyle::COLOR); + } + if(InputStyle::NONE != static_cast(inputStyleMask & InputStyle::INPUT_FONT_FAMILY)) + { + fieldInputStyleMask = static_cast(fieldInputStyleMask | Toolkit::TextField::InputStyle::FONT_FAMILY); + } + if(InputStyle::NONE != static_cast(inputStyleMask & InputStyle::INPUT_POINT_SIZE)) + { + fieldInputStyleMask = static_cast(fieldInputStyleMask | Toolkit::TextField::InputStyle::POINT_SIZE); + } + if(InputStyle::NONE != static_cast(inputStyleMask & InputStyle::INPUT_FONT_WEIGHT)) + { + fieldInputStyleMask = static_cast(fieldInputStyleMask | Toolkit::TextField::InputStyle::FONT_STYLE); + } + if(InputStyle::NONE != static_cast(inputStyleMask & InputStyle::INPUT_FONT_WIDTH)) + { + fieldInputStyleMask = static_cast(fieldInputStyleMask | Toolkit::TextField::InputStyle::FONT_STYLE); + } + if(InputStyle::NONE != static_cast(inputStyleMask & InputStyle::INPUT_FONT_SLANT)) + { + fieldInputStyleMask = static_cast(fieldInputStyleMask | Toolkit::TextField::InputStyle::FONT_STYLE); } - return filename; + if(InputStyle::NONE != static_cast(inputStyleMask & InputStyle::INPUT_UNDERLINE)) + { + fieldInputStyleMask = static_cast(fieldInputStyleMask | Toolkit::TextField::InputStyle::UNDERLINE); + } + if(InputStyle::NONE != static_cast(inputStyleMask & InputStyle::INPUT_SHADOW)) + { + fieldInputStyleMask = static_cast(fieldInputStyleMask | Toolkit::TextField::InputStyle::SHADOW); + } + if(InputStyle::NONE != static_cast(inputStyleMask & InputStyle::INPUT_EMBOSS)) + { + fieldInputStyleMask = static_cast(fieldInputStyleMask | Toolkit::TextField::InputStyle::EMBOSS); + } + if(InputStyle::NONE != static_cast(inputStyleMask & InputStyle::INPUT_OUTLINE)) + { + fieldInputStyleMask = static_cast(fieldInputStyleMask | Toolkit::TextField::InputStyle::OUTLINE); + } + return fieldInputStyleMask; } } // namespace @@ -191,606 +228,12 @@ void TextField::SetProperty(BaseObject* object, Property::Index index, const Pro { Toolkit::TextField textField = Toolkit::TextField::DownCast(Dali::BaseHandle(object)); - DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField SetProperty\n"); + DALI_LOG_INFO(gTextFieldLogFilter, Debug::Verbose, "TextField SetProperty\n"); if(textField) { - TextField& impl(GetImpl(textField)); - DALI_ASSERT_DEBUG(impl.mController && "No text contoller"); - DALI_ASSERT_DEBUG(impl.mDecorator && "No text decorator"); - - switch(index) - { - case Toolkit::DevelTextField::Property::RENDERING_BACKEND: - { - int backend = value.Get(); - DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField %p RENDERING_BACKEND %d\n", impl.mController.Get(), backend); - -#ifndef ENABLE_VECTOR_BASED_TEXT_RENDERING - if(DevelText::RENDERING_VECTOR_BASED == backend) - { - backend = TextAbstraction::BITMAP_GLYPH; // Fallback to bitmap-based rendering - } -#endif - if(impl.mRenderingBackend != backend) - { - impl.mRenderingBackend = backend; - impl.mRenderer.Reset(); - - // When using the vector-based rendering, the size of the GLyphs are different - TextAbstraction::GlyphType glyphType = (DevelText::RENDERING_VECTOR_BASED == impl.mRenderingBackend) ? TextAbstraction::VECTOR_GLYPH : TextAbstraction::BITMAP_GLYPH; - impl.mController->SetGlyphType(glyphType); - } - break; - } - case Toolkit::TextField::Property::TEXT: - { - const std::string& text = value.Get(); - DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p TEXT %s\n", impl.mController.Get(), text.c_str()); - - impl.mController->SetText(text); - break; - } - case Toolkit::TextField::Property::PLACEHOLDER_TEXT: - { - const std::string& text = value.Get(); - DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p PLACEHOLDER_TEXT %s\n", impl.mController.Get(), text.c_str()); - - impl.mController->SetPlaceholderText(Controller::PLACEHOLDER_TYPE_INACTIVE, text); - break; - } - case Toolkit::TextField::Property::PLACEHOLDER_TEXT_FOCUSED: - { - const std::string& text = value.Get(); - DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p PLACEHOLDER_TEXT_FOCUSED %s\n", impl.mController.Get(), text.c_str()); - - impl.mController->SetPlaceholderText(Controller::PLACEHOLDER_TYPE_ACTIVE, text); - break; - } - case Toolkit::TextField::Property::FONT_FAMILY: - { - const std::string& fontFamily = value.Get(); - DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p FONT_FAMILY %s\n", impl.mController.Get(), fontFamily.c_str()); - impl.mController->SetDefaultFontFamily(fontFamily); - break; - } - case Toolkit::TextField::Property::FONT_STYLE: - { - SetFontStyleProperty(impl.mController, value, Text::FontStyle::DEFAULT); - break; - } - case Toolkit::TextField::Property::POINT_SIZE: - { - const float pointSize = value.Get(); - DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p POINT_SIZE %f\n", impl.mController.Get(), pointSize); - - if(!Equals(impl.mController->GetDefaultFontSize(Text::Controller::POINT_SIZE), pointSize)) - { - impl.mController->SetDefaultFontSize(pointSize, Text::Controller::POINT_SIZE); - } - break; - } - case Toolkit::TextField::Property::MAX_LENGTH: - { - const int max = value.Get(); - DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p MAX_LENGTH %d\n", impl.mController.Get(), max); - - impl.mController->SetMaximumNumberOfCharacters(max); - break; - } - case Toolkit::TextField::Property::EXCEED_POLICY: - { - impl.mExceedPolicy = value.Get(); - - if(Dali::Toolkit::TextField::EXCEED_POLICY_CLIP == impl.mExceedPolicy) - { - impl.EnableClipping(); - } - else - { - UnparentAndReset(impl.mStencil); - } - impl.RequestTextRelayout(); - break; - } - case Toolkit::TextField::Property::HORIZONTAL_ALIGNMENT: - { - Text::HorizontalAlignment::Type alignment(static_cast(-1)); // Set to invalid value to ensure a valid mode does get set - if(GetHorizontalAlignmentEnumeration(value, alignment)) - { - DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p HORIZONTAL_ALIGNMENT %d\n", impl.mController.Get(), alignment); - impl.mController->SetHorizontalAlignment(alignment); - } - break; - } - case Toolkit::TextField::Property::VERTICAL_ALIGNMENT: - { - Toolkit::Text::VerticalAlignment::Type alignment(static_cast(-1)); // Set to invalid value to ensure a valid mode does get set - if(GetVerticalAlignmentEnumeration(value, alignment)) - { - impl.mController->SetVerticalAlignment(alignment); - DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p VERTICAL_ALIGNMENT %d\n", impl.mController.Get(), alignment); - } - break; - } - case Toolkit::TextField::Property::TEXT_COLOR: - { - const Vector4& textColor = value.Get(); - DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p TEXT_COLOR %f,%f,%f,%f\n", impl.mController.Get(), textColor.r, textColor.g, textColor.b, textColor.a); - - if(impl.mController->GetDefaultColor() != textColor) - { - impl.mController->SetDefaultColor(textColor); - impl.mController->SetInputColor(textColor); - impl.mRenderer.Reset(); - } - break; - } - case Toolkit::TextField::Property::PLACEHOLDER_TEXT_COLOR: - { - const Vector4& textColor = value.Get(); - DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p PLACEHOLDER_TEXT_COLOR %f,%f,%f,%f\n", impl.mController.Get(), textColor.r, textColor.g, textColor.b, textColor.a); - - if(impl.mController->GetPlaceholderTextColor() != textColor) - { - impl.mController->SetPlaceholderTextColor(textColor); - impl.mRenderer.Reset(); - } - break; - } - case Toolkit::TextField::Property::PRIMARY_CURSOR_COLOR: - { - const Vector4& color = value.Get(); - DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p PRIMARY_CURSOR_COLOR %f,%f,%f,%f\n", impl.mController.Get(), color.r, color.g, color.b, color.a); - - impl.mDecorator->SetCursorColor(PRIMARY_CURSOR, color); - impl.RequestTextRelayout(); - break; - } - case Toolkit::TextField::Property::SECONDARY_CURSOR_COLOR: - { - const Vector4& color = value.Get(); - DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p SECONDARY_CURSOR_COLOR %f,%f,%f,%f\n", impl.mController.Get(), color.r, color.g, color.b, color.a); - - impl.mDecorator->SetCursorColor(SECONDARY_CURSOR, color); - impl.RequestTextRelayout(); - break; - } - case Toolkit::TextField::Property::ENABLE_CURSOR_BLINK: - { - const bool enable = value.Get(); - DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField %p ENABLE_CURSOR_BLINK %d\n", impl.mController.Get(), enable); - - impl.mController->SetEnableCursorBlink(enable); - impl.RequestTextRelayout(); - break; - } - case Toolkit::TextField::Property::CURSOR_BLINK_INTERVAL: - { - const float interval = value.Get(); - DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField %p CURSOR_BLINK_INTERVAL %f\n", impl.mController.Get(), interval); - - impl.mDecorator->SetCursorBlinkInterval(interval); - break; - } - case Toolkit::TextField::Property::CURSOR_BLINK_DURATION: - { - const float duration = value.Get(); - DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField %p CURSOR_BLINK_DURATION %f\n", impl.mController.Get(), duration); - - impl.mDecorator->SetCursorBlinkDuration(duration); - break; - } - case Toolkit::TextField::Property::CURSOR_WIDTH: - { - const int width = value.Get(); - DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField %p CURSOR_WIDTH %d\n", impl.mController.Get(), width); - - impl.mDecorator->SetCursorWidth(width); - impl.mController->GetLayoutEngine().SetCursorWidth(width); - break; - } - case Toolkit::TextField::Property::GRAB_HANDLE_IMAGE: - { - const std::string imageFileName = value.Get(); - DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField %p GRAB_HANDLE_IMAGE %s\n", impl.mController.Get(), imageFileName.c_str()); - - if(imageFileName.size()) - { - impl.mDecorator->SetHandleImage(GRAB_HANDLE, HANDLE_IMAGE_RELEASED, imageFileName); - impl.RequestTextRelayout(); - } - break; - } - case Toolkit::TextField::Property::GRAB_HANDLE_PRESSED_IMAGE: - { - const std::string imageFileName = value.Get(); - DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField %p GRAB_HANDLE_PRESSED_IMAGE %s\n", impl.mController.Get(), imageFileName.c_str()); - - if(imageFileName.size()) - { - impl.mDecorator->SetHandleImage(GRAB_HANDLE, HANDLE_IMAGE_PRESSED, imageFileName); - impl.RequestTextRelayout(); - } - break; - } - case Toolkit::TextField::Property::SCROLL_THRESHOLD: - { - const float threshold = value.Get(); - DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField %p SCROLL_THRESHOLD %f\n", impl.mController.Get(), threshold); - - impl.mDecorator->SetScrollThreshold(threshold); - break; - } - case Toolkit::TextField::Property::SCROLL_SPEED: - { - const float speed = value.Get(); - DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField %p SCROLL_SPEED %f\n", impl.mController.Get(), speed); - - impl.mDecorator->SetScrollSpeed(speed); - break; - } - case Toolkit::TextField::Property::SELECTION_HANDLE_IMAGE_LEFT: - { - const std::string filename = GetImageFileNameFromPropertyValue(value); - - if(filename.size()) - { - impl.mDecorator->SetHandleImage(LEFT_SELECTION_HANDLE, HANDLE_IMAGE_RELEASED, filename); - impl.RequestTextRelayout(); - } - break; - } - case Toolkit::TextField::Property::SELECTION_HANDLE_IMAGE_RIGHT: - { - const std::string filename = GetImageFileNameFromPropertyValue(value); - - if(filename.size()) - { - impl.mDecorator->SetHandleImage(RIGHT_SELECTION_HANDLE, HANDLE_IMAGE_RELEASED, filename); - impl.RequestTextRelayout(); - } - break; - } - case Toolkit::TextField::Property::SELECTION_HANDLE_PRESSED_IMAGE_LEFT: - { - const std::string filename = GetImageFileNameFromPropertyValue(value); - - if(filename.size()) - { - impl.mDecorator->SetHandleImage(LEFT_SELECTION_HANDLE, HANDLE_IMAGE_PRESSED, filename); - impl.RequestTextRelayout(); - } - break; - } - case Toolkit::TextField::Property::SELECTION_HANDLE_PRESSED_IMAGE_RIGHT: - { - const std::string filename = GetImageFileNameFromPropertyValue(value); - - if(filename.size()) - { - impl.mDecorator->SetHandleImage(RIGHT_SELECTION_HANDLE, HANDLE_IMAGE_PRESSED, filename); - impl.RequestTextRelayout(); - } - break; - } - case Toolkit::TextField::Property::SELECTION_HANDLE_MARKER_IMAGE_LEFT: - { - const std::string filename = GetImageFileNameFromPropertyValue(value); - - if(filename.size()) - { - impl.mDecorator->SetHandleImage(LEFT_SELECTION_HANDLE_MARKER, HANDLE_IMAGE_RELEASED, filename); - impl.RequestTextRelayout(); - } - break; - } - case Toolkit::TextField::Property::SELECTION_HANDLE_MARKER_IMAGE_RIGHT: - { - const std::string filename = GetImageFileNameFromPropertyValue(value); - - if(filename.size()) - { - impl.mDecorator->SetHandleImage(RIGHT_SELECTION_HANDLE_MARKER, HANDLE_IMAGE_RELEASED, filename); - impl.RequestTextRelayout(); - } - break; - } - case Toolkit::TextField::Property::SELECTION_HIGHLIGHT_COLOR: - { - const Vector4 color = value.Get(); - DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p SELECTION_HIGHLIGHT_COLOR %f,%f,%f,%f\n", impl.mController.Get(), color.r, color.g, color.b, color.a); - - impl.mDecorator->SetHighlightColor(color); - impl.RequestTextRelayout(); - break; - } - case Toolkit::TextField::Property::DECORATION_BOUNDING_BOX: - { - const Rect box = value.Get >(); - DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p DECORATION_BOUNDING_BOX %d,%d %dx%d\n", impl.mController.Get(), box.x, box.y, box.width, box.height); - - impl.mDecorator->SetBoundingBox(box); - impl.RequestTextRelayout(); - break; - } - case Toolkit::TextField::Property::INPUT_METHOD_SETTINGS: - { - const Property::Map* map = value.GetMap(); - if(map) - { - impl.mInputMethodOptions.ApplyProperty(*map); - } - impl.mController->SetInputModePassword(impl.mInputMethodOptions.IsPassword()); - - Toolkit::Control control = Toolkit::KeyInputFocusManager::Get().GetCurrentFocusControl(); - if(control == textField) - { - impl.mInputMethodContext.ApplyOptions(impl.mInputMethodOptions); - } - break; - } - case Toolkit::TextField::Property::INPUT_COLOR: - { - const Vector4 inputColor = value.Get(); - DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p INPUT_COLOR %f,%f,%f,%f\n", impl.mController.Get(), inputColor.r, inputColor.g, inputColor.b, inputColor.a); - - impl.mController->SetInputColor(inputColor); - break; - } - case Toolkit::TextField::Property::ENABLE_MARKUP: - { - const bool enableMarkup = value.Get(); - DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p ENABLE_MARKUP %d\n", impl.mController.Get(), enableMarkup); - - impl.mController->SetMarkupProcessorEnabled(enableMarkup); - break; - } - case Toolkit::TextField::Property::INPUT_FONT_FAMILY: - { - const std::string& fontFamily = value.Get(); - DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p INPUT_FONT_FAMILY %s\n", impl.mController.Get(), fontFamily.c_str()); - impl.mController->SetInputFontFamily(fontFamily); - break; - } - case Toolkit::TextField::Property::INPUT_FONT_STYLE: - { - SetFontStyleProperty(impl.mController, value, Text::FontStyle::INPUT); - break; - } - case Toolkit::TextField::Property::INPUT_POINT_SIZE: - { - const float pointSize = value.Get(); - DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p INPUT_POINT_SIZE %f\n", impl.mController.Get(), pointSize); - impl.mController->SetInputFontPointSize(pointSize); - break; - } - case Toolkit::TextField::Property::UNDERLINE: - { - const bool update = SetUnderlineProperties(impl.mController, value, Text::EffectStyle::DEFAULT); - if(update) - { - impl.mRenderer.Reset(); - } - break; - } - case Toolkit::TextField::Property::INPUT_UNDERLINE: - { - const bool update = SetUnderlineProperties(impl.mController, value, Text::EffectStyle::INPUT); - if(update) - { - impl.mRenderer.Reset(); - } - break; - } - case Toolkit::TextField::Property::SHADOW: - { - const bool update = SetShadowProperties(impl.mController, value, Text::EffectStyle::DEFAULT); - if(update) - { - impl.mRenderer.Reset(); - } - break; - } - case Toolkit::TextField::Property::INPUT_SHADOW: - { - const bool update = SetShadowProperties(impl.mController, value, Text::EffectStyle::INPUT); - if(update) - { - impl.mRenderer.Reset(); - } - break; - } - case Toolkit::TextField::Property::EMBOSS: - { - const bool update = SetEmbossProperties(impl.mController, value, Text::EffectStyle::DEFAULT); - if(update) - { - impl.mRenderer.Reset(); - } - break; - } - case Toolkit::TextField::Property::INPUT_EMBOSS: - { - const bool update = SetEmbossProperties(impl.mController, value, Text::EffectStyle::INPUT); - if(update) - { - impl.mRenderer.Reset(); - } - break; - } - case Toolkit::TextField::Property::OUTLINE: - { - const bool update = SetOutlineProperties(impl.mController, value, Text::EffectStyle::DEFAULT); - if(update) - { - impl.mRenderer.Reset(); - } - break; - } - case Toolkit::TextField::Property::INPUT_OUTLINE: - { - const bool update = SetOutlineProperties(impl.mController, value, Text::EffectStyle::INPUT); - if(update) - { - impl.mRenderer.Reset(); - } - break; - } - case Toolkit::TextField::Property::HIDDEN_INPUT_SETTINGS: - { - const Property::Map* map = value.GetMap(); - if(map) - { - impl.mController->SetHiddenInputOption(*map); - } - break; - } - case Toolkit::TextField::Property::PIXEL_SIZE: - { - const float pixelSize = value.Get(); - DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p PIXEL_SIZE %f\n", impl.mController.Get(), pixelSize); - - if(!Equals(impl.mController->GetDefaultFontSize(Text::Controller::PIXEL_SIZE), pixelSize)) - { - impl.mController->SetDefaultFontSize(pixelSize, Text::Controller::PIXEL_SIZE); - } - break; - } - case Toolkit::TextField::Property::ENABLE_SELECTION: - { - const bool enableSelection = value.Get(); - DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p ENABLE_SELECTION %d\n", impl.mController.Get(), enableSelection); - impl.mController->SetSelectionEnabled(enableSelection); - break; - } - case Toolkit::TextField::Property::PLACEHOLDER: - { - const Property::Map* map = value.GetMap(); - if(map) - { - impl.mController->SetPlaceholderProperty(*map); - } - break; - } - case Toolkit::TextField::Property::ELLIPSIS: - { - const bool ellipsis = value.Get(); - DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p ELLIPSIS %d\n", impl.mController.Get(), ellipsis); - - impl.mController->SetTextElideEnabled(ellipsis); - break; - } - case Toolkit::DevelTextField::Property::ENABLE_SHIFT_SELECTION: - { - const bool shiftSelection = value.Get(); - DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p ENABLE_SHIFT_SELECTION %d\n", impl.mController.Get(), shiftSelection); - - impl.mController->SetShiftSelectionEnabled(shiftSelection); - break; - } - case Toolkit::DevelTextField::Property::ENABLE_GRAB_HANDLE: - { - const bool grabHandleEnabled = value.Get(); - DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p ENABLE_GRAB_HANDLE %d\n", impl.mController.Get(), grabHandleEnabled); - - impl.mController->SetGrabHandleEnabled(grabHandleEnabled); - break; - } - case Toolkit::DevelTextField::Property::MATCH_SYSTEM_LANGUAGE_DIRECTION: - { - impl.mController->SetMatchLayoutDirection(value.Get() ? DevelText::MatchLayoutDirection::LOCALE : DevelText::MatchLayoutDirection::CONTENTS); - break; - } - case Toolkit::DevelTextField::Property::ENABLE_GRAB_HANDLE_POPUP: - { - const bool grabHandlePopupEnabled = value.Get(); - DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p ENABLE_GRAB_HANDLE_POPUP %d\n", impl.mController.Get(), grabHandlePopupEnabled); - - impl.mController->SetGrabHandlePopupEnabled(grabHandlePopupEnabled); - break; - } - case Toolkit::DevelTextField::Property::BACKGROUND: - { - const Vector4 backgroundColor = value.Get(); - DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p BACKGROUND %f,%f,%f,%f\n", impl.mController.Get(), backgroundColor.r, backgroundColor.g, backgroundColor.b, backgroundColor.a); - - impl.mController->SetBackgroundEnabled(true); - impl.mController->SetBackgroundColor(backgroundColor); - break; - } - case Toolkit::DevelTextField::Property::SELECTED_TEXT_START: - { - uint32_t start = static_cast(value.Get()); - DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p SELECTED_TEXT_START %d\n", impl.mController.Get(), start); - impl.SetTextSelectionRange(&start, nullptr); - break; - } - case Toolkit::DevelTextField::Property::SELECTED_TEXT_END: - { - uint32_t end = static_cast(value.Get()); - DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p SELECTED_TEXT_END %d\n", impl.mController.Get(), end); - impl.SetTextSelectionRange(nullptr, &end); - break; - } - case Toolkit::DevelTextField::Property::ENABLE_EDITING: - { - const bool editable = value.Get(); - DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p ENABLE_EDITING %d\n", impl.mController.Get(), editable); - impl.SetEditable(editable); - break; - } - case Toolkit::DevelTextField::Property::FONT_SIZE_SCALE: - { - const float scale = value.Get(); - DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p FONT_SIZE_SCALE %f\n", impl.mController.Get(), scale); - - if(!Equals(impl.mController->GetFontSizeScale(), scale)) - { - impl.mController->SetFontSizeScale(scale); - } - break; - } - case Toolkit::DevelTextField::Property::PRIMARY_CURSOR_POSITION: - { - uint32_t position = static_cast(value.Get()); - DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p PRIMARY_CURSOR_POSITION %d\n", impl.mController.Get(), position); - if(impl.mController->SetPrimaryCursorPosition(position, impl.HasKeyInputFocus())) - { - impl.SetKeyInputFocus(); - } - break; - } - case Toolkit::DevelTextField::Property::GRAB_HANDLE_COLOR: - { - const Vector4 color = value.Get(); - DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p GRAB_HANDLE_COLOR %f,%f,%f,%f\n", impl.mController.Get(), color.r, color.g, color.b, color.a); - - impl.mDecorator->SetHandleColor(color); - impl.RequestTextRelayout(); - break; - } - case Toolkit::DevelTextField::Property::INPUT_FILTER: - { - const Property::Map* map = value.GetMap(); - if(map) - { - impl.mController->SetInputFilterOption(*map); - } - break; - } - case Toolkit::DevelTextField::Property::ELLIPSIS_POSITION: - { - DevelText::EllipsisPosition::Type ellipsisPositionType(static_cast(-1)); // Set to invalid value to ensure a valid mode does get set - if(GetEllipsisPositionTypeEnumeration(value, ellipsisPositionType)) - { - DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p EllipsisPosition::Type %d\n", impl.mController.Get(), ellipsisPositionType); - impl.mController->SetEllipsisPosition(ellipsisPositionType); - } - break; - } - } // switch - } // textfield + PropertyHandler::SetProperty(textField, index, value); + } } Property::Value TextField::GetProperty(BaseObject* object, Property::Index index) @@ -801,362 +244,7 @@ Property::Value TextField::GetProperty(BaseObject* object, Property::Index index if(textField) { - TextField& impl(GetImpl(textField)); - DALI_ASSERT_DEBUG(impl.mController && "No text contoller"); - DALI_ASSERT_DEBUG(impl.mDecorator && "No text decorator"); - - switch(index) - { - case Toolkit::DevelTextField::Property::RENDERING_BACKEND: - { - value = impl.mRenderingBackend; - break; - } - case Toolkit::TextField::Property::TEXT: - { - std::string text; - impl.mController->GetText(text); - DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p returning text: %s\n", impl.mController.Get(), text.c_str()); - value = text; - break; - } - case Toolkit::TextField::Property::PLACEHOLDER_TEXT: - { - std::string text; - impl.mController->GetPlaceholderText(Controller::PLACEHOLDER_TYPE_INACTIVE, text); - value = text; - break; - } - case Toolkit::TextField::Property::PLACEHOLDER_TEXT_FOCUSED: - { - std::string text; - impl.mController->GetPlaceholderText(Controller::PLACEHOLDER_TYPE_ACTIVE, text); - value = text; - break; - } - case Toolkit::TextField::Property::FONT_FAMILY: - { - value = impl.mController->GetDefaultFontFamily(); - break; - } - case Toolkit::TextField::Property::FONT_STYLE: - { - GetFontStyleProperty(impl.mController, value, Text::FontStyle::DEFAULT); - break; - } - case Toolkit::TextField::Property::POINT_SIZE: - { - value = impl.mController->GetDefaultFontSize(Text::Controller::POINT_SIZE); - break; - } - case Toolkit::TextField::Property::MAX_LENGTH: - { - value = impl.mController->GetMaximumNumberOfCharacters(); - break; - } - case Toolkit::TextField::Property::EXCEED_POLICY: - { - value = impl.mExceedPolicy; - break; - } - case Toolkit::TextField::Property::HORIZONTAL_ALIGNMENT: - { - const char* name = Text::GetHorizontalAlignmentString(impl.mController->GetHorizontalAlignment()); - - if(name) - { - value = std::string(name); - } - break; - } - case Toolkit::TextField::Property::VERTICAL_ALIGNMENT: - { - const char* name = Text::GetVerticalAlignmentString(impl.mController->GetVerticalAlignment()); - - if(name) - { - value = std::string(name); - } - break; - } - case Toolkit::TextField::Property::TEXT_COLOR: - { - value = impl.mController->GetDefaultColor(); - break; - } - case Toolkit::TextField::Property::PLACEHOLDER_TEXT_COLOR: - { - value = impl.mController->GetPlaceholderTextColor(); - break; - } - case Toolkit::TextField::Property::PRIMARY_CURSOR_COLOR: - { - value = impl.mDecorator->GetColor(PRIMARY_CURSOR); - break; - } - case Toolkit::TextField::Property::SECONDARY_CURSOR_COLOR: - { - value = impl.mDecorator->GetColor(SECONDARY_CURSOR); - break; - } - case Toolkit::TextField::Property::ENABLE_CURSOR_BLINK: - { - value = impl.mController->GetEnableCursorBlink(); - break; - } - case Toolkit::TextField::Property::CURSOR_BLINK_INTERVAL: - { - value = impl.mDecorator->GetCursorBlinkInterval(); - break; - } - case Toolkit::TextField::Property::CURSOR_BLINK_DURATION: - { - value = impl.mDecorator->GetCursorBlinkDuration(); - break; - } - case Toolkit::TextField::Property::CURSOR_WIDTH: - { - value = impl.mDecorator->GetCursorWidth(); - break; - } - case Toolkit::TextField::Property::GRAB_HANDLE_IMAGE: - { - value = impl.mDecorator->GetHandleImage(GRAB_HANDLE, HANDLE_IMAGE_RELEASED); - break; - } - case Toolkit::TextField::Property::GRAB_HANDLE_PRESSED_IMAGE: - { - value = impl.mDecorator->GetHandleImage(GRAB_HANDLE, HANDLE_IMAGE_PRESSED); - break; - } - case Toolkit::TextField::Property::SCROLL_THRESHOLD: - { - value = impl.mDecorator->GetScrollThreshold(); - break; - } - case Toolkit::TextField::Property::SCROLL_SPEED: - { - value = impl.mDecorator->GetScrollSpeed(); - break; - } - case Toolkit::TextField::Property::SELECTION_HANDLE_IMAGE_LEFT: - { - impl.GetHandleImagePropertyValue(value, LEFT_SELECTION_HANDLE, HANDLE_IMAGE_RELEASED); - break; - } - case Toolkit::TextField::Property::SELECTION_HANDLE_IMAGE_RIGHT: - { - impl.GetHandleImagePropertyValue(value, RIGHT_SELECTION_HANDLE, HANDLE_IMAGE_RELEASED); - break; - } - case Toolkit::TextField::Property::SELECTION_HANDLE_PRESSED_IMAGE_LEFT: - { - impl.GetHandleImagePropertyValue(value, LEFT_SELECTION_HANDLE, HANDLE_IMAGE_PRESSED); - break; - } - case Toolkit::TextField::Property::SELECTION_HANDLE_PRESSED_IMAGE_RIGHT: - { - impl.GetHandleImagePropertyValue(value, RIGHT_SELECTION_HANDLE, HANDLE_IMAGE_PRESSED); - break; - } - case Toolkit::TextField::Property::SELECTION_HANDLE_MARKER_IMAGE_LEFT: - { - impl.GetHandleImagePropertyValue(value, LEFT_SELECTION_HANDLE_MARKER, HANDLE_IMAGE_RELEASED); - break; - } - case Toolkit::TextField::Property::SELECTION_HANDLE_MARKER_IMAGE_RIGHT: - { - impl.GetHandleImagePropertyValue(value, RIGHT_SELECTION_HANDLE_MARKER, HANDLE_IMAGE_RELEASED); - break; - } - case Toolkit::TextField::Property::SELECTION_HIGHLIGHT_COLOR: - { - value = impl.mDecorator->GetHighlightColor(); - break; - } - case Toolkit::TextField::Property::DECORATION_BOUNDING_BOX: - { - Rect boundingBox; - impl.mDecorator->GetBoundingBox(boundingBox); - value = boundingBox; - break; - } - case Toolkit::TextField::Property::INPUT_METHOD_SETTINGS: - { - Property::Map map; - impl.mInputMethodOptions.RetrieveProperty(map); - value = map; - break; - } - case Toolkit::TextField::Property::INPUT_COLOR: - { - value = impl.mController->GetInputColor(); - break; - } - case Toolkit::TextField::Property::ENABLE_MARKUP: - { - value = impl.mController->IsMarkupProcessorEnabled(); - break; - } - case Toolkit::TextField::Property::INPUT_FONT_FAMILY: - { - value = impl.mController->GetInputFontFamily(); - break; - } - case Toolkit::TextField::Property::INPUT_FONT_STYLE: - { - GetFontStyleProperty(impl.mController, value, Text::FontStyle::INPUT); - break; - } - case Toolkit::TextField::Property::INPUT_POINT_SIZE: - { - value = impl.mController->GetInputFontPointSize(); - break; - } - case Toolkit::TextField::Property::UNDERLINE: - { - GetUnderlineProperties(impl.mController, value, Text::EffectStyle::DEFAULT); - break; - } - case Toolkit::TextField::Property::INPUT_UNDERLINE: - { - GetUnderlineProperties(impl.mController, value, Text::EffectStyle::INPUT); - break; - } - case Toolkit::TextField::Property::SHADOW: - { - GetShadowProperties(impl.mController, value, Text::EffectStyle::DEFAULT); - break; - } - case Toolkit::TextField::Property::INPUT_SHADOW: - { - GetShadowProperties(impl.mController, value, Text::EffectStyle::INPUT); - break; - } - case Toolkit::TextField::Property::EMBOSS: - { - GetEmbossProperties(impl.mController, value, Text::EffectStyle::DEFAULT); - break; - } - case Toolkit::TextField::Property::INPUT_EMBOSS: - { - GetEmbossProperties(impl.mController, value, Text::EffectStyle::INPUT); - break; - } - case Toolkit::TextField::Property::OUTLINE: - { - GetOutlineProperties(impl.mController, value, Text::EffectStyle::DEFAULT); - break; - } - case Toolkit::TextField::Property::INPUT_OUTLINE: - { - GetOutlineProperties(impl.mController, value, Text::EffectStyle::INPUT); - break; - } - case Toolkit::TextField::Property::HIDDEN_INPUT_SETTINGS: - { - Property::Map map; - impl.mController->GetHiddenInputOption(map); - value = map; - break; - } - case Toolkit::TextField::Property::PIXEL_SIZE: - { - value = impl.mController->GetDefaultFontSize(Text::Controller::PIXEL_SIZE); - break; - } - case Toolkit::TextField::Property::ENABLE_SELECTION: - { - value = impl.mController->IsSelectionEnabled(); - break; - } - case Toolkit::TextField::Property::PLACEHOLDER: - { - Property::Map map; - impl.mController->GetPlaceholderProperty(map); - value = map; - break; - } - case Toolkit::TextField::Property::ELLIPSIS: - { - value = impl.mController->IsTextElideEnabled(); - break; - } - case Toolkit::DevelTextField::Property::ENABLE_SHIFT_SELECTION: - { - value = impl.mController->IsShiftSelectionEnabled(); - break; - } - case Toolkit::DevelTextField::Property::ENABLE_GRAB_HANDLE: - { - value = impl.mController->IsGrabHandleEnabled(); - break; - } - case Toolkit::DevelTextField::Property::MATCH_SYSTEM_LANGUAGE_DIRECTION: - { - value = impl.mController->GetMatchLayoutDirection() != DevelText::MatchLayoutDirection::CONTENTS; - break; - } - case Toolkit::DevelTextField::Property::ENABLE_GRAB_HANDLE_POPUP: - { - value = impl.mController->IsGrabHandlePopupEnabled(); - break; - } - case Toolkit::DevelTextField::Property::BACKGROUND: - { - value = impl.mController->GetBackgroundColor(); - break; - } - case Toolkit::DevelTextField::Property::SELECTED_TEXT: - { - value = impl.mController->GetSelectedText(); - break; - } - case Toolkit::DevelTextField::Property::SELECTED_TEXT_START: - { - Uint32Pair range = impl.GetTextSelectionRange(); - value = static_cast(range.first); - break; - } - case Toolkit::DevelTextField::Property::SELECTED_TEXT_END: - { - Uint32Pair range = impl.GetTextSelectionRange(); - value = static_cast(range.second); - break; - } - case Toolkit::DevelTextField::Property::ENABLE_EDITING: - { - value = impl.IsEditable(); - break; - } - case Toolkit::DevelTextField::Property::FONT_SIZE_SCALE: - { - value = impl.mController->GetFontSizeScale(); - break; - } - case Toolkit::DevelTextField::Property::PRIMARY_CURSOR_POSITION: - { - value = static_cast(impl.mController->GetPrimaryCursorPosition()); - break; - } - case Toolkit::DevelTextField::Property::GRAB_HANDLE_COLOR: - { - value = impl.mDecorator->GetHandleColor(); - break; - } - case Toolkit::DevelTextField::Property::INPUT_FILTER: - { - Property::Map map; - impl.mController->GetInputFilterOption(map); - value = map; - break; - } - case Toolkit::DevelTextField::Property::ELLIPSIS_POSITION: - { - value = impl.mController->GetEllipsisPosition(); - break; - } - } //switch + value = PropertyHandler::GetProperty(textField, index); } return value; @@ -1310,6 +398,14 @@ bool TextField::DoConnectSignal(BaseObject* object, ConnectionTrackerInterface* fieldImpl.SelectionClearedSignal().Connect(tracker, functor); } } + else if(0 == strcmp(signalName.c_str(), SIGNAL_SELECTION_STARTED)) + { + if(field) + { + Internal::TextField& fieldImpl(GetImpl(field)); + fieldImpl.SelectionStartedSignal().Connect(tracker, functor); + } + } else { // signalName does not match any signal @@ -1356,7 +452,17 @@ DevelTextField::SelectionChangedSignalType& TextField::SelectionChangedSignal() DevelTextField::SelectionClearedSignalType& TextField::SelectionClearedSignal() { - return mSelectionClearedSignal; + return mSelectionClearedSignal; +} + +DevelTextField::SelectionStartedSignalType& TextField::SelectionStartedSignal() +{ + return mSelectionStartedSignal; +} + +void TextField::OnAccessibilityStatusChanged() +{ + CommonTextUtils::SynchronizeTextAnchorsInParent(Self(), mController, mAnchorActors); } void TextField::OnInitialize() @@ -1401,6 +507,7 @@ void TextField::OnInitialize() // Forward input events to controller EnableGestureDetection(static_cast(GestureType::TAP | GestureType::PAN | GestureType::LONG_PRESS)); GetTapGestureDetector().SetMaximumTapsRequired(2); + GetTapGestureDetector().ReceiveAllTapEvents(true); self.TouchedSignal().Connect(this, &TextField::OnTouched); @@ -1422,9 +529,6 @@ void TextField::OnInitialize() self.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::HEIGHT); self.OnSceneSignal().Connect(this, &TextField::OnSceneConnect); - //Enable highightability - self.SetProperty(Toolkit::DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE, true); - DevelControl::SetInputMethodContext(*this, mInputMethodContext); if(Dali::Toolkit::TextField::EXCEED_POLICY_CLIP == mExceedPolicy) @@ -1432,21 +536,28 @@ void TextField::OnInitialize() EnableClipping(); } - DevelControl::SetAccessibilityConstructor(self, [](Dali::Actor actor) { - return std::unique_ptr( - new AccessibleImpl(actor, Dali::Accessibility::Role::ENTRY)); - }); + // Accessibility + self.SetProperty(DevelControl::Property::ACCESSIBILITY_ROLE, Dali::Accessibility::Role::ENTRY); + self.SetProperty(DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE, true); + + Accessibility::Bridge::EnabledSignal().Connect(this, &TextField::OnAccessibilityStatusChanged); + Accessibility::Bridge::DisabledSignal().Connect(this, &TextField::OnAccessibilityStatusChanged); +} + +DevelControl::ControlAccessible* TextField::CreateAccessibleObject() +{ + return new TextFieldAccessible(Self()); } void TextField::OnStyleChange(Toolkit::StyleManager styleManager, StyleChange::Type change) { - DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField::OnStyleChange\n"); + DALI_LOG_INFO(gTextFieldLogFilter, Debug::Verbose, "TextField::OnStyleChange\n"); switch(change) { case StyleChange::DEFAULT_FONT_CHANGE: { - DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField::OnStyleChange DEFAULT_FONT_CHANGE\n"); + DALI_LOG_INFO(gTextFieldLogFilter, Debug::Verbose, "TextField::OnStyleChange DEFAULT_FONT_CHANGE\n"); const std::string& newFont = GetImpl(styleManager).GetDefaultFontFamily(); // Property system did not set the font so should update it. mController->UpdateAfterFontChange(newFont); @@ -1498,9 +609,34 @@ void TextField::ResizeActor(Actor& actor, const Vector2& size) } } +void TextField::OnPropertySet(Property::Index index, const Property::Value& propertyValue) +{ + DALI_LOG_INFO(gTextFieldLogFilter, Debug::Verbose, "TextField::OnPropertySet index[%d]\n", index); + + switch(index) + { + case DevelActor::Property::USER_INTERACTION_ENABLED: + { + const bool enabled = propertyValue.Get(); + mController->SetUserInteractionEnabled(enabled); + if(mStencil) + { + float opacity = enabled ? 1.0f : mController->GetDisabledColorOpacity(); + mStencil.SetProperty(Actor::Property::OPACITY, opacity); + } + break; + } + default: + { + Control::OnPropertySet(index, propertyValue); // up call to control for non-handled properties + break; + } + } +} + void TextField::OnRelayout(const Vector2& size, RelayoutContainer& container) { - DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField OnRelayout\n"); + DALI_LOG_INFO(gTextFieldLogFilter, Debug::Verbose, "TextField OnRelayout\n"); Actor self = Self(); @@ -1527,6 +663,11 @@ void TextField::OnRelayout(const Vector2& size, RelayoutContainer& container) mActiveLayer.SetProperty(Actor::Property::POSITION, Vector2(padding.start, padding.top)); ResizeActor(mActiveLayer, contentSize); } + if(mCursorLayer) + { + mCursorLayer.SetProperty(Actor::Property::POSITION, Vector2(padding.start, padding.top)); + ResizeActor(mCursorLayer, contentSize); + } // If there is text changed, callback is called. if(mTextChanged) @@ -1539,7 +680,7 @@ void TextField::OnRelayout(const Vector2& size, RelayoutContainer& container) if((Text::Controller::NONE_UPDATED != updateTextType) || !mRenderer) { - DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField::OnRelayout %p Displaying new contents\n", mController.Get()); + DALI_LOG_INFO(gTextFieldLogFilter, Debug::Verbose, "TextField::OnRelayout %p Displaying new contents\n", mController.Get()); if(mDecorator && (Text::Controller::NONE_UPDATED != (Text::Controller::DECORATOR_UPDATED & updateTextType))) @@ -1560,6 +701,11 @@ void TextField::OnRelayout(const Vector2& size, RelayoutContainer& container) EmitCursorPositionChangedSignal(); } + if(mSelectionStarted) + { + EmitSelectionStartedSignal(); + } + if(mSelectionChanged) { EmitSelectionChangedSignal(); @@ -1597,106 +743,12 @@ Text::ControllerPtr TextField::GetTextController() void TextField::RenderText(Text::Controller::UpdateTextType updateTextType) { - Actor renderableActor; - - if(Text::Controller::NONE_UPDATED != (Text::Controller::MODEL_UPDATED & updateTextType)) - { - if(mRenderer) - { - Dali::Toolkit::TextField handle = Dali::Toolkit::TextField(GetOwner()); - - renderableActor = mRenderer->Render(mController->GetView(), - handle, - Property::INVALID_INDEX, // Animatable property not supported - mAlignmentOffset, - DepthIndex::CONTENT); - } - - if(renderableActor != mRenderableActor) - { - UnparentAndReset(mBackgroundActor); - UnparentAndReset(mRenderableActor); - mRenderableActor = renderableActor; - - if(mRenderableActor) - { - mBackgroundActor = mController->CreateBackgroundActor(); - } - } - } - - if(mRenderableActor) - { - const Vector2& scrollOffset = mController->GetTextModel()->GetScrollPosition(); - - float renderableActorPositionX, renderableActorPositionY; - - if(mStencil) - { - renderableActorPositionX = scrollOffset.x + mAlignmentOffset; - renderableActorPositionY = scrollOffset.y; - } - else - { - Extents padding; - padding = Self().GetProperty(Toolkit::Control::Property::PADDING); - - // Support Right-To-Left of padding - Dali::LayoutDirection::Type layoutDirection = static_cast(Self().GetProperty(Dali::Actor::Property::LAYOUT_DIRECTION).Get()); - if(Dali::LayoutDirection::RIGHT_TO_LEFT == layoutDirection) - { - std::swap(padding.start, padding.end); - } - - renderableActorPositionX = scrollOffset.x + mAlignmentOffset + padding.start; - renderableActorPositionY = scrollOffset.y + padding.top; - } - - mRenderableActor.SetProperty(Actor::Property::POSITION, Vector2(renderableActorPositionX, renderableActorPositionY)); - - // Make sure the actors are parented correctly with/without clipping - Actor self = mStencil ? mStencil : Self(); - - Actor highlightActor; - - for(std::vector::iterator it = mClippingDecorationActors.begin(), - endIt = mClippingDecorationActors.end(); - it != endIt; - ++it) - { - self.Add(*it); - it->LowerToBottom(); - - if(it->GetProperty(Dali::Actor::Property::NAME) == "HighlightActor") - { - highlightActor = *it; - } - } - mClippingDecorationActors.clear(); - - self.Add(mRenderableActor); - - if(mBackgroundActor) - { - if(mDecorator && mDecorator->IsHighlightVisible()) - { - self.Add(mBackgroundActor); - mBackgroundActor.SetProperty(Actor::Property::POSITION, Vector2(renderableActorPositionX, renderableActorPositionY)); // In text field's coords. - mBackgroundActor.LowerBelow(highlightActor); - } - else - { - mRenderableActor.Add(mBackgroundActor); - mBackgroundActor.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 0.0f)); // In renderable actor's coords. - mBackgroundActor.LowerToBottom(); - } - } - } + CommonTextUtils::RenderText(Self(), mRenderer, mController, mDecorator, mAlignmentOffset, mRenderableActor, mBackgroundActor, mCursorLayer, mStencil, mClippingDecorationActors, mAnchorActors, updateTextType); } void TextField::OnKeyInputFocusGained() { - DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField::OnKeyInputFocusGained %p\n", mController.Get()); + DALI_LOG_INFO(gTextFieldLogFilter, Debug::Verbose, "TextField::OnKeyInputFocusGained %p\n", mController.Get()); if(mInputMethodContext && IsEditable()) { // All input panel properties, such as layout, return key type, and input hint, should be set before input panel activates (or shows). @@ -1720,14 +772,17 @@ void TextField::OnKeyInputFocusGained() notifier.ContentSelectedSignal().Connect(this, &TextField::OnClipboardTextSelected); } - mController->KeyboardFocusGainEvent(); // Called in the case of no virtual keyboard to trigger this event + if(IsEditable() && mController->IsUserInteractionEnabled()) + { + mController->KeyboardFocusGainEvent(); // Called in the case of no virtual keyboard to trigger this event + } EmitKeyInputFocusSignal(true); // Calls back into the Control hence done last. } void TextField::OnKeyInputFocusLost() { - DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField:OnKeyInputFocusLost %p\n", mController.Get()); + DALI_LOG_INFO(gTextFieldLogFilter, Debug::Verbose, "TextField:OnKeyInputFocusLost %p\n", mController.Get()); if(mInputMethodContext) { mInputMethodContext.StatusChangedSignal().Disconnect(this, &TextField::KeyboardStatusChanged); @@ -1759,7 +814,7 @@ bool TextField::OnAccessibilityActivated() void TextField::OnTap(const TapGesture& gesture) { - DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField::OnTap %p\n", mController.Get()); + DALI_LOG_INFO(gTextFieldLogFilter, Debug::Verbose, "TextField::OnTap %p\n", mController.Get()); if(mInputMethodContext && IsEditable()) { mInputMethodContext.Activate(); @@ -1771,12 +826,21 @@ void TextField::OnTap(const TapGesture& gesture) mController->TapEvent(gesture.GetNumberOfTaps(), localPoint.x - padding.start, localPoint.y - padding.top); mController->AnchorEvent(localPoint.x - padding.start, localPoint.y - padding.top); + Dali::Toolkit::KeyboardFocusManager keyboardFocusManager = Dali::Toolkit::KeyboardFocusManager::Get(); + if (keyboardFocusManager) + { + keyboardFocusManager.SetCurrentFocusActor(Self()); + } SetKeyInputFocus(); } void TextField::OnPan(const PanGesture& gesture) { mController->PanEvent(gesture.GetState(), gesture.GetDisplacement()); + if(gesture.GetState() == GestureState::STARTED && !mController->IsScrollable(gesture.GetDisplacement())) + { + Dali::DevelActor::SetNeedGesturePropagation(Self(), true); + } } void TextField::OnLongPress(const LongPressGesture& gesture) @@ -1795,13 +859,18 @@ void TextField::OnLongPress(const LongPressGesture& gesture) bool TextField::OnKeyEvent(const KeyEvent& event) { - DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField::OnKeyEvent %p keyCode %d\n", mController.Get(), event.GetKeyCode()); + DALI_LOG_INFO(gTextFieldLogFilter, Debug::Verbose, "TextField::OnKeyEvent %p keyCode %d\n", mController.Get(), event.GetKeyCode()); if(Dali::DALI_KEY_ESCAPE == event.GetKeyCode() && mController->ShouldClearFocusOnEscape()) { // Make sure ClearKeyInputFocus when only key is up if(event.GetState() == KeyEvent::UP) { + Dali::Toolkit::KeyboardFocusManager keyboardFocusManager = Dali::Toolkit::KeyboardFocusManager::Get(); + if (keyboardFocusManager) + { + keyboardFocusManager.ClearFocus(); + } ClearKeyInputFocus(); } @@ -1837,26 +906,17 @@ void TextField::SetEditable(bool editable) void TextField::TextInserted(unsigned int position, unsigned int length, const std::string& content) { - if(Accessibility::IsUp()) - { - Control::Impl::GetAccessibilityObject(Self())->EmitTextInserted(position, length, content); - } + GetAccessibleObject()->EmitTextInserted(position, length, content); } void TextField::TextDeleted(unsigned int position, unsigned int length, const std::string& content) { - if(Accessibility::IsUp()) - { - Control::Impl::GetAccessibilityObject(Self())->EmitTextDeleted(position, length, content); - } + GetAccessibleObject()->EmitTextDeleted(position, length, content); } void TextField::CursorPositionChanged(unsigned int oldPosition, unsigned int newPosition) { - if(Accessibility::IsUp()) - { - Control::Impl::GetAccessibilityObject(Self())->EmitTextCursorMoved(newPosition); - } + GetAccessibleObject()->EmitTextCursorMoved(newPosition); if((oldPosition != newPosition) && !mCursorPositionChanged) { @@ -1893,51 +953,7 @@ void TextField::MaxLengthReached() void TextField::InputStyleChanged(Text::InputStyle::Mask inputStyleMask) { Dali::Toolkit::TextField handle(GetOwner()); - - Toolkit::TextField::InputStyle::Mask fieldInputStyleMask = Toolkit::TextField::InputStyle::NONE; - - if(InputStyle::NONE != static_cast(inputStyleMask & InputStyle::INPUT_COLOR)) - { - fieldInputStyleMask = static_cast(fieldInputStyleMask | Toolkit::TextField::InputStyle::COLOR); - } - if(InputStyle::NONE != static_cast(inputStyleMask & InputStyle::INPUT_FONT_FAMILY)) - { - fieldInputStyleMask = static_cast(fieldInputStyleMask | Toolkit::TextField::InputStyle::FONT_FAMILY); - } - if(InputStyle::NONE != static_cast(inputStyleMask & InputStyle::INPUT_POINT_SIZE)) - { - fieldInputStyleMask = static_cast(fieldInputStyleMask | Toolkit::TextField::InputStyle::POINT_SIZE); - } - if(InputStyle::NONE != static_cast(inputStyleMask & InputStyle::INPUT_FONT_WEIGHT)) - { - fieldInputStyleMask = static_cast(fieldInputStyleMask | Toolkit::TextField::InputStyle::FONT_STYLE); - } - if(InputStyle::NONE != static_cast(inputStyleMask & InputStyle::INPUT_FONT_WIDTH)) - { - fieldInputStyleMask = static_cast(fieldInputStyleMask | Toolkit::TextField::InputStyle::FONT_STYLE); - } - if(InputStyle::NONE != static_cast(inputStyleMask & InputStyle::INPUT_FONT_SLANT)) - { - fieldInputStyleMask = static_cast(fieldInputStyleMask | Toolkit::TextField::InputStyle::FONT_STYLE); - } - if(InputStyle::NONE != static_cast(inputStyleMask & InputStyle::INPUT_UNDERLINE)) - { - fieldInputStyleMask = static_cast(fieldInputStyleMask | Toolkit::TextField::InputStyle::UNDERLINE); - } - if(InputStyle::NONE != static_cast(inputStyleMask & InputStyle::INPUT_SHADOW)) - { - fieldInputStyleMask = static_cast(fieldInputStyleMask | Toolkit::TextField::InputStyle::SHADOW); - } - if(InputStyle::NONE != static_cast(inputStyleMask & InputStyle::INPUT_EMBOSS)) - { - fieldInputStyleMask = static_cast(fieldInputStyleMask | Toolkit::TextField::InputStyle::EMBOSS); - } - if(InputStyle::NONE != static_cast(inputStyleMask & InputStyle::INPUT_OUTLINE)) - { - fieldInputStyleMask = static_cast(fieldInputStyleMask | Toolkit::TextField::InputStyle::OUTLINE); - } - - mInputStyleChangedSignal.Emit(handle, fieldInputStyleMask); + mInputStyleChangedSignal.Emit(handle, ConvertInputStyle(inputStyleMask)); } void TextField::AnchorClicked(const std::string& href) @@ -1973,6 +989,13 @@ void TextField::EmitSelectionClearedSignal() mSelectionCleared = false; } +void TextField::EmitSelectionStartedSignal() +{ + Dali::Toolkit::TextField handle(GetOwner()); + mSelectionStartedSignal.Emit(handle); + mSelectionStarted = false; +} + void TextField::SelectionChanged(uint32_t oldStart, uint32_t oldEnd, uint32_t newStart, uint32_t newEnd) { if(((oldStart != newStart) || (oldEnd != newEnd)) && !mSelectionChanged) @@ -1981,6 +1004,13 @@ void TextField::SelectionChanged(uint32_t oldStart, uint32_t oldEnd, uint32_t ne { mSelectionCleared = true; } + else + { + if(oldStart == oldEnd) + { + mSelectionStarted = true; + } + } mSelectionChanged = true; mOldSelectionStart = oldStart; @@ -1996,7 +1026,7 @@ void TextField::SelectionChanged(uint32_t oldStart, uint32_t oldEnd, uint32_t ne } } -void TextField::AddDecoration(Actor& actor, bool needsClipping) +void TextField::AddDecoration(Actor& actor, DecorationType type, bool needsClipping) { if(actor) { @@ -2004,16 +1034,27 @@ void TextField::AddDecoration(Actor& actor, bool needsClipping) { mClippingDecorationActors.push_back(actor); } - else + + // If the actor is a layer type, add it. + if(type == DecorationType::ACTIVE_LAYER) + { + AddLayer(mActiveLayer, actor); + } + else if(type == DecorationType::CURSOR_LAYER) { - actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT); - actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT); - Self().Add(actor); - mActiveLayer = actor; + AddLayer(mCursorLayer, actor); } } } +void TextField::AddLayer(Actor& layer, Actor& actor) +{ + actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT); + actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT); + Self().Add(actor); + layer = actor; +} + void TextField::GetControlBackgroundColor(Vector4& color) const { Property::Value propValue = Self().GetProperty(Toolkit::Control::Property::BACKGROUND); @@ -2040,7 +1081,7 @@ void TextField::OnSceneConnect(Dali::Actor actor) InputMethodContext::CallbackData TextField::OnInputMethodContextEvent(Dali::InputMethodContext& inputMethodContext, const InputMethodContext::EventData& inputMethodContextEvent) { - DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField::OnInputMethodContextEvent %p eventName %d\n", mController.Get(), inputMethodContextEvent.eventName); + DALI_LOG_INFO(gTextFieldLogFilter, Debug::Verbose, "TextField::OnInputMethodContextEvent %p eventName %d\n", mController.Get(), inputMethodContextEvent.eventName); return mController->OnInputMethodContextEvent(inputMethodContext, inputMethodContextEvent); } @@ -2049,8 +1090,9 @@ void TextField::GetHandleImagePropertyValue(Property::Value& value, Text::Handle if(mDecorator) { Property::Map map; - map[IMAGE_MAP_FILENAME_STRING] = mDecorator->GetHandleImage(handleType, handleImageType); - value = map; + map[PropertyHandler::IMAGE_MAP_FILENAME_STRING] = mDecorator->GetHandleImage(handleType, handleImageType); + + value = map; } } @@ -2082,7 +1124,7 @@ void TextField::OnClipboardTextSelected(ClipboardEventNotifier& clipboard) void TextField::KeyboardStatusChanged(bool keyboardShown) { - DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField::KeyboardStatusChanged %p keyboardShown %d\n", mController.Get(), keyboardShown); + DALI_LOG_INFO(gTextFieldLogFilter, Debug::Verbose, "TextField::KeyboardStatusChanged %p keyboardShown %d\n", mController.Get(), keyboardShown); // Just hide the grab handle when keyboard is hidden. if(!keyboardShown) @@ -2135,7 +1177,11 @@ TextField::TextField() mTextChanged(false), mCursorPositionChanged(false), mSelectionChanged(false), - mSelectionCleared(false) + mSelectionCleared(false), + mOldPosition(0u), + mOldSelectionStart(0u), + mOldSelectionEnd(0u), + mSelectionStarted(false) { } @@ -2149,275 +1195,69 @@ TextField::~TextField() } } -std::string TextField::AccessibleImpl::GetName() -{ - auto self = Toolkit::TextField::DownCast(Self()); - return self.GetProperty(Toolkit::TextField::Property::TEXT).Get(); -} - -std::string TextField::AccessibleImpl::GetText(size_t startOffset, size_t endOffset) -{ - if(endOffset <= startOffset) - { - return {}; - } - - auto self = Toolkit::TextField::DownCast(Self()); - auto text = self.GetProperty(Toolkit::TextField::Property::TEXT).Get(); - - if(startOffset > text.size() || endOffset > text.size()) - { - return {}; - } - - return text.substr(startOffset, endOffset - startOffset); -} - -size_t TextField::AccessibleImpl::GetCharacterCount() -{ - auto self = Toolkit::TextField::DownCast(Self()); - auto text = self.GetProperty(Toolkit::TextField::Property::TEXT).Get(); - - return text.size(); -} - -size_t TextField::AccessibleImpl::GetCursorOffset() -{ - auto self = Toolkit::TextField::DownCast(Self()); - return Dali::Toolkit::GetImpl(self).GetTextController()->GetCursorPosition(); -} - -bool TextField::AccessibleImpl::SetCursorOffset(size_t offset) +Vector TextField::GetTextSize(const uint32_t startIndex, const uint32_t endIndex) const { - auto self = Toolkit::TextField::DownCast(Self()); - auto text = self.GetProperty(Toolkit::TextField::Property::TEXT).Get(); - if(offset > text.size()) - { - return false; - } - - auto& selfImpl = Dali::Toolkit::GetImpl(self); - selfImpl.GetTextController()->ResetCursorPosition(offset); - selfImpl.RequestTextRelayout(); - - return true; + return mController->GetTextSize(startIndex, endIndex); } -Dali::Accessibility::Range TextField::AccessibleImpl::GetTextAtOffset( - size_t offset, Dali::Accessibility::TextBoundary boundary) +Vector TextField::GetTextPosition(const uint32_t startIndex, const uint32_t endIndex) const { - auto self = Toolkit::TextField::DownCast(Self()); - auto text = self.GetProperty(Toolkit::TextField::Property::TEXT).Get(); - auto textSize = text.size(); - - auto range = Dali::Accessibility::Range{}; - - switch(boundary) - { - case Dali::Accessibility::TextBoundary::CHARACTER: - { - if(offset < textSize) - { - range.content = text[offset]; - range.startOffset = offset; - range.endOffset = offset + 1; - } - break; - } - case Dali::Accessibility::TextBoundary::WORD: - case Dali::Accessibility::TextBoundary::LINE: - { - auto textString = text.c_str(); - auto breaks = std::vector(textSize, 0); - - if(boundary == Dali::Accessibility::TextBoundary::WORD) - { - Accessibility::Accessible::FindWordSeparationsUtf8(reinterpret_cast(textString), textSize, "", breaks.data()); - } - else - { - Accessibility::Accessible::FindLineSeparationsUtf8(reinterpret_cast(textString), textSize, "", breaks.data()); - } - - auto index = 0u; - auto counter = 0u; - while(index < textSize && counter <= offset) - { - auto start = index; - if(breaks[index]) - { - while(breaks[index]) - { - index++; - } - counter++; - } - else - { - if(boundary == Dali::Accessibility::TextBoundary::WORD) - { - index++; - } - if(boundary == Dali::Accessibility::TextBoundary::LINE) - { - counter++; - } - } - - if((counter > 0) && ((counter - 1) == offset)) - { - range.content = text.substr(start, index - start + 1); - range.startOffset = start; - range.endOffset = index + 1; - } - - if(boundary == Dali::Accessibility::TextBoundary::LINE) - { - index++; - } - } - break; - } - case Dali::Accessibility::TextBoundary::SENTENCE: - { - /* not supported by default */ - break; - } - case Dali::Accessibility::TextBoundary::PARAGRAPH: - { - /* Paragraph is not supported by libunibreak library */ - break; - } - default: - break; - } - - return range; + return mController->GetTextPosition(startIndex, endIndex); } -Dali::Accessibility::Range TextField::AccessibleImpl::GetRangeOfSelection(size_t selectionIndex) +std::string TextField::TextFieldAccessible::GetName() const { - // Since DALi supports only one selection indexes higher than 0 are ignored - if(selectionIndex > 0) + if(IsHiddenInput()) { return {}; } - auto self = Toolkit::TextField::DownCast(Self()); - auto controller = Dali::Toolkit::GetImpl(self).GetTextController(); - std::string value{}; - controller->RetrieveSelection(value); - auto indices = controller->GetSelectionIndexes(); - - return {static_cast(indices.first), static_cast(indices.second), value}; + return GetWholeText(); } -bool TextField::AccessibleImpl::RemoveSelection(size_t selectionIndex) +const std::vector& TextField::TextFieldAccessible::GetTextAnchors() const { - // Since DALi supports only one selection indexes higher than 0 are ignored - if(selectionIndex > 0) - { - return false; - } - auto self = Toolkit::TextField::DownCast(Self()); - Dali::Toolkit::GetImpl(self).GetTextController()->SetSelection(0, 0); - return true; -} - -bool TextField::AccessibleImpl::SetRangeOfSelection(size_t selectionIndex, size_t startOffset, size_t endOffset) -{ - // Since DALi supports only one selection indexes higher than 0 are ignored - if(selectionIndex > 0) - { - return false; - } - auto self = Toolkit::TextField::DownCast(Self()); - Dali::Toolkit::GetImpl(self).GetTextController()->SetSelection(startOffset, endOffset); - return true; + return Toolkit::GetImpl(self).mAnchorActors; } -bool TextField::AccessibleImpl::CopyText(size_t startPosition, size_t endPosition) +Toolkit::Text::ControllerPtr TextField::TextFieldAccessible::GetTextController() const { - if(endPosition <= startPosition) - { - return false; - } - auto self = Toolkit::TextField::DownCast(Self()); - auto text = self.GetProperty(Toolkit::TextField::Property::TEXT).Get(); - Dali::Toolkit::GetImpl(self).GetTextController()->CopyStringToClipboard(text.substr(startPosition, endPosition - startPosition)); - return true; + return Toolkit::GetImpl(self).GetTextController(); } -bool TextField::AccessibleImpl::CutText(size_t startPosition, size_t endPosition) +std::uint32_t TextField::TextFieldAccessible::GetSubstituteCharacter() const { - if(endPosition <= startPosition) - { - return false; - } - - auto self = Toolkit::TextField::DownCast(Self()); - auto text = self.GetProperty(Toolkit::TextField::Property::TEXT).Get(); - Dali::Toolkit::GetImpl(self).GetTextController()->CopyStringToClipboard(text.substr(startPosition, endPosition - startPosition)); + auto self = Toolkit::TextField::DownCast(Self()); + auto hiddenInputSettings = self.GetProperty(Toolkit::TextField::Property::HIDDEN_INPUT_SETTINGS); + auto substChar = hiddenInputSettings.Find(Toolkit::HiddenInput::Property::SUBSTITUTE_CHARACTER); - self.SetProperty(Toolkit::TextField::Property::TEXT, text.substr(0, startPosition) + text.substr(endPosition)); - - return true; -} - -bool TextField::AccessibleImpl::DeleteText(size_t startPosition, size_t endPosition) -{ - if(endPosition <= startPosition) + if(substChar) { - return false; + return static_cast(substChar->Get()); } - auto self = Toolkit::TextField::DownCast(Self()); - auto text = self.GetProperty(Toolkit::TextField::Property::TEXT).Get(); - - self.SetProperty(Toolkit::TextField::Property::TEXT, text.substr(0, startPosition) + text.substr(endPosition)); - - return true; + return TextControlAccessible::GetSubstituteCharacter(); } -Dali::Accessibility::States TextField::AccessibleImpl::CalculateStates() +bool TextField::TextFieldAccessible::IsHiddenInput() const { - using namespace Dali::Accessibility; - - auto states = DevelControl::AccessibleImpl::CalculateStates(); - - states[State::EDITABLE] = true; - states[State::FOCUSABLE] = true; + auto self = Toolkit::TextField::DownCast(Self()); + auto hiddenInputSettings = self.GetProperty(Toolkit::TextField::Property::HIDDEN_INPUT_SETTINGS); + auto mode = hiddenInputSettings.Find(Toolkit::HiddenInput::Property::MODE); - Toolkit::Control focusControl = Toolkit::KeyInputFocusManager::Get().GetCurrentFocusControl(); - if(mSelf == focusControl) - { - states[State::FOCUSED] = true; - } - - return states; + return (mode && (mode->Get() != Toolkit::HiddenInput::Mode::HIDE_NONE)); } -bool TextField::AccessibleImpl::InsertText(size_t startPosition, std::string text) +void TextField::TextFieldAccessible::RequestTextRelayout() { - auto self = Toolkit::TextField::DownCast(Self()); - auto insertedText = self.GetProperty(Toolkit::TextField::Property::TEXT).Get(); - - insertedText.insert(startPosition, text); + auto self = Toolkit::TextField::DownCast(Self()); + auto& selfImpl = Toolkit::GetImpl(self); - self.SetProperty(Toolkit::TextField::Property::TEXT, std::move(insertedText)); - - return true; -} - -bool TextField::AccessibleImpl::SetTextContents(std::string newContents) -{ - auto self = Toolkit::TextField::DownCast(Self()); - self.SetProperty(Toolkit::TextField::Property::TEXT, std::move(newContents)); - return true; + selfImpl.RequestTextRelayout(); } } // namespace Internal