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-editor-impl.cpp;h=1c6009180048c66ca6b13c7b434fd3608426137a;hp=75f6d6ff0028cc1c2058b70996ea85a8a08505a1;hb=f7e6a8dfa8b498ba261cb66b9842d50d9d2c0e2f;hpb=06e7c804d4e4461aa5e10609ff3769aae8ca9766 diff --git a/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp index 75f6d6f..1c60091 100644 --- a/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Samsung Electronics Co., Ltd. + * Copyright (c) 2021 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. @@ -19,53 +19,50 @@ #include // EXTERNAL INCLUDES -#include -#include -#include -#include +#include #include #include -#include #include -#include -#include #include +#include +#include +#include +#include +#include +#include // INTERNAL INCLUDES -#include -#include -#include -#include #include -#include -#include +#include +#include +#include +#include +#include #include #include +#include #include #include -#include -#include +#include +#include +#include using namespace Dali::Toolkit::Text; namespace Dali { - namespace Toolkit { - 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; -const float DEFAULT_SCROLL_SPEED = 1200.f; ///< The default scroll speed for the text editor in pixels/second. +const float DEFAULT_SCROLL_SPEED = 1200.f; ///< The default scroll speed for the text editor in pixels/second. } // unnamed namespace namespace @@ -81,91 +78,99 @@ BaseHandle Create() return Toolkit::TextEditor::New(); } +// clang-format off // Setup properties, signals and actions using the type-registry. -DALI_TYPE_REGISTRATION_BEGIN( Toolkit::TextEditor, Toolkit::Control, Create ); - -DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "text", STRING, TEXT ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "textColor", VECTOR4, TEXT_COLOR ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "fontFamily", STRING, FONT_FAMILY ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "fontStyle", MAP, FONT_STYLE ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "pointSize", FLOAT, POINT_SIZE ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "horizontalAlignment", STRING, HORIZONTAL_ALIGNMENT ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "scrollThreshold", FLOAT, SCROLL_THRESHOLD ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "scrollSpeed", FLOAT, SCROLL_SPEED ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "primaryCursorColor", VECTOR4, PRIMARY_CURSOR_COLOR ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "secondaryCursorColor", VECTOR4, SECONDARY_CURSOR_COLOR ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "enableCursorBlink", BOOLEAN, ENABLE_CURSOR_BLINK ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "cursorBlinkInterval", FLOAT, CURSOR_BLINK_INTERVAL ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "cursorBlinkDuration", FLOAT, CURSOR_BLINK_DURATION ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "cursorWidth", INTEGER, CURSOR_WIDTH ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "grabHandleImage", STRING, GRAB_HANDLE_IMAGE ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "grabHandlePressedImage", STRING, GRAB_HANDLE_PRESSED_IMAGE ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "selectionHandleImageLeft", MAP, SELECTION_HANDLE_IMAGE_LEFT ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "selectionHandleImageRight", MAP, SELECTION_HANDLE_IMAGE_RIGHT ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "selectionHandlePressedImageLeft", MAP, SELECTION_HANDLE_PRESSED_IMAGE_LEFT ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "selectionHandlePressedImageRight", MAP, SELECTION_HANDLE_PRESSED_IMAGE_RIGHT ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "selectionHandleMarkerImageLeft", MAP, SELECTION_HANDLE_MARKER_IMAGE_LEFT ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "selectionHandleMarkerImageRight", MAP, SELECTION_HANDLE_MARKER_IMAGE_RIGHT ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "selectionHighlightColor", VECTOR4, SELECTION_HIGHLIGHT_COLOR ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "decorationBoundingBox", RECTANGLE, DECORATION_BOUNDING_BOX ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "enableMarkup", BOOLEAN, ENABLE_MARKUP ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "inputColor", VECTOR4, INPUT_COLOR ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "inputFontFamily", STRING, INPUT_FONT_FAMILY ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "inputFontStyle", MAP, INPUT_FONT_STYLE ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "inputPointSize", FLOAT, INPUT_POINT_SIZE ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "lineSpacing", FLOAT, LINE_SPACING ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "inputLineSpacing", FLOAT, INPUT_LINE_SPACING ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "underline", MAP, UNDERLINE ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "inputUnderline", MAP, INPUT_UNDERLINE ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "shadow", MAP, SHADOW ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "inputShadow", MAP, INPUT_SHADOW ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "emboss", MAP, EMBOSS ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "inputEmboss", MAP, INPUT_EMBOSS ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "outline", MAP, OUTLINE ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "inputOutline", MAP, INPUT_OUTLINE ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "smoothScroll", BOOLEAN, SMOOTH_SCROLL ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "smoothScrollDuration", FLOAT, SMOOTH_SCROLL_DURATION ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "enableScrollBar", BOOLEAN, ENABLE_SCROLL_BAR ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "scrollBarShowDuration", FLOAT, SCROLL_BAR_SHOW_DURATION ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "scrollBarFadeDuration", FLOAT, SCROLL_BAR_FADE_DURATION ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "pixelSize", FLOAT, PIXEL_SIZE ) -DALI_PROPERTY_REGISTRATION_READ_ONLY( Toolkit, TextEditor, "lineCount", INTEGER, LINE_COUNT ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "enableSelection", BOOLEAN, ENABLE_SELECTION ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "placeholder", MAP, PLACEHOLDER ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "lineWrapMode", INTEGER, LINE_WRAP_MODE ) -DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextEditor, "placeholderText", STRING, PLACEHOLDER_TEXT ) -DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextEditor, "placeholderTextColor", VECTOR4, PLACEHOLDER_TEXT_COLOR ) -DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextEditor, "enableShiftSelection", BOOLEAN, ENABLE_SHIFT_SELECTION ) -DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextEditor, "enableGrabHandle", BOOLEAN, ENABLE_GRAB_HANDLE ) -DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextEditor, "matchSystemLanguageDirection", BOOLEAN, MATCH_SYSTEM_LANGUAGE_DIRECTION ) -DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextEditor, "renderingBackend", INTEGER, RENDERING_BACKEND ) -DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextEditor, "maxLength", INTEGER, MAX_LENGTH ) -DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextEditor, "selectedTextStart", INTEGER, SELECTED_TEXT_START ) -DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextEditor, "selectedTextEnd", INTEGER, SELECTED_TEXT_END ) -DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextEditor, "horizontalScrollPosition", FLOAT, HORIZONTAL_SCROLL_POSITION ) -DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextEditor, "verticalScrollPosition", INTEGER, VERTICAL_SCROLL_POSITION ) -DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextEditor, "enableEditing", BOOLEAN, ENABLE_EDITING ) -DALI_DEVEL_PROPERTY_REGISTRATION_READ_ONLY( Toolkit, TextEditor, "selectedText", STRING, SELECTED_TEXT ) - -DALI_SIGNAL_REGISTRATION( Toolkit, TextEditor, "textChanged", SIGNAL_TEXT_CHANGED ) -DALI_SIGNAL_REGISTRATION( Toolkit, TextEditor, "inputStyleChanged", SIGNAL_INPUT_STYLE_CHANGED ) -DALI_SIGNAL_REGISTRATION( Toolkit, TextEditor, "maxLengthReached", SIGNAL_MAX_LENGTH_REACHED ) +DALI_TYPE_REGISTRATION_BEGIN(Toolkit::TextEditor, Toolkit::Control, Create); + +DALI_PROPERTY_REGISTRATION(Toolkit, TextEditor, "text", STRING, TEXT ) +DALI_PROPERTY_REGISTRATION(Toolkit, TextEditor, "textColor", VECTOR4, TEXT_COLOR ) +DALI_PROPERTY_REGISTRATION(Toolkit, TextEditor, "fontFamily", STRING, FONT_FAMILY ) +DALI_PROPERTY_REGISTRATION(Toolkit, TextEditor, "fontStyle", MAP, FONT_STYLE ) +DALI_PROPERTY_REGISTRATION(Toolkit, TextEditor, "pointSize", FLOAT, POINT_SIZE ) +DALI_PROPERTY_REGISTRATION(Toolkit, TextEditor, "horizontalAlignment", STRING, HORIZONTAL_ALIGNMENT ) +DALI_PROPERTY_REGISTRATION(Toolkit, TextEditor, "scrollThreshold", FLOAT, SCROLL_THRESHOLD ) +DALI_PROPERTY_REGISTRATION(Toolkit, TextEditor, "scrollSpeed", FLOAT, SCROLL_SPEED ) +DALI_PROPERTY_REGISTRATION(Toolkit, TextEditor, "primaryCursorColor", VECTOR4, PRIMARY_CURSOR_COLOR ) +DALI_PROPERTY_REGISTRATION(Toolkit, TextEditor, "secondaryCursorColor", VECTOR4, SECONDARY_CURSOR_COLOR ) +DALI_PROPERTY_REGISTRATION(Toolkit, TextEditor, "enableCursorBlink", BOOLEAN, ENABLE_CURSOR_BLINK ) +DALI_PROPERTY_REGISTRATION(Toolkit, TextEditor, "cursorBlinkInterval", FLOAT, CURSOR_BLINK_INTERVAL ) +DALI_PROPERTY_REGISTRATION(Toolkit, TextEditor, "cursorBlinkDuration", FLOAT, CURSOR_BLINK_DURATION ) +DALI_PROPERTY_REGISTRATION(Toolkit, TextEditor, "cursorWidth", INTEGER, CURSOR_WIDTH ) +DALI_PROPERTY_REGISTRATION(Toolkit, TextEditor, "grabHandleImage", STRING, GRAB_HANDLE_IMAGE ) +DALI_PROPERTY_REGISTRATION(Toolkit, TextEditor, "grabHandlePressedImage", STRING, GRAB_HANDLE_PRESSED_IMAGE ) +DALI_PROPERTY_REGISTRATION(Toolkit, TextEditor, "selectionHandleImageLeft", MAP, SELECTION_HANDLE_IMAGE_LEFT ) +DALI_PROPERTY_REGISTRATION(Toolkit, TextEditor, "selectionHandleImageRight", MAP, SELECTION_HANDLE_IMAGE_RIGHT ) +DALI_PROPERTY_REGISTRATION(Toolkit, TextEditor, "selectionHandlePressedImageLeft", MAP, SELECTION_HANDLE_PRESSED_IMAGE_LEFT ) +DALI_PROPERTY_REGISTRATION(Toolkit, TextEditor, "selectionHandlePressedImageRight", MAP, SELECTION_HANDLE_PRESSED_IMAGE_RIGHT) +DALI_PROPERTY_REGISTRATION(Toolkit, TextEditor, "selectionHandleMarkerImageLeft", MAP, SELECTION_HANDLE_MARKER_IMAGE_LEFT ) +DALI_PROPERTY_REGISTRATION(Toolkit, TextEditor, "selectionHandleMarkerImageRight", MAP, SELECTION_HANDLE_MARKER_IMAGE_RIGHT ) +DALI_PROPERTY_REGISTRATION(Toolkit, TextEditor, "selectionHighlightColor", VECTOR4, SELECTION_HIGHLIGHT_COLOR ) +DALI_PROPERTY_REGISTRATION(Toolkit, TextEditor, "decorationBoundingBox", RECTANGLE, DECORATION_BOUNDING_BOX ) +DALI_PROPERTY_REGISTRATION(Toolkit, TextEditor, "enableMarkup", BOOLEAN, ENABLE_MARKUP ) +DALI_PROPERTY_REGISTRATION(Toolkit, TextEditor, "inputColor", VECTOR4, INPUT_COLOR ) +DALI_PROPERTY_REGISTRATION(Toolkit, TextEditor, "inputFontFamily", STRING, INPUT_FONT_FAMILY ) +DALI_PROPERTY_REGISTRATION(Toolkit, TextEditor, "inputFontStyle", MAP, INPUT_FONT_STYLE ) +DALI_PROPERTY_REGISTRATION(Toolkit, TextEditor, "inputPointSize", FLOAT, INPUT_POINT_SIZE ) +DALI_PROPERTY_REGISTRATION(Toolkit, TextEditor, "lineSpacing", FLOAT, LINE_SPACING ) +DALI_PROPERTY_REGISTRATION(Toolkit, TextEditor, "inputLineSpacing", FLOAT, INPUT_LINE_SPACING ) +DALI_PROPERTY_REGISTRATION(Toolkit, TextEditor, "underline", MAP, UNDERLINE ) +DALI_PROPERTY_REGISTRATION(Toolkit, TextEditor, "inputUnderline", MAP, INPUT_UNDERLINE ) +DALI_PROPERTY_REGISTRATION(Toolkit, TextEditor, "shadow", MAP, SHADOW ) +DALI_PROPERTY_REGISTRATION(Toolkit, TextEditor, "inputShadow", MAP, INPUT_SHADOW ) +DALI_PROPERTY_REGISTRATION(Toolkit, TextEditor, "emboss", MAP, EMBOSS ) +DALI_PROPERTY_REGISTRATION(Toolkit, TextEditor, "inputEmboss", MAP, INPUT_EMBOSS ) +DALI_PROPERTY_REGISTRATION(Toolkit, TextEditor, "outline", MAP, OUTLINE ) +DALI_PROPERTY_REGISTRATION(Toolkit, TextEditor, "inputOutline", MAP, INPUT_OUTLINE ) +DALI_PROPERTY_REGISTRATION(Toolkit, TextEditor, "smoothScroll", BOOLEAN, SMOOTH_SCROLL ) +DALI_PROPERTY_REGISTRATION(Toolkit, TextEditor, "smoothScrollDuration", FLOAT, SMOOTH_SCROLL_DURATION ) +DALI_PROPERTY_REGISTRATION(Toolkit, TextEditor, "enableScrollBar", BOOLEAN, ENABLE_SCROLL_BAR ) +DALI_PROPERTY_REGISTRATION(Toolkit, TextEditor, "scrollBarShowDuration", FLOAT, SCROLL_BAR_SHOW_DURATION ) +DALI_PROPERTY_REGISTRATION(Toolkit, TextEditor, "scrollBarFadeDuration", FLOAT, SCROLL_BAR_FADE_DURATION ) +DALI_PROPERTY_REGISTRATION(Toolkit, TextEditor, "pixelSize", FLOAT, PIXEL_SIZE ) +DALI_PROPERTY_REGISTRATION_READ_ONLY(Toolkit, TextEditor, "lineCount", INTEGER, LINE_COUNT ) +DALI_PROPERTY_REGISTRATION(Toolkit, TextEditor, "enableSelection", BOOLEAN, ENABLE_SELECTION ) +DALI_PROPERTY_REGISTRATION(Toolkit, TextEditor, "placeholder", MAP, PLACEHOLDER ) +DALI_PROPERTY_REGISTRATION(Toolkit, TextEditor, "lineWrapMode", INTEGER, LINE_WRAP_MODE ) +DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextEditor, "placeholderText", STRING, PLACEHOLDER_TEXT ) +DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextEditor, "placeholderTextColor", VECTOR4, PLACEHOLDER_TEXT_COLOR ) +DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextEditor, "enableShiftSelection", BOOLEAN, ENABLE_SHIFT_SELECTION ) +DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextEditor, "enableGrabHandle", BOOLEAN, ENABLE_GRAB_HANDLE ) +DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextEditor, "matchSystemLanguageDirection", BOOLEAN, MATCH_SYSTEM_LANGUAGE_DIRECTION ) +DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextEditor, "renderingBackend", INTEGER, RENDERING_BACKEND ) +DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextEditor, "maxLength", INTEGER, MAX_LENGTH ) +DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextEditor, "selectedTextStart", INTEGER, SELECTED_TEXT_START ) +DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextEditor, "selectedTextEnd", INTEGER, SELECTED_TEXT_END ) +DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextEditor, "horizontalScrollPosition", FLOAT, HORIZONTAL_SCROLL_POSITION ) +DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextEditor, "verticalScrollPosition", INTEGER, VERTICAL_SCROLL_POSITION ) +DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextEditor, "enableEditing", BOOLEAN, ENABLE_EDITING ) +DALI_DEVEL_PROPERTY_REGISTRATION_READ_ONLY(Toolkit, TextEditor, "selectedText", STRING, SELECTED_TEXT ) +DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextEditor, "fontSizeScale", FLOAT, FONT_SIZE_SCALE ) +DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextEditor, "primaryCursorPosition", INTEGER, PRIMARY_CURSOR_POSITION ) +DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextEditor, "grabHandleColor", VECTOR4, GRAB_HANDLE_COLOR ) +DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextEditor, "enableGrabHandlePopup", BOOLEAN, ENABLE_GRAB_HANDLE_POPUP ) +DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextEditor, "inputMethodSettings", MAP, INPUT_METHOD_SETTINGS ) + +DALI_SIGNAL_REGISTRATION(Toolkit, TextEditor, "textChanged", SIGNAL_TEXT_CHANGED ) +DALI_SIGNAL_REGISTRATION(Toolkit, TextEditor, "inputStyleChanged", SIGNAL_INPUT_STYLE_CHANGED) +DALI_SIGNAL_REGISTRATION(Toolkit, TextEditor, "maxLengthReached", SIGNAL_MAX_LENGTH_REACHED ) +DALI_SIGNAL_REGISTRATION(Toolkit, TextEditor, "anchorClicked", SIGNAL_ANCHOR_CLICKED ) DALI_TYPE_REGISTRATION_END() +// clang-format on -const char * const IMAGE_MAP_FILENAME_STRING = "filename"; +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 ) +std::string GetImageFileNameFromPropertyValue(const Property::Value& value) { - std::string filename; + std::string filename; const Property::Map* map = value.GetMap(); - if( map ) + if(map) { - const Property::Value* filenameValue = map->Find( IMAGE_MAP_FILENAME_STRING ); - if( filenameValue ) + const Property::Value* filenameValue = map->Find(IMAGE_MAP_FILENAME_STRING); + if(filenameValue) { - filenameValue->Get( filename ); + filenameValue->Get(filename); } } return filename; @@ -176,10 +181,10 @@ std::string GetImageFileNameFromPropertyValue( const Property::Value& value ) Toolkit::TextEditor TextEditor::New() { // Create the implementation, temporarily owned by this handle on stack - IntrusivePtr< TextEditor > impl = new TextEditor(); + IntrusivePtr impl = new TextEditor(); // Pass ownership to CustomActor handle - Toolkit::TextEditor handle( *impl ); + Toolkit::TextEditor handle(*impl); // Second-phase init of the implementation // This can only be done after the CustomActor connection has been made... @@ -188,27 +193,26 @@ Toolkit::TextEditor TextEditor::New() return handle; } -void TextEditor::SetProperty( BaseObject* object, Property::Index index, const Property::Value& value ) +void TextEditor::SetProperty(BaseObject* object, Property::Index index, const Property::Value& value) { - Toolkit::TextEditor textEditor = Toolkit::TextEditor::DownCast( Dali::BaseHandle( object ) ); - - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextEditor SetProperty\n"); + Toolkit::TextEditor textEditor = Toolkit::TextEditor::DownCast(Dali::BaseHandle(object)); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextEditor SetProperty\n"); - if( textEditor ) + if(textEditor) { - TextEditor& impl( GetImpl( textEditor ) ); - DALI_ASSERT_DEBUG( impl.mController && "No text contoller" ); - DALI_ASSERT_DEBUG( impl.mDecorator && "No text decorator" ); + TextEditor& impl(GetImpl(textEditor)); + DALI_ASSERT_DEBUG(impl.mController && "No text contoller"); + DALI_ASSERT_DEBUG(impl.mDecorator && "No text decorator"); - switch( index ) + switch(index) { case Toolkit::DevelTextEditor::Property::RENDERING_BACKEND: { - int backend = value.Get< int >(); - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextEditor %p RENDERING_BACKEND %d\n", impl.mController.Get(), backend ); + int backend = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextEditor %p RENDERING_BACKEND %d\n", impl.mController.Get(), backend); - if( impl.mRenderingBackend != backend ) + if(impl.mRenderingBackend != backend) { impl.mRenderingBackend = backend; impl.mRenderer.Reset(); @@ -218,267 +222,267 @@ void TextEditor::SetProperty( BaseObject* object, Property::Index index, const P } case Toolkit::TextEditor::Property::TEXT: { - const std::string& text = value.Get< std::string >(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextEditor %p TEXT %s\n", impl.mController.Get(), text.c_str() ); + const std::string& text = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p TEXT %s\n", impl.mController.Get(), text.c_str()); - impl.mController->SetText( text ); + impl.mController->SetText(text); break; } case Toolkit::TextEditor::Property::TEXT_COLOR: { - const Vector4& textColor = value.Get< Vector4 >(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextEditor %p TEXT_COLOR %f,%f,%f,%f\n", impl.mController.Get(), textColor.r, textColor.g, textColor.b, textColor.a ); + const Vector4& textColor = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p TEXT_COLOR %f,%f,%f,%f\n", impl.mController.Get(), textColor.r, textColor.g, textColor.b, textColor.a); - if( impl.mController->GetDefaultColor() != textColor ) + if(impl.mController->GetDefaultColor() != textColor) { - impl.mController->SetDefaultColor( textColor ); - impl.mController->SetInputColor( textColor ); + impl.mController->SetDefaultColor(textColor); + impl.mController->SetInputColor(textColor); impl.mRenderer.Reset(); } break; } case Toolkit::TextEditor::Property::FONT_FAMILY: { - const std::string& fontFamily = value.Get< std::string >(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextEditor %p FONT_FAMILY %s\n", impl.mController.Get(), fontFamily.c_str() ); - impl.mController->SetDefaultFontFamily( fontFamily ); + const std::string& fontFamily = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p FONT_FAMILY %s\n", impl.mController.Get(), fontFamily.c_str()); + impl.mController->SetDefaultFontFamily(fontFamily); break; } case Toolkit::TextEditor::Property::FONT_STYLE: { - SetFontStyleProperty( impl.mController, value, Text::FontStyle::DEFAULT ); + SetFontStyleProperty(impl.mController, value, Text::FontStyle::DEFAULT); break; } case Toolkit::TextEditor::Property::POINT_SIZE: { - const float pointSize = value.Get< float >(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextEditor %p POINT_SIZE %f\n", impl.mController.Get(), pointSize ); + const float pointSize = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p POINT_SIZE %f\n", impl.mController.Get(), pointSize); - if( !Equals( impl.mController->GetDefaultFontSize( Text::Controller::POINT_SIZE ), pointSize ) ) + if(!Equals(impl.mController->GetDefaultFontSize(Text::Controller::POINT_SIZE), pointSize)) { - impl.mController->SetDefaultFontSize( pointSize, Text::Controller::POINT_SIZE ); + impl.mController->SetDefaultFontSize(pointSize, Text::Controller::POINT_SIZE); } break; } case Toolkit::TextEditor::Property::HORIZONTAL_ALIGNMENT: { - Text::HorizontalAlignment::Type alignment( static_cast< Text::HorizontalAlignment::Type >( -1 ) ); // Set to invalid value to ensure a valid mode does get set - if( Text::GetHorizontalAlignmentEnumeration( value, alignment ) ) + Text::HorizontalAlignment::Type alignment(static_cast(-1)); // Set to invalid value to ensure a valid mode does get set + if(Text::GetHorizontalAlignmentEnumeration(value, alignment)) { - DALI_LOG_INFO( gLogFilter, Debug::General, "TextEditor %p HORIZONTAL_ALIGNMENT %d\n", impl.mController.Get(), alignment ); - impl.mController->SetHorizontalAlignment( alignment ); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p HORIZONTAL_ALIGNMENT %d\n", impl.mController.Get(), alignment); + impl.mController->SetHorizontalAlignment(alignment); } break; } case Toolkit::TextEditor::Property::SCROLL_THRESHOLD: { - const float threshold = value.Get< float >(); - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextEditor %p SCROLL_THRESHOLD %f\n", impl.mController.Get(), threshold ); + const float threshold = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextEditor %p SCROLL_THRESHOLD %f\n", impl.mController.Get(), threshold); - impl.mDecorator->SetScrollThreshold( threshold ); + impl.mDecorator->SetScrollThreshold(threshold); break; } case Toolkit::TextEditor::Property::SCROLL_SPEED: { - const float speed = value.Get< float >(); - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextEditor %p SCROLL_SPEED %f\n", impl.mController.Get(), speed ); + const float speed = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextEditor %p SCROLL_SPEED %f\n", impl.mController.Get(), speed); - impl.mDecorator->SetScrollSpeed( speed ); + impl.mDecorator->SetScrollSpeed(speed); break; } case Toolkit::TextEditor::Property::PRIMARY_CURSOR_COLOR: { - const Vector4& color = value.Get< Vector4 >(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextEditor %p PRIMARY_CURSOR_COLOR %f,%f,%f,%f\n", impl.mController.Get(), color.r, color.g, color.b, color.a ); + const Vector4& color = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %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.mDecorator->SetCursorColor(PRIMARY_CURSOR, color); impl.RequestTextRelayout(); break; } case Toolkit::TextEditor::Property::SECONDARY_CURSOR_COLOR: { - const Vector4& color = value.Get< Vector4 >(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextEditor %p SECONDARY_CURSOR_COLOR %f,%f,%f,%f\n", impl.mController.Get(), color.r, color.g, color.b, color.a ); + const Vector4& color = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %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.mDecorator->SetCursorColor(SECONDARY_CURSOR, color); impl.RequestTextRelayout(); break; } case Toolkit::TextEditor::Property::ENABLE_CURSOR_BLINK: { - const bool enable = value.Get< bool >(); - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextEditor %p ENABLE_CURSOR_BLINK %d\n", impl.mController.Get(), enable ); + const bool enable = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextEditor %p ENABLE_CURSOR_BLINK %d\n", impl.mController.Get(), enable); - impl.mController->SetEnableCursorBlink( enable ); + impl.mController->SetEnableCursorBlink(enable); impl.RequestTextRelayout(); break; } case Toolkit::TextEditor::Property::CURSOR_BLINK_INTERVAL: { - const float interval = value.Get< float >(); - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextEditor %p CURSOR_BLINK_INTERVAL %f\n", impl.mController.Get(), interval ); + const float interval = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextEditor %p CURSOR_BLINK_INTERVAL %f\n", impl.mController.Get(), interval); - impl.mDecorator->SetCursorBlinkInterval( interval ); + impl.mDecorator->SetCursorBlinkInterval(interval); break; } case Toolkit::TextEditor::Property::CURSOR_BLINK_DURATION: { - const float duration = value.Get< float >(); - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextEditor %p CURSOR_BLINK_DURATION %f\n", impl.mController.Get(), duration ); + const float duration = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextEditor %p CURSOR_BLINK_DURATION %f\n", impl.mController.Get(), duration); - impl.mDecorator->SetCursorBlinkDuration( duration ); + impl.mDecorator->SetCursorBlinkDuration(duration); break; } case Toolkit::TextEditor::Property::CURSOR_WIDTH: { - const int width = value.Get< int >(); - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextEditor %p CURSOR_WIDTH %d\n", impl.mController.Get(), width ); + const int width = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextEditor %p CURSOR_WIDTH %d\n", impl.mController.Get(), width); - impl.mDecorator->SetCursorWidth( width ); - impl.mController->GetLayoutEngine().SetCursorWidth( width ); + impl.mDecorator->SetCursorWidth(width); + impl.mController->GetLayoutEngine().SetCursorWidth(width); break; } case Toolkit::TextEditor::Property::GRAB_HANDLE_IMAGE: { - const std::string imageFileName = value.Get< std::string >(); - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextEditor %p GRAB_HANDLE_IMAGE %s\n", impl.mController.Get(), imageFileName.c_str() ); + const std::string imageFileName = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextEditor %p GRAB_HANDLE_IMAGE %s\n", impl.mController.Get(), imageFileName.c_str()); - if( imageFileName.size() ) + if(imageFileName.size()) { - impl.mDecorator->SetHandleImage( GRAB_HANDLE, HANDLE_IMAGE_RELEASED, imageFileName ); + impl.mDecorator->SetHandleImage(GRAB_HANDLE, HANDLE_IMAGE_RELEASED, imageFileName); impl.RequestTextRelayout(); } break; } case Toolkit::TextEditor::Property::GRAB_HANDLE_PRESSED_IMAGE: { - const std::string imageFileName = value.Get< std::string >(); - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextEditor %p GRAB_HANDLE_PRESSED_IMAGE %s\n", impl.mController.Get(), imageFileName.c_str() ); + const std::string imageFileName = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextEditor %p GRAB_HANDLE_PRESSED_IMAGE %s\n", impl.mController.Get(), imageFileName.c_str()); - if( imageFileName.size() ) + if(imageFileName.size()) { - impl.mDecorator->SetHandleImage( GRAB_HANDLE, HANDLE_IMAGE_PRESSED, imageFileName ); + impl.mDecorator->SetHandleImage(GRAB_HANDLE, HANDLE_IMAGE_PRESSED, imageFileName); impl.RequestTextRelayout(); } break; } case Toolkit::TextEditor::Property::SELECTION_HANDLE_IMAGE_LEFT: { - const std::string filename = GetImageFileNameFromPropertyValue( value ); + const std::string filename = GetImageFileNameFromPropertyValue(value); - if( filename.size() ) + if(filename.size()) { - impl.mDecorator->SetHandleImage( LEFT_SELECTION_HANDLE, HANDLE_IMAGE_RELEASED, filename ); + impl.mDecorator->SetHandleImage(LEFT_SELECTION_HANDLE, HANDLE_IMAGE_RELEASED, filename); impl.RequestTextRelayout(); } break; } case Toolkit::TextEditor::Property::SELECTION_HANDLE_IMAGE_RIGHT: { - const std::string filename = GetImageFileNameFromPropertyValue( value ); + const std::string filename = GetImageFileNameFromPropertyValue(value); - if( filename.size() ) + if(filename.size()) { - impl.mDecorator->SetHandleImage( RIGHT_SELECTION_HANDLE, HANDLE_IMAGE_RELEASED, filename ); + impl.mDecorator->SetHandleImage(RIGHT_SELECTION_HANDLE, HANDLE_IMAGE_RELEASED, filename); impl.RequestTextRelayout(); } break; } case Toolkit::TextEditor::Property::SELECTION_HANDLE_PRESSED_IMAGE_LEFT: { - const std::string filename = GetImageFileNameFromPropertyValue( value ); + const std::string filename = GetImageFileNameFromPropertyValue(value); - if( filename.size() ) + if(filename.size()) { - impl.mDecorator->SetHandleImage( LEFT_SELECTION_HANDLE, HANDLE_IMAGE_PRESSED, filename ); + impl.mDecorator->SetHandleImage(LEFT_SELECTION_HANDLE, HANDLE_IMAGE_PRESSED, filename); impl.RequestTextRelayout(); } break; } case Toolkit::TextEditor::Property::SELECTION_HANDLE_PRESSED_IMAGE_RIGHT: { - const std::string filename = GetImageFileNameFromPropertyValue( value ); + const std::string filename = GetImageFileNameFromPropertyValue(value); - if( filename.size() ) + if(filename.size()) { - impl.mDecorator->SetHandleImage( RIGHT_SELECTION_HANDLE, HANDLE_IMAGE_PRESSED, filename ); + impl.mDecorator->SetHandleImage(RIGHT_SELECTION_HANDLE, HANDLE_IMAGE_PRESSED, filename); impl.RequestTextRelayout(); } break; } case Toolkit::TextEditor::Property::SELECTION_HANDLE_MARKER_IMAGE_LEFT: { - const std::string filename = GetImageFileNameFromPropertyValue( value ); + const std::string filename = GetImageFileNameFromPropertyValue(value); - if( filename.size() ) + if(filename.size()) { - impl.mDecorator->SetHandleImage( LEFT_SELECTION_HANDLE_MARKER, HANDLE_IMAGE_RELEASED, filename ); + impl.mDecorator->SetHandleImage(LEFT_SELECTION_HANDLE_MARKER, HANDLE_IMAGE_RELEASED, filename); impl.RequestTextRelayout(); } break; } case Toolkit::TextEditor::Property::SELECTION_HANDLE_MARKER_IMAGE_RIGHT: { - const std::string filename = GetImageFileNameFromPropertyValue( value ); + const std::string filename = GetImageFileNameFromPropertyValue(value); - if( filename.size() ) + if(filename.size()) { - impl.mDecorator->SetHandleImage( RIGHT_SELECTION_HANDLE_MARKER, HANDLE_IMAGE_RELEASED, filename ); + impl.mDecorator->SetHandleImage(RIGHT_SELECTION_HANDLE_MARKER, HANDLE_IMAGE_RELEASED, filename); impl.RequestTextRelayout(); } break; } case Toolkit::TextEditor::Property::SELECTION_HIGHLIGHT_COLOR: { - const Vector4 color = value.Get< Vector4 >(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextEditor %p SELECTION_HIGHLIGHT_COLOR %f,%f,%f,%f\n", impl.mController.Get(), color.r, color.g, color.b, color.a ); + const Vector4 color = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %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.mDecorator->SetHighlightColor(color); impl.RequestTextRelayout(); break; } case Toolkit::TextEditor::Property::DECORATION_BOUNDING_BOX: { - const Rect& box = value.Get< Rect >(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextEditor %p DECORATION_BOUNDING_BOX %d,%d %dx%d\n", impl.mController.Get(), box.x, box.y, box.width, box.height ); + const Rect& box = value.Get >(); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %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.mDecorator->SetBoundingBox(box); impl.RequestTextRelayout(); break; } case Toolkit::TextEditor::Property::ENABLE_MARKUP: { const bool enableMarkup = value.Get(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextEditor %p ENABLE_MARKUP %d\n", impl.mController.Get(), enableMarkup ); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p ENABLE_MARKUP %d\n", impl.mController.Get(), enableMarkup); - impl.mController->SetMarkupProcessorEnabled( enableMarkup ); + impl.mController->SetMarkupProcessorEnabled(enableMarkup); break; } case Toolkit::TextEditor::Property::INPUT_COLOR: { - const Vector4& inputColor = value.Get< Vector4 >(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextEditor %p INPUT_COLOR %f,%f,%f,%f\n", impl.mController.Get(), inputColor.r, inputColor.g, inputColor.b, inputColor.a ); + const Vector4& inputColor = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p INPUT_COLOR %f,%f,%f,%f\n", impl.mController.Get(), inputColor.r, inputColor.g, inputColor.b, inputColor.a); - impl.mController->SetInputColor( inputColor ); + impl.mController->SetInputColor(inputColor); break; } case Toolkit::TextEditor::Property::INPUT_FONT_FAMILY: { - const std::string& fontFamily = value.Get< std::string >(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextEditor %p INPUT_FONT_FAMILY %s\n", impl.mController.Get(), fontFamily.c_str() ); - impl.mController->SetInputFontFamily( fontFamily ); + const std::string& fontFamily = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p INPUT_FONT_FAMILY %s\n", impl.mController.Get(), fontFamily.c_str()); + impl.mController->SetInputFontFamily(fontFamily); break; } case Toolkit::TextEditor::Property::INPUT_FONT_STYLE: { - SetFontStyleProperty( impl.mController, value, Text::FontStyle::INPUT ); + SetFontStyleProperty(impl.mController, value, Text::FontStyle::INPUT); break; } case Toolkit::TextEditor::Property::INPUT_POINT_SIZE: { - const float pointSize = value.Get< float >(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextEditor %p INPUT_POINT_SIZE %f\n", impl.mController.Get(), pointSize ); - impl.mController->SetInputFontPointSize( pointSize ); + const float pointSize = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p INPUT_POINT_SIZE %f\n", impl.mController.Get(), pointSize); + impl.mController->SetInputFontPointSize(pointSize); break; } case Toolkit::TextEditor::Property::LINE_SPACING: @@ -487,23 +491,23 @@ void TextEditor::SetProperty( BaseObject* object, Property::Index index, const P // by the TextLabel for now it must be ignored. The property is being shadowed // locally so its value isn't affected. const float lineSpacing = value.Get(); - impl.mLineSpacing = lineSpacing; + impl.mLineSpacing = lineSpacing; // set it to 0.0 due to missing implementation - impl.mController->SetDefaultLineSpacing( 0.0f ); + impl.mController->SetDefaultLineSpacing(0.0f); impl.mRenderer.Reset(); break; } case Toolkit::TextEditor::Property::INPUT_LINE_SPACING: { const float lineSpacing = value.Get(); - impl.mController->SetInputLineSpacing( lineSpacing ); + impl.mController->SetInputLineSpacing(lineSpacing); impl.mRenderer.Reset(); break; } case Toolkit::TextEditor::Property::UNDERLINE: { - const bool update = SetUnderlineProperties( impl.mController, value, Text::EffectStyle::DEFAULT ); - if( update ) + const bool update = SetUnderlineProperties(impl.mController, value, Text::EffectStyle::DEFAULT); + if(update) { impl.mRenderer.Reset(); } @@ -511,8 +515,8 @@ void TextEditor::SetProperty( BaseObject* object, Property::Index index, const P } case Toolkit::TextEditor::Property::INPUT_UNDERLINE: { - const bool update = SetUnderlineProperties( impl.mController, value, Text::EffectStyle::INPUT ); - if( update ) + const bool update = SetUnderlineProperties(impl.mController, value, Text::EffectStyle::INPUT); + if(update) { impl.mRenderer.Reset(); } @@ -520,8 +524,8 @@ void TextEditor::SetProperty( BaseObject* object, Property::Index index, const P } case Toolkit::TextEditor::Property::SHADOW: { - const bool update = SetShadowProperties( impl.mController, value, Text::EffectStyle::DEFAULT ); - if( update ) + const bool update = SetShadowProperties(impl.mController, value, Text::EffectStyle::DEFAULT); + if(update) { impl.mRenderer.Reset(); } @@ -529,8 +533,8 @@ void TextEditor::SetProperty( BaseObject* object, Property::Index index, const P } case Toolkit::TextEditor::Property::INPUT_SHADOW: { - const bool update = SetShadowProperties( impl.mController, value, Text::EffectStyle::INPUT ); - if( update ) + const bool update = SetShadowProperties(impl.mController, value, Text::EffectStyle::INPUT); + if(update) { impl.mRenderer.Reset(); } @@ -538,8 +542,8 @@ void TextEditor::SetProperty( BaseObject* object, Property::Index index, const P } case Toolkit::TextEditor::Property::EMBOSS: { - const bool update = SetEmbossProperties( impl.mController, value, Text::EffectStyle::DEFAULT ); - if( update ) + const bool update = SetEmbossProperties(impl.mController, value, Text::EffectStyle::DEFAULT); + if(update) { impl.mRenderer.Reset(); } @@ -547,8 +551,8 @@ void TextEditor::SetProperty( BaseObject* object, Property::Index index, const P } case Toolkit::TextEditor::Property::INPUT_EMBOSS: { - const bool update = SetEmbossProperties( impl.mController, value, Text::EffectStyle::INPUT ); - if( update ) + const bool update = SetEmbossProperties(impl.mController, value, Text::EffectStyle::INPUT); + if(update) { impl.mRenderer.Reset(); } @@ -556,8 +560,8 @@ void TextEditor::SetProperty( BaseObject* object, Property::Index index, const P } case Toolkit::TextEditor::Property::OUTLINE: { - const bool update = SetOutlineProperties( impl.mController, value, Text::EffectStyle::DEFAULT ); - if( update ) + const bool update = SetOutlineProperties(impl.mController, value, Text::EffectStyle::DEFAULT); + if(update) { impl.mRenderer.Reset(); } @@ -565,8 +569,8 @@ void TextEditor::SetProperty( BaseObject* object, Property::Index index, const P } case Toolkit::TextEditor::Property::INPUT_OUTLINE: { - const bool update = SetOutlineProperties( impl.mController, value, Text::EffectStyle::INPUT ); - if( update ) + const bool update = SetOutlineProperties(impl.mController, value, Text::EffectStyle::INPUT); + if(update) { impl.mRenderer.Reset(); } @@ -574,192 +578,246 @@ void TextEditor::SetProperty( BaseObject* object, Property::Index index, const P } case Toolkit::TextEditor::Property::SMOOTH_SCROLL: { - const bool enable = value.Get< bool >(); - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextEditor SMOOTH_SCROLL %d\n", enable ); + const bool enable = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextEditor SMOOTH_SCROLL %d\n", enable); impl.mScrollAnimationEnabled = enable; break; } case Toolkit::TextEditor::Property::SMOOTH_SCROLL_DURATION: { - const float duration = value.Get< float >(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextEditor SMOOTH_SCROLL_DURATION %f\n", duration ); + const float duration = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor SMOOTH_SCROLL_DURATION %f\n", duration); impl.mScrollAnimationDuration = duration; - if ( impl.mTextVerticalScroller ) + if(impl.mTextVerticalScroller) { - impl.mTextVerticalScroller->SetDuration( duration ); + impl.mTextVerticalScroller->SetDuration(duration); } break; } case Toolkit::TextEditor::Property::ENABLE_SCROLL_BAR: { - const bool enable = value.Get< bool >(); - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextEditor SHOW_SCROLL_BAR %d\n", enable ); + const bool enable = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextEditor SHOW_SCROLL_BAR %d\n", enable); impl.mScrollBarEnabled = enable; break; } case Toolkit::TextEditor::Property::SCROLL_BAR_SHOW_DURATION: { - const float duration = value.Get< float >(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextEditor SCROLL_BAR_SHOW_DURATION %f\n", duration ); + const float duration = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor SCROLL_BAR_SHOW_DURATION %f\n", duration); impl.mAnimationPeriod.delaySeconds = duration; break; } case Toolkit::TextEditor::Property::SCROLL_BAR_FADE_DURATION: { - const float duration = value.Get< float >(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextEditor SCROLL_BAR_FADE_DURATION %f\n", duration ); + const float duration = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor SCROLL_BAR_FADE_DURATION %f\n", duration); impl.mAnimationPeriod.durationSeconds = duration; break; } case Toolkit::TextEditor::Property::PIXEL_SIZE: { - const float pixelSize = value.Get< float >(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextEditor %p PIXEL_SIZE %f\n", impl.mController.Get(), pixelSize ); + const float pixelSize = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p PIXEL_SIZE %f\n", impl.mController.Get(), pixelSize); - if( !Equals( impl.mController->GetDefaultFontSize( Text::Controller::PIXEL_SIZE ), pixelSize ) ) + if(!Equals(impl.mController->GetDefaultFontSize(Text::Controller::PIXEL_SIZE), pixelSize)) { - impl.mController->SetDefaultFontSize( pixelSize, Text::Controller::PIXEL_SIZE ); + impl.mController->SetDefaultFontSize(pixelSize, Text::Controller::PIXEL_SIZE); } break; } case Toolkit::DevelTextEditor::Property::PLACEHOLDER_TEXT: { - const std::string& text = value.Get< std::string >(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextEditor::OnPropertySet %p PLACEHOLDER_TEXT %s\n", impl.mController.Get(), text.c_str() ); + const std::string& text = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor::OnPropertySet %p PLACEHOLDER_TEXT %s\n", impl.mController.Get(), text.c_str()); - impl.mController->SetPlaceholderText( Controller::PLACEHOLDER_TYPE_INACTIVE, text ); + impl.mController->SetPlaceholderText(Controller::PLACEHOLDER_TYPE_INACTIVE, text); break; } case Toolkit::DevelTextEditor::Property::PLACEHOLDER_TEXT_COLOR: { - const Vector4& textColor = value.Get< Vector4 >(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextEditor %p PLACEHOLDER_TEXT_COLOR %f,%f,%f,%f\n", impl.mController.Get(), textColor.r, textColor.g, textColor.b, textColor.a ); + const Vector4& textColor = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %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 ) + if(impl.mController->GetPlaceholderTextColor() != textColor) { - impl.mController->SetPlaceholderTextColor( textColor ); + impl.mController->SetPlaceholderTextColor(textColor); impl.mRenderer.Reset(); } break; } case Toolkit::TextEditor::Property::ENABLE_SELECTION: { - const bool enableSelection = value.Get< bool >(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextEditor %p ENABLE_SELECTION %d\n", impl.mController.Get(), enableSelection ); - impl.mController->SetSelectionEnabled( enableSelection ); + const bool enableSelection = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p ENABLE_SELECTION %d\n", impl.mController.Get(), enableSelection); + impl.mController->SetSelectionEnabled(enableSelection); break; } case Toolkit::TextEditor::Property::PLACEHOLDER: { const Property::Map* map = value.GetMap(); - if( map ) + if(map) { - impl.mController->SetPlaceholderProperty( *map ); + impl.mController->SetPlaceholderProperty(*map); } break; } case Toolkit::TextEditor::Property::LINE_WRAP_MODE: { - Text::LineWrap::Mode lineWrapMode( static_cast< Text::LineWrap::Mode >( -1 ) ); // Set to invalid value to ensure a valid mode does get set - if( GetLineWrapModeEnumeration( value, lineWrapMode ) ) + Text::LineWrap::Mode lineWrapMode(static_cast(-1)); // Set to invalid value to ensure a valid mode does get set + if(GetLineWrapModeEnumeration(value, lineWrapMode)) { - DALI_LOG_INFO( gLogFilter, Debug::General, "TextEditor %p LineWrap::MODE %d\n", impl.mController.Get(), lineWrapMode ); - impl.mController->SetLineWrapMode( lineWrapMode ); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p LineWrap::MODE %d\n", impl.mController.Get(), lineWrapMode); + impl.mController->SetLineWrapMode(lineWrapMode); } break; } case Toolkit::DevelTextEditor::Property::ENABLE_SHIFT_SELECTION: { const bool shiftSelection = value.Get(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextEditor %p ENABLE_SHIFT_SELECTION %d\n", impl.mController.Get(), shiftSelection ); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p ENABLE_SHIFT_SELECTION %d\n", impl.mController.Get(), shiftSelection); - impl.mController->SetShiftSelectionEnabled( shiftSelection ); + impl.mController->SetShiftSelectionEnabled(shiftSelection); break; } case Toolkit::DevelTextEditor::Property::ENABLE_GRAB_HANDLE: { const bool grabHandleEnabled = value.Get(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextEditor %p ENABLE_GRAB_HANDLE %d\n", impl.mController.Get(), grabHandleEnabled ); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p ENABLE_GRAB_HANDLE %d\n", impl.mController.Get(), grabHandleEnabled); - impl.mController->SetGrabHandleEnabled( grabHandleEnabled ); + impl.mController->SetGrabHandleEnabled(grabHandleEnabled); break; } case Toolkit::DevelTextEditor::Property::MATCH_SYSTEM_LANGUAGE_DIRECTION: { - impl.mController->SetMatchSystemLanguageDirection(value.Get< bool >()); + impl.mController->SetMatchSystemLanguageDirection(value.Get()); break; } case Toolkit::DevelTextEditor::Property::MAX_LENGTH: { - const int max = value.Get< int >(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextEditor %p MAX_LENGTH %d\n", impl.mController.Get(), max ); + const int max = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p MAX_LENGTH %d\n", impl.mController.Get(), max); - impl.mController->SetMaximumNumberOfCharacters( max ); + impl.mController->SetMaximumNumberOfCharacters(max); break; } case Toolkit::DevelTextEditor::Property::SELECTED_TEXT_START: { - uint32_t start = static_cast(value.Get< int >()); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextEditor %p SELECTED_TEXT_START %d\n", impl.mController.Get(), start ); - impl.SetTextSelectionRange( &start, nullptr ); + uint32_t start = static_cast(value.Get()); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p SELECTED_TEXT_START %d\n", impl.mController.Get(), start); + impl.SetTextSelectionRange(&start, nullptr); break; } case Toolkit::DevelTextEditor::Property::SELECTED_TEXT_END: { - uint32_t end = static_cast(value.Get< int >()); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextEditor %p SELECTED_TEXT_END %d\n", impl.mController.Get(), end ); - impl.SetTextSelectionRange( nullptr, &end ); + uint32_t end = static_cast(value.Get()); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p SELECTED_TEXT_END %d\n", impl.mController.Get(), end); + impl.SetTextSelectionRange(nullptr, &end); break; } case Toolkit::DevelTextEditor::Property::ENABLE_EDITING: { - const bool editable = value.Get< bool >(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextEditor %p ENABLE_EDITING %d\n", impl.mController.Get(), editable ); - impl.SetEditable( editable ); + const bool editable = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p ENABLE_EDITING %d\n", impl.mController.Get(), editable); + impl.SetEditable(editable); break; } case Toolkit::DevelTextEditor::Property::HORIZONTAL_SCROLL_POSITION: { - float horizontalScroll = value.Get< float >(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextEditor %p HORIZONTAL_SCROLL_POSITION %d\n", impl.mController.Get(), horizontalScroll ); - if (horizontalScroll >= 0.0f) + float horizontalScroll = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p HORIZONTAL_SCROLL_POSITION %d\n", impl.mController.Get(), horizontalScroll); + if(horizontalScroll >= 0.0f) { - impl.ScrollBy( Vector2(horizontalScroll - impl.GetHorizontalScrollPosition(), 0 )); + impl.ScrollBy(Vector2(horizontalScroll - impl.GetHorizontalScrollPosition(), 0)); } break; } case Toolkit::DevelTextEditor::Property::VERTICAL_SCROLL_POSITION: { - float verticalScroll = value.Get< float >(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextEditor %p VERTICAL_SCROLL_POSITION %d\n", impl.mController.Get(), verticalScroll ); - if (verticalScroll >= 0.0f) + float verticalScroll = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p VERTICAL_SCROLL_POSITION %d\n", impl.mController.Get(), verticalScroll); + if(verticalScroll >= 0.0f) + { + impl.ScrollBy(Vector2(0, verticalScroll - impl.GetVerticalScrollPosition())); + } + break; + } + case Toolkit::DevelTextEditor::Property::FONT_SIZE_SCALE: + { + const float scale = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p FONT_SIZE_SCALE %f\n", impl.mController.Get(), scale); + + if(!Equals(impl.mController->GetFontSizeScale(), scale)) + { + impl.mController->SetFontSizeScale(scale); + } + break; + } + case Toolkit::DevelTextEditor::Property::PRIMARY_CURSOR_POSITION: + { + uint32_t position = static_cast(value.Get()); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p PRIMARY_CURSOR_POSITION %d\n", impl.mController.Get(), position); + if(impl.mController->SetPrimaryCursorPosition(position)) { - impl.ScrollBy( Vector2(0, verticalScroll - impl.GetVerticalScrollPosition() )); + impl.SetKeyInputFocus(); + } + break; + } + case Toolkit::DevelTextEditor::Property::GRAB_HANDLE_COLOR: + { + const Vector4 color = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %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::DevelTextEditor::Property::ENABLE_GRAB_HANDLE_POPUP: + { + const bool grabHandlePopupEnabled = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p ENABLE_GRAB_HANDLE_POPUP %d\n", impl.mController.Get(), grabHandlePopupEnabled); + + impl.mController->SetGrabHandlePopupEnabled(grabHandlePopupEnabled); + break; + } + case Toolkit::DevelTextEditor::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 == textEditor) + { + impl.mInputMethodContext.ApplyOptions(impl.mInputMethodOptions); } break; } } // switch - } // texteditor + } // texteditor } -Property::Value TextEditor::GetProperty( BaseObject* object, Property::Index index ) +Property::Value TextEditor::GetProperty(BaseObject* object, Property::Index index) { Property::Value value; - Toolkit::TextEditor textEditor = Toolkit::TextEditor::DownCast( Dali::BaseHandle( object ) ); + Toolkit::TextEditor textEditor = Toolkit::TextEditor::DownCast(Dali::BaseHandle(object)); - if( textEditor ) + if(textEditor) { - TextEditor& impl( GetImpl( textEditor ) ); - DALI_ASSERT_DEBUG( impl.mController && "No text contoller" ); - DALI_ASSERT_DEBUG( impl.mDecorator && "No text decorator" ); + TextEditor& impl(GetImpl(textEditor)); + DALI_ASSERT_DEBUG(impl.mController && "No text contoller"); + DALI_ASSERT_DEBUG(impl.mDecorator && "No text decorator"); - switch( index ) + switch(index) { case Toolkit::DevelTextEditor::Property::RENDERING_BACKEND: { @@ -769,8 +827,8 @@ Property::Value TextEditor::GetProperty( BaseObject* object, Property::Index ind case Toolkit::TextEditor::Property::TEXT: { std::string text; - impl.mController->GetText( text ); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextEditor %p returning text: %s\n", impl.mController.Get(), text.c_str() ); + impl.mController->GetText(text); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p returning text: %s\n", impl.mController.Get(), text.c_str()); value = text; break; } @@ -786,20 +844,20 @@ Property::Value TextEditor::GetProperty( BaseObject* object, Property::Index ind } case Toolkit::TextEditor::Property::FONT_STYLE: { - GetFontStyleProperty( impl.mController, value, Text::FontStyle::DEFAULT ); + GetFontStyleProperty(impl.mController, value, Text::FontStyle::DEFAULT); break; } case Toolkit::TextEditor::Property::POINT_SIZE: { - value = impl.mController->GetDefaultFontSize( Text::Controller::POINT_SIZE ); + value = impl.mController->GetDefaultFontSize(Text::Controller::POINT_SIZE); break; } case Toolkit::TextEditor::Property::HORIZONTAL_ALIGNMENT: { - const char* name = GetHorizontalAlignmentString( impl.mController->GetHorizontalAlignment() ); - if( name ) + const char* name = GetHorizontalAlignmentString(impl.mController->GetHorizontalAlignment()); + if(name) { - value = std::string( name ); + value = std::string(name); } break; } @@ -815,12 +873,12 @@ Property::Value TextEditor::GetProperty( BaseObject* object, Property::Index ind } case Toolkit::TextEditor::Property::PRIMARY_CURSOR_COLOR: { - value = impl.mDecorator->GetColor( PRIMARY_CURSOR ); + value = impl.mDecorator->GetColor(PRIMARY_CURSOR); break; } case Toolkit::TextEditor::Property::SECONDARY_CURSOR_COLOR: { - value = impl.mDecorator->GetColor( SECONDARY_CURSOR ); + value = impl.mDecorator->GetColor(SECONDARY_CURSOR); break; } case Toolkit::TextEditor::Property::ENABLE_CURSOR_BLINK: @@ -845,42 +903,42 @@ Property::Value TextEditor::GetProperty( BaseObject* object, Property::Index ind } case Toolkit::TextEditor::Property::GRAB_HANDLE_IMAGE: { - value = impl.mDecorator->GetHandleImage( GRAB_HANDLE, HANDLE_IMAGE_RELEASED ); + value = impl.mDecorator->GetHandleImage(GRAB_HANDLE, HANDLE_IMAGE_RELEASED); break; } case Toolkit::TextEditor::Property::GRAB_HANDLE_PRESSED_IMAGE: { - value = impl.mDecorator->GetHandleImage( GRAB_HANDLE, HANDLE_IMAGE_PRESSED ); + value = impl.mDecorator->GetHandleImage(GRAB_HANDLE, HANDLE_IMAGE_PRESSED); break; } case Toolkit::TextEditor::Property::SELECTION_HANDLE_IMAGE_LEFT: { - impl.GetHandleImagePropertyValue( value, LEFT_SELECTION_HANDLE, HANDLE_IMAGE_RELEASED ); + impl.GetHandleImagePropertyValue(value, LEFT_SELECTION_HANDLE, HANDLE_IMAGE_RELEASED); break; } case Toolkit::TextEditor::Property::SELECTION_HANDLE_IMAGE_RIGHT: { - impl.GetHandleImagePropertyValue( value, RIGHT_SELECTION_HANDLE, HANDLE_IMAGE_RELEASED ) ; + impl.GetHandleImagePropertyValue(value, RIGHT_SELECTION_HANDLE, HANDLE_IMAGE_RELEASED); break; } case Toolkit::TextEditor::Property::SELECTION_HANDLE_PRESSED_IMAGE_LEFT: { - impl.GetHandleImagePropertyValue( value, LEFT_SELECTION_HANDLE, HANDLE_IMAGE_PRESSED ); + impl.GetHandleImagePropertyValue(value, LEFT_SELECTION_HANDLE, HANDLE_IMAGE_PRESSED); break; } case Toolkit::TextEditor::Property::SELECTION_HANDLE_PRESSED_IMAGE_RIGHT: { - impl.GetHandleImagePropertyValue( value, RIGHT_SELECTION_HANDLE, HANDLE_IMAGE_PRESSED ); + impl.GetHandleImagePropertyValue(value, RIGHT_SELECTION_HANDLE, HANDLE_IMAGE_PRESSED); break; } case Toolkit::TextEditor::Property::SELECTION_HANDLE_MARKER_IMAGE_LEFT: { - impl.GetHandleImagePropertyValue( value, LEFT_SELECTION_HANDLE_MARKER, HANDLE_IMAGE_RELEASED ); + impl.GetHandleImagePropertyValue(value, LEFT_SELECTION_HANDLE_MARKER, HANDLE_IMAGE_RELEASED); break; } case Toolkit::TextEditor::Property::SELECTION_HANDLE_MARKER_IMAGE_RIGHT: { - impl.GetHandleImagePropertyValue( value, RIGHT_SELECTION_HANDLE_MARKER, HANDLE_IMAGE_RELEASED ); + impl.GetHandleImagePropertyValue(value, RIGHT_SELECTION_HANDLE_MARKER, HANDLE_IMAGE_RELEASED); break; } case Toolkit::TextEditor::Property::SELECTION_HIGHLIGHT_COLOR: @@ -891,7 +949,7 @@ Property::Value TextEditor::GetProperty( BaseObject* object, Property::Index ind case Toolkit::TextEditor::Property::DECORATION_BOUNDING_BOX: { Rect boundingBox; - impl.mDecorator->GetBoundingBox( boundingBox ); + impl.mDecorator->GetBoundingBox(boundingBox); value = boundingBox; break; } @@ -912,7 +970,7 @@ Property::Value TextEditor::GetProperty( BaseObject* object, Property::Index ind } case Toolkit::TextEditor::Property::INPUT_FONT_STYLE: { - GetFontStyleProperty( impl.mController, value, Text::FontStyle::INPUT ); + GetFontStyleProperty(impl.mController, value, Text::FontStyle::INPUT); break; } case Toolkit::TextEditor::Property::INPUT_POINT_SIZE: @@ -934,42 +992,42 @@ Property::Value TextEditor::GetProperty( BaseObject* object, Property::Index ind } case Toolkit::TextEditor::Property::UNDERLINE: { - GetUnderlineProperties( impl.mController, value, Text::EffectStyle::DEFAULT ); + GetUnderlineProperties(impl.mController, value, Text::EffectStyle::DEFAULT); break; } case Toolkit::TextEditor::Property::INPUT_UNDERLINE: { - GetUnderlineProperties( impl.mController, value, Text::EffectStyle::INPUT ); + GetUnderlineProperties(impl.mController, value, Text::EffectStyle::INPUT); break; } case Toolkit::TextEditor::Property::SHADOW: { - GetShadowProperties( impl.mController, value, Text::EffectStyle::DEFAULT ); + GetShadowProperties(impl.mController, value, Text::EffectStyle::DEFAULT); break; } case Toolkit::TextEditor::Property::INPUT_SHADOW: { - GetShadowProperties( impl.mController, value, Text::EffectStyle::INPUT ); + GetShadowProperties(impl.mController, value, Text::EffectStyle::INPUT); break; } case Toolkit::TextEditor::Property::EMBOSS: { - GetEmbossProperties( impl.mController, value, Text::EffectStyle::DEFAULT ); + GetEmbossProperties(impl.mController, value, Text::EffectStyle::DEFAULT); break; } case Toolkit::TextEditor::Property::INPUT_EMBOSS: { - GetEmbossProperties( impl.mController, value, Text::EffectStyle::INPUT ); + GetEmbossProperties(impl.mController, value, Text::EffectStyle::INPUT); break; } case Toolkit::TextEditor::Property::OUTLINE: { - GetOutlineProperties( impl.mController, value, Text::EffectStyle::DEFAULT ); + GetOutlineProperties(impl.mController, value, Text::EffectStyle::DEFAULT); break; } case Toolkit::TextEditor::Property::INPUT_OUTLINE: { - GetOutlineProperties( impl.mController, value, Text::EffectStyle::INPUT ); + GetOutlineProperties(impl.mController, value, Text::EffectStyle::INPUT); break; } case Toolkit::TextEditor::Property::SMOOTH_SCROLL: @@ -999,19 +1057,19 @@ Property::Value TextEditor::GetProperty( BaseObject* object, Property::Index ind } case Toolkit::TextEditor::Property::PIXEL_SIZE: { - value = impl.mController->GetDefaultFontSize( Text::Controller::PIXEL_SIZE ); + value = impl.mController->GetDefaultFontSize(Text::Controller::PIXEL_SIZE); break; } case Toolkit::TextEditor::Property::LINE_COUNT: { - float width = textEditor.GetProperty( Actor::Property::SIZE_WIDTH ).Get(); - value = impl.mController->GetLineCount( width ); + float width = textEditor.GetProperty(Actor::Property::SIZE_WIDTH).Get(); + value = impl.mController->GetLineCount(width); break; } case Toolkit::DevelTextEditor::Property::PLACEHOLDER_TEXT: { std::string text; - impl.mController->GetPlaceholderText( Controller::PLACEHOLDER_TYPE_INACTIVE, text ); + impl.mController->GetPlaceholderText(Controller::PLACEHOLDER_TYPE_INACTIVE, text); value = text; break; } @@ -1028,7 +1086,7 @@ Property::Value TextEditor::GetProperty( BaseObject* object, Property::Index ind case Toolkit::TextEditor::Property::PLACEHOLDER: { Property::Map map; - impl.mController->GetPlaceholderProperty( map ); + impl.mController->GetPlaceholderProperty(map); value = map; break; } @@ -1059,19 +1117,19 @@ Property::Value TextEditor::GetProperty( BaseObject* object, Property::Index ind } case Toolkit::DevelTextEditor::Property::SELECTED_TEXT: { - value = impl.mController->GetSelectedText( ); + value = impl.mController->GetSelectedText(); break; } case Toolkit::DevelTextEditor::Property::SELECTED_TEXT_START: { Uint32Pair range = impl.GetTextSelectionRange(); - value = static_cast(range.first); + value = static_cast(range.first); break; } case Toolkit::DevelTextEditor::Property::SELECTED_TEXT_END: { Uint32Pair range = impl.GetTextSelectionRange(); - value = static_cast(range.second); + value = static_cast(range.second); break; } case Toolkit::DevelTextEditor::Property::ENABLE_EDITING: @@ -1089,6 +1147,33 @@ Property::Value TextEditor::GetProperty( BaseObject* object, Property::Index ind value = impl.GetVerticalScrollPosition(); break; } + case Toolkit::DevelTextEditor::Property::FONT_SIZE_SCALE: + { + value = impl.mController->GetFontSizeScale(); + break; + } + case Toolkit::DevelTextEditor::Property::PRIMARY_CURSOR_POSITION: + { + value = static_cast(impl.mController->GetPrimaryCursorPosition()); + break; + } + case Toolkit::DevelTextEditor::Property::GRAB_HANDLE_COLOR: + { + value = impl.mDecorator->GetHandleColor(); + break; + } + case Toolkit::DevelTextEditor::Property::ENABLE_GRAB_HANDLE_POPUP: + { + value = impl.mController->IsGrabHandlePopupEnabled(); + break; + } + case Toolkit::DevelTextEditor::Property::INPUT_METHOD_SETTINGS: + { + Property::Map map; + impl.mInputMethodOptions.RetrieveProperty(map); + value = map; + break; + } } //switch } @@ -1097,7 +1182,7 @@ Property::Value TextEditor::GetProperty( BaseObject* object, Property::Index ind void TextEditor::SelectWholeText() { - if( mController && mController->IsShowingRealText() ) + if(mController && mController->IsShowingRealText()) { mController->SelectWholeText(); SetKeyInputFocus(); @@ -1106,7 +1191,7 @@ void TextEditor::SelectWholeText() void TextEditor::SelectNone() { - if( mController && mController->IsShowingRealText() ) + if(mController && mController->IsShowingRealText()) { mController->SelectNone(); } @@ -1114,7 +1199,7 @@ void TextEditor::SelectNone() void TextEditor::ScrollBy(Vector2 scroll) { - if( mController && mController->IsShowingRealText() ) + if(mController && mController->IsShowingRealText()) { mController->ScrollBy(scroll); } @@ -1122,7 +1207,7 @@ void TextEditor::ScrollBy(Vector2 scroll) float TextEditor::GetHorizontalScrollPosition() { - if( mController && mController->IsShowingRealText() ) + if(mController && mController->IsShowingRealText()) { return mController->GetHorizontalScrollPosition(); } @@ -1131,7 +1216,7 @@ float TextEditor::GetHorizontalScrollPosition() float TextEditor::GetVerticalScrollPosition() { - if( mController && mController->IsShowingRealText() ) + if(mController && mController->IsShowingRealText()) { return mController->GetVerticalScrollPosition(); } @@ -1141,9 +1226,9 @@ float TextEditor::GetVerticalScrollPosition() string TextEditor::GetSelectedText() const { string selectedText = ""; - if( mController && mController->IsShowingRealText() ) + if(mController && mController->IsShowingRealText()) { - selectedText = mController->GetSelectedText( ); + selectedText = mController->GetSelectedText(); } return selectedText; } @@ -1158,27 +1243,45 @@ DevelTextEditor::MaxLengthReachedSignalType& TextEditor::MaxLengthReachedSignal( return mMaxLengthReachedSignal; } -bool TextEditor::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor ) +DevelTextEditor::AnchorClickedSignalType& TextEditor::AnchorClickedSignal() +{ + return mAnchorClickedSignal; +} + +Text::ControllerPtr TextEditor::getController() +{ + return mController; +} + +bool TextEditor::DoConnectSignal(BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor) { - Dali::BaseHandle handle( object ); + Dali::BaseHandle handle(object); - bool connected( true ); - Toolkit::TextEditor editor = Toolkit::TextEditor::DownCast( handle ); + bool connected(true); + Toolkit::TextEditor editor = Toolkit::TextEditor::DownCast(handle); - if( 0 == strcmp( signalName.c_str(), SIGNAL_TEXT_CHANGED ) ) + if(0 == strcmp(signalName.c_str(), SIGNAL_TEXT_CHANGED)) { - editor.TextChangedSignal().Connect( tracker, functor ); + editor.TextChangedSignal().Connect(tracker, functor); } - else if( 0 == strcmp( signalName.c_str(), SIGNAL_INPUT_STYLE_CHANGED ) ) + else if(0 == strcmp(signalName.c_str(), SIGNAL_INPUT_STYLE_CHANGED)) { - editor.InputStyleChangedSignal().Connect( tracker, functor ); + editor.InputStyleChangedSignal().Connect(tracker, functor); } - else if( 0 == strcmp( signalName.c_str(), SIGNAL_MAX_LENGTH_REACHED ) ) + else if(0 == strcmp(signalName.c_str(), SIGNAL_MAX_LENGTH_REACHED)) { - if( editor ) + if(editor) { - Internal::TextEditor& editorImpl( GetImpl( editor ) ); - editorImpl.MaxLengthReachedSignal().Connect( tracker, functor ); + Internal::TextEditor& editorImpl(GetImpl(editor)); + editorImpl.MaxLengthReachedSignal().Connect(tracker, functor); + } + } + else if(0 == strcmp(signalName.c_str(), SIGNAL_ANCHOR_CLICKED)) + { + if(editor) + { + Internal::TextEditor& editorImpl(GetImpl(editor)); + editorImpl.AnchorClickedSignal().Connect(tracker, functor); } } else @@ -1209,103 +1312,110 @@ void TextEditor::OnInitialize() { Actor self = Self(); - mController = Text::Controller::New( this, this, this); + mController = Text::Controller::New(this, this, this, this); - mDecorator = Text::Decorator::New( *mController, - *mController ); + mDecorator = Text::Decorator::New(*mController, + *mController); - mInputMethodContext = InputMethodContext::New( self ); + mInputMethodContext = InputMethodContext::New(self); - mController->GetLayoutEngine().SetLayout( Layout::Engine::MULTI_LINE_BOX ); + mController->GetLayoutEngine().SetLayout(Layout::Engine::MULTI_LINE_BOX); // Enables the text input. - mController->EnableTextInput( mDecorator, mInputMethodContext ); + mController->EnableTextInput(mDecorator, mInputMethodContext); // Enables the vertical scrolling after the text input has been enabled. - mController->SetVerticalScrollEnabled( true ); + mController->SetVerticalScrollEnabled(true); // Disables the horizontal scrolling. - mController->SetHorizontalScrollEnabled( false ); + mController->SetHorizontalScrollEnabled(false); // Sets the maximum number of characters. - mController->SetMaximumNumberOfCharacters( std::numeric_limits::max() ); + mController->SetMaximumNumberOfCharacters(std::numeric_limits::max()); // Enable the smooth handle panning. - mController->SetSmoothHandlePanEnabled( true ); + mController->SetSmoothHandlePanEnabled(true); - mController->SetNoTextDoubleTapAction( Controller::NoTextTap::HIGHLIGHT ); - mController->SetNoTextLongPressAction( Controller::NoTextTap::HIGHLIGHT ); + mController->SetNoTextDoubleTapAction(Controller::NoTextTap::HIGHLIGHT); + mController->SetNoTextLongPressAction(Controller::NoTextTap::HIGHLIGHT); // Sets layoutDirection value - Dali::Stage stage = Dali::Stage::GetCurrent(); - Dali::LayoutDirection::Type layoutDirection = static_cast( stage.GetRootLayer().GetProperty( Dali::Actor::Property::LAYOUT_DIRECTION ).Get() ); - mController->SetLayoutDirection( layoutDirection ); + Dali::Stage stage = Dali::Stage::GetCurrent(); + Dali::LayoutDirection::Type layoutDirection = static_cast(stage.GetRootLayer().GetProperty(Dali::Actor::Property::LAYOUT_DIRECTION).Get()); + mController->SetLayoutDirection(layoutDirection); // Forward input events to controller - EnableGestureDetection( static_cast( GestureType::TAP | GestureType::PAN | GestureType::LONG_PRESS ) ); - GetTapGestureDetector().SetMaximumTapsRequired( 2 ); + EnableGestureDetection(static_cast(GestureType::TAP | GestureType::PAN | GestureType::LONG_PRESS)); + GetTapGestureDetector().SetMaximumTapsRequired(2); - self.TouchedSignal().Connect( this, &TextEditor::OnTouched ); + self.TouchedSignal().Connect(this, &TextEditor::OnTouched); // Set BoundingBox to stage size if not already set. Rect boundingBox; - mDecorator->GetBoundingBox( boundingBox ); + mDecorator->GetBoundingBox(boundingBox); - if( boundingBox.IsEmpty() ) + if(boundingBox.IsEmpty()) { Vector2 stageSize = Dali::Stage::GetCurrent().GetSize(); - mDecorator->SetBoundingBox( Rect( 0.0f, 0.0f, stageSize.width, stageSize.height ) ); + mDecorator->SetBoundingBox(Rect(0.0f, 0.0f, stageSize.width, stageSize.height)); } // Whether to flip the selection handles as soon as they cross. - mDecorator->FlipSelectionHandlesOnCrossEnabled( true ); + mDecorator->FlipSelectionHandlesOnCrossEnabled(true); // Set the default scroll speed. - mDecorator->SetScrollSpeed( DEFAULT_SCROLL_SPEED ); + mDecorator->SetScrollSpeed(DEFAULT_SCROLL_SPEED); // Fill-parent area by default - self.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); - self.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::HEIGHT ); - self.OnSceneSignal().Connect( this, &TextEditor::OnSceneConnect ); + self.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH); + self.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::HEIGHT); + self.OnSceneSignal().Connect(this, &TextEditor::OnSceneConnect); + + //Enable highightability + self.SetProperty(Toolkit::DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE, true); - DevelControl::SetInputMethodContext( *this, mInputMethodContext ); + DevelControl::SetInputMethodContext(*this, mInputMethodContext); // Creates an extra control to be used as stencil buffer. mStencil = Control::New(); - mStencil.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); - mStencil.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + mStencil.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT); + mStencil.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT); // Creates a background visual. Even if the color is transparent it updates the stencil. - mStencil.SetProperty( Toolkit::Control::Property::BACKGROUND, - Property::Map().Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::COLOR ). - Add( ColorVisual::Property::MIX_COLOR, Color::TRANSPARENT ) ); + mStencil.SetProperty(Toolkit::Control::Property::BACKGROUND, + Property::Map().Add(Toolkit::Visual::Property::TYPE, Toolkit::Visual::COLOR).Add(ColorVisual::Property::MIX_COLOR, Color::TRANSPARENT)); // Enable the clipping property. - mStencil.SetProperty( Actor::Property::CLIPPING_MODE, ClippingMode::CLIP_TO_BOUNDING_BOX ); - mStencil.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); + mStencil.SetProperty(Actor::Property::CLIPPING_MODE, ClippingMode::CLIP_TO_BOUNDING_BOX); + mStencil.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS); + + self.Add(mStencil); - self.Add( mStencil ); + DevelControl::SetAccessibilityConstructor(self, [](Dali::Actor actor) { + return std::unique_ptr( + new AccessibleImpl(actor, Dali::Accessibility::Role::ENTRY)); + }); } -void TextEditor::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change ) +void TextEditor::OnStyleChange(Toolkit::StyleManager styleManager, StyleChange::Type change) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextEditor::OnStyleChange\n"); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextEditor::OnStyleChange\n"); - switch ( change ) + switch(change) { case StyleChange::DEFAULT_FONT_CHANGE: { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextEditor::OnStyleChange DEFAULT_FONT_CHANGE\n"); - const std::string& newFont = GetImpl( styleManager ).GetDefaultFontFamily(); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextEditor::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 ); + mController->UpdateAfterFontChange(newFont); RelayoutRequest(); break; } case StyleChange::DEFAULT_FONT_SIZE_CHANGE: { - GetImpl( styleManager ).ApplyThemeStyle( Toolkit::Control( GetOwner() ) ); + GetImpl(styleManager).ApplyThemeStyle(Toolkit::Control(GetOwner())); RelayoutRequest(); break; } @@ -1317,145 +1427,160 @@ void TextEditor::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange: } // Up call to Control - Control::OnStyleChange( styleManager, change ); + Control::OnStyleChange(styleManager, change); } Vector3 TextEditor::GetNaturalSize() { Extents padding; - padding = Self().GetProperty( Toolkit::Control::Property::PADDING ); + padding = Self().GetProperty(Toolkit::Control::Property::PADDING); Vector3 naturalSize = mController->GetNaturalSize(); - naturalSize.width += ( padding.start + padding.end ); - naturalSize.height += ( padding.top + padding.bottom ); + naturalSize.width += (padding.start + padding.end); + naturalSize.height += (padding.top + padding.bottom); return naturalSize; } -float TextEditor::GetHeightForWidth( float width ) +float TextEditor::GetHeightForWidth(float width) { Extents padding; - padding = Self().GetProperty( Toolkit::Control::Property::PADDING ); - return mController->GetHeightForWidth( width ) + padding.top + padding.bottom; + padding = Self().GetProperty(Toolkit::Control::Property::PADDING); + return mController->GetHeightForWidth(width) + padding.top + padding.bottom; } -void TextEditor::OnRelayout( const Vector2& size, RelayoutContainer& container ) +void TextEditor::ResizeActor(Actor& actor, const Vector2& size) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextEditor OnRelayout\n"); + if(actor.GetProperty(Dali::Actor::Property::SIZE).GetVectorXY() != size) + { + actor.SetProperty(Actor::Property::SIZE, size); + } +} + +void TextEditor::OnRelayout(const Vector2& size, RelayoutContainer& container) +{ + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextEditor OnRelayout\n"); Actor self = Self(); Extents padding; - padding = self.GetProperty( Toolkit::Control::Property::PADDING ); + padding = self.GetProperty(Toolkit::Control::Property::PADDING); - Vector2 contentSize( size.x - ( padding.start + padding.end ), size.y - ( padding.top + padding.bottom ) ); + Vector2 contentSize(size.x - (padding.start + padding.end), size.y - (padding.top + padding.bottom)); // Support Right-To-Left of padding Dali::LayoutDirection::Type layoutDirection; - if( mController->IsMatchSystemLanguageDirection() ) + if(mController->IsMatchSystemLanguageDirection()) { - layoutDirection = static_cast( DevelWindow::Get( self ).GetRootLayer().GetProperty( Dali::Actor::Property::LAYOUT_DIRECTION ).Get() ); + layoutDirection = static_cast(DevelWindow::Get(self).GetRootLayer().GetProperty(Dali::Actor::Property::LAYOUT_DIRECTION).Get()); } else { - layoutDirection = static_cast( self.GetProperty( Dali::Actor::Property::LAYOUT_DIRECTION ).Get() ); + layoutDirection = static_cast(self.GetProperty(Dali::Actor::Property::LAYOUT_DIRECTION).Get()); } - if( Dali::LayoutDirection::RIGHT_TO_LEFT == layoutDirection ) + if(Dali::LayoutDirection::RIGHT_TO_LEFT == layoutDirection) { - std::swap( padding.start, padding.end ); + std::swap(padding.start, padding.end); } - if( mStencil ) + if(mStencil) { - mStencil.SetProperty( Actor::Property::POSITION, Vector2( padding.start, padding.top )); + mStencil.SetProperty(Actor::Property::POSITION, Vector2(padding.start, padding.top)); + ResizeActor(mStencil, contentSize); } - if( mActiveLayer ) + if(mActiveLayer) { - mActiveLayer.SetProperty( Actor::Property::POSITION, Vector2( padding.start, padding.top )); + mActiveLayer.SetProperty(Actor::Property::POSITION, Vector2(padding.start, padding.top)); + ResizeActor(mActiveLayer, contentSize); } - const Text::Controller::UpdateTextType updateTextType = mController->Relayout( contentSize, layoutDirection ); + // If there is text changed, callback is called. + if(mTextChanged) + { + EmitTextChangedSignal(); + } - if( ( Text::Controller::NONE_UPDATED != updateTextType ) || - !mRenderer ) + const Text::Controller::UpdateTextType updateTextType = mController->Relayout(contentSize, layoutDirection); + + if((Text::Controller::NONE_UPDATED != updateTextType) || + !mRenderer) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextEditor::OnRelayout %p Displaying new contents\n", mController.Get() ); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextEditor::OnRelayout %p Displaying new contents\n", mController.Get()); - if( mDecorator && - ( Text::Controller::NONE_UPDATED != ( Text::Controller::DECORATOR_UPDATED & updateTextType ) ) ) + if(mDecorator && + (Text::Controller::NONE_UPDATED != (Text::Controller::DECORATOR_UPDATED & updateTextType))) { - mDecorator->Relayout( size ); + mDecorator->Relayout(contentSize); } - if( !mRenderer ) + if(!mRenderer) { - mRenderer = Backend::Get().NewRenderer( mRenderingBackend ); + mRenderer = Backend::Get().NewRenderer(mRenderingBackend); } - RenderText( updateTextType ); - + RenderText(updateTextType); } // The text-editor emits signals when the input style changes. These changes of style are // detected during the relayout process (size negotiation), i.e after the cursor has been moved. Signals // can't be emitted during the size negotiation as the callbacks may update the UI. // The text-editor adds an idle callback to the adaptor to emit the signals after the size negotiation. - if( !mController->IsInputStyleChangedSignalsQueueEmpty() ) + if(!mController->IsInputStyleChangedSignalsQueueEmpty()) { - if( Adaptor::IsAvailable() ) + if(Adaptor::IsAvailable()) { Adaptor& adaptor = Adaptor::Get(); - if( NULL == mIdleCallback ) + if(NULL == mIdleCallback) { // @note: The callback manager takes the ownership of the callback object. - mIdleCallback = MakeCallback( this, &TextEditor::OnIdleSignal ); - adaptor.AddIdle( mIdleCallback, false ); + mIdleCallback = MakeCallback(this, &TextEditor::OnIdleSignal); + adaptor.AddIdle(mIdleCallback, false); } } } } -void TextEditor::RenderText( Text::Controller::UpdateTextType updateTextType ) +void TextEditor::RenderText(Text::Controller::UpdateTextType updateTextType) { Actor renderableActor; - if( Text::Controller::NONE_UPDATED != ( Text::Controller::MODEL_UPDATED & updateTextType ) ) + if(Text::Controller::NONE_UPDATED != (Text::Controller::MODEL_UPDATED & updateTextType)) { - if( mRenderer ) + if(mRenderer) { - Dali::Toolkit::TextEditor handle = Dali::Toolkit::TextEditor( GetOwner() ); + Dali::Toolkit::TextEditor handle = Dali::Toolkit::TextEditor(GetOwner()); - renderableActor = mRenderer->Render( mController->GetView(), - handle, - Property::INVALID_INDEX, // Animatable property not supported - mAlignmentOffset, - DepthIndex::CONTENT ); + renderableActor = mRenderer->Render(mController->GetView(), + handle, + Property::INVALID_INDEX, // Animatable property not supported + mAlignmentOffset, + DepthIndex::CONTENT); } - if( renderableActor != mRenderableActor ) + if(renderableActor != mRenderableActor) { - UnparentAndReset( mRenderableActor ); + UnparentAndReset(mRenderableActor); mRenderableActor = renderableActor; } } - if( mRenderableActor ) + if(mRenderableActor) { // Make sure the actors are parented correctly with/without clipping Actor self = mStencil ? mStencil : Self(); - for( std::vector::iterator it = mClippingDecorationActors.begin(), - endIt = mClippingDecorationActors.end(); - it != endIt; - ++it ) + for(std::vector::iterator it = mClippingDecorationActors.begin(), + endIt = mClippingDecorationActors.end(); + it != endIt; + ++it) { - self.Add( *it ); + self.Add(*it); it->LowerToBottom(); } mClippingDecorationActors.clear(); - self.Add( mRenderableActor ); + self.Add(mRenderableActor); ApplyScrollPosition(); } @@ -1464,101 +1589,112 @@ void TextEditor::RenderText( Text::Controller::UpdateTextType updateTextType ) void TextEditor::OnKeyInputFocusGained() { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextEditor::OnKeyInputFocusGained %p\n", mController.Get() ); - if ( mInputMethodContext && IsEditable() ) + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextEditor::OnKeyInputFocusGained %p\n", mController.Get()); + if(mInputMethodContext && IsEditable()) { - mInputMethodContext.StatusChangedSignal().Connect( this, &TextEditor::KeyboardStatusChanged ); + // All input panel properties, such as layout, return key type, and input hint, should be set before input panel activates (or shows). + mInputMethodContext.ApplyOptions(mInputMethodOptions); + mInputMethodContext.NotifyTextInputMultiLine(true); + + mInputMethodContext.StatusChangedSignal().Connect(this, &TextEditor::KeyboardStatusChanged); - mInputMethodContext.EventReceivedSignal().Connect( this, &TextEditor::OnInputMethodContextEvent ); + mInputMethodContext.EventReceivedSignal().Connect(this, &TextEditor::OnInputMethodContextEvent); // Notify that the text editing start. mInputMethodContext.Activate(); // When window gain lost focus, the InputMethodContext is deactivated. Thus when window gain focus again, the InputMethodContext must be activated. - mInputMethodContext.SetRestoreAfterFocusLost( true ); + mInputMethodContext.SetRestoreAfterFocusLost(true); } - ClipboardEventNotifier notifier( ClipboardEventNotifier::Get() ); + ClipboardEventNotifier notifier(ClipboardEventNotifier::Get()); - if ( notifier ) + if(notifier) { - notifier.ContentSelectedSignal().Connect( this, &TextEditor::OnClipboardTextSelected ); + notifier.ContentSelectedSignal().Connect(this, &TextEditor::OnClipboardTextSelected); } mController->KeyboardFocusGainEvent(); // Called in the case of no virtual keyboard to trigger this event - EmitKeyInputFocusSignal( true ); // Calls back into the Control hence done last. + EmitKeyInputFocusSignal(true); // Calls back into the Control hence done last. } void TextEditor::OnKeyInputFocusLost() { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextEditor:OnKeyInputFocusLost %p\n", mController.Get() ); - if ( mInputMethodContext ) + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextEditor:OnKeyInputFocusLost %p\n", mController.Get()); + if(mInputMethodContext) { - mInputMethodContext.StatusChangedSignal().Disconnect( this, &TextEditor::KeyboardStatusChanged ); + mInputMethodContext.StatusChangedSignal().Disconnect(this, &TextEditor::KeyboardStatusChanged); // The text editing is finished. Therefore the InputMethodContext don't have restore activation. - mInputMethodContext.SetRestoreAfterFocusLost( false ); + mInputMethodContext.SetRestoreAfterFocusLost(false); // Notify that the text editing finish. mInputMethodContext.Deactivate(); - mInputMethodContext.EventReceivedSignal().Disconnect( this, &TextEditor::OnInputMethodContextEvent ); + mInputMethodContext.EventReceivedSignal().Disconnect(this, &TextEditor::OnInputMethodContextEvent); } - ClipboardEventNotifier notifier( ClipboardEventNotifier::Get() ); + ClipboardEventNotifier notifier(ClipboardEventNotifier::Get()); - if ( notifier ) + if(notifier) { - notifier.ContentSelectedSignal().Disconnect( this, &TextEditor::OnClipboardTextSelected ); + notifier.ContentSelectedSignal().Disconnect(this, &TextEditor::OnClipboardTextSelected); } mController->KeyboardFocusLostEvent(); - EmitKeyInputFocusSignal( false ); // Calls back into the Control hence done last. + EmitKeyInputFocusSignal(false); // Calls back into the Control hence done last. } -void TextEditor::OnTap( const TapGesture& gesture ) +bool TextEditor::OnAccessibilityActivated() { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextEditor::OnTap %p\n", mController.Get() ); - if ( mInputMethodContext && IsEditable() ) + SetKeyInputFocus(); + return true; +} + +void TextEditor::OnTap(const TapGesture& gesture) +{ + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextEditor::OnTap %p\n", mController.Get()); + if(mInputMethodContext && IsEditable()) { mInputMethodContext.Activate(); } // Deliver the tap before the focus event to controller; this allows us to detect when focus is gained due to tap-gestures Extents padding; - padding = Self().GetProperty( Toolkit::Control::Property::PADDING ); + padding = Self().GetProperty(Toolkit::Control::Property::PADDING); const Vector2& localPoint = gesture.GetLocalPoint(); - mController->TapEvent( gesture.GetNumberOfTaps(), localPoint.x - padding.start, localPoint.y - padding.top ); + mController->TapEvent(gesture.GetNumberOfTaps(), localPoint.x - padding.start, localPoint.y - padding.top); + mController->AnchorEvent(localPoint.x - padding.start, localPoint.y - padding.top); SetKeyInputFocus(); } -void TextEditor::OnPan( const PanGesture& gesture ) +void TextEditor::OnPan(const PanGesture& gesture) { - mController->PanEvent( gesture.GetState(), gesture.GetDisplacement() ); + mController->PanEvent(gesture.GetState(), gesture.GetDisplacement()); } -void TextEditor::OnLongPress( const LongPressGesture& gesture ) +void TextEditor::OnLongPress(const LongPressGesture& gesture) { - if ( mInputMethodContext && IsEditable() ) + if(mInputMethodContext && IsEditable()) { mInputMethodContext.Activate(); } Extents padding; - padding = Self().GetProperty( Toolkit::Control::Property::PADDING ); + padding = Self().GetProperty(Toolkit::Control::Property::PADDING); const Vector2& localPoint = gesture.GetLocalPoint(); - mController->LongPressEvent( gesture.GetState(), localPoint.x - padding.start, localPoint.y - padding.top ); + mController->LongPressEvent(gesture.GetState(), localPoint.x - padding.start, localPoint.y - padding.top); SetKeyInputFocus(); } -bool TextEditor::OnKeyEvent( const KeyEvent& event ) +bool TextEditor::OnKeyEvent(const KeyEvent& event) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextEditor::OnKeyEvent %p keyCode %d\n", mController.Get(), event.GetKeyCode() ); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextEditor::OnKeyEvent %p keyCode %d\n", mController.Get(), event.GetKeyCode()); - if( Dali::DALI_KEY_ESCAPE == event.GetKeyCode() && mController->ShouldClearFocusOnEscape() ) + if(Dali::DALI_KEY_ESCAPE == event.GetKeyCode() && mController->ShouldClearFocusOnEscape()) { // Make sure ClearKeyInputFocus when only key is up - if( event.GetState() == KeyEvent::UP ) + if(event.GetState() == KeyEvent::UP) { ClearKeyInputFocus(); } @@ -1566,7 +1702,7 @@ bool TextEditor::OnKeyEvent( const KeyEvent& event ) return true; } - return mController->KeyEvent( event ); + return mController->KeyEvent(event); } void TextEditor::RequestTextRelayout() @@ -1574,95 +1710,138 @@ void TextEditor::RequestTextRelayout() RelayoutRequest(); } -void TextEditor::TextChanged() +void TextEditor::TextInserted(unsigned int position, unsigned int length, const std::string& content) +{ + if(Accessibility::IsUp()) + { + Control::Impl::GetAccessibilityObject(Self())->EmitTextInserted(position, length, content); + } +} + +void TextEditor::TextDeleted(unsigned int position, unsigned int length, const std::string& content) +{ + if(Accessibility::IsUp()) + { + Control::Impl::GetAccessibilityObject(Self())->EmitTextDeleted(position, length, content); + } +} + +void TextEditor::CaretMoved(unsigned int position) +{ + if(Accessibility::IsUp()) + { + Control::Impl::GetAccessibilityObject(Self())->EmitTextCaretMoved(position); + } +} + +void TextEditor::TextChanged(bool immediate) { - Dali::Toolkit::TextEditor handle( GetOwner() ); - mTextChangedSignal.Emit( handle ); + if(immediate) // Emits TextChangedSignal immediately + { + EmitTextChangedSignal(); + } + else + { + mTextChanged = true; + } +} + +void TextEditor::EmitTextChangedSignal() +{ + Dali::Toolkit::TextEditor handle(GetOwner()); + mTextChangedSignal.Emit(handle); + mTextChanged = false; } void TextEditor::MaxLengthReached() { - Dali::Toolkit::TextEditor handle( GetOwner() ); - mMaxLengthReachedSignal.Emit( handle ); + Dali::Toolkit::TextEditor handle(GetOwner()); + mMaxLengthReachedSignal.Emit(handle); } -void TextEditor::InputStyleChanged( Text::InputStyle::Mask inputStyleMask ) +void TextEditor::InputStyleChanged(Text::InputStyle::Mask inputStyleMask) { - Dali::Toolkit::TextEditor handle( GetOwner() ); + Dali::Toolkit::TextEditor handle(GetOwner()); Toolkit::TextEditor::InputStyle::Mask editorInputStyleMask = Toolkit::TextEditor::InputStyle::NONE; - if( InputStyle::NONE != static_cast( inputStyleMask & InputStyle::INPUT_COLOR ) ) + if(InputStyle::NONE != static_cast(inputStyleMask & InputStyle::INPUT_COLOR)) { - editorInputStyleMask = static_cast( editorInputStyleMask | Toolkit::TextEditor::InputStyle::COLOR ); + editorInputStyleMask = static_cast(editorInputStyleMask | Toolkit::TextEditor::InputStyle::COLOR); } - if( InputStyle::NONE != static_cast( inputStyleMask & InputStyle::INPUT_FONT_FAMILY ) ) + if(InputStyle::NONE != static_cast(inputStyleMask & InputStyle::INPUT_FONT_FAMILY)) { - editorInputStyleMask = static_cast( editorInputStyleMask | Toolkit::TextEditor::InputStyle::FONT_FAMILY ); + editorInputStyleMask = static_cast(editorInputStyleMask | Toolkit::TextEditor::InputStyle::FONT_FAMILY); } - if( InputStyle::NONE != static_cast( inputStyleMask & InputStyle::INPUT_POINT_SIZE ) ) + if(InputStyle::NONE != static_cast(inputStyleMask & InputStyle::INPUT_POINT_SIZE)) { - editorInputStyleMask = static_cast( editorInputStyleMask | Toolkit::TextEditor::InputStyle::POINT_SIZE ); + editorInputStyleMask = static_cast(editorInputStyleMask | Toolkit::TextEditor::InputStyle::POINT_SIZE); } - if( InputStyle::NONE != static_cast( inputStyleMask & InputStyle::INPUT_FONT_WEIGHT ) ) + if(InputStyle::NONE != static_cast(inputStyleMask & InputStyle::INPUT_FONT_WEIGHT)) { - editorInputStyleMask = static_cast( editorInputStyleMask | Toolkit::TextEditor::InputStyle::FONT_STYLE ); + editorInputStyleMask = static_cast(editorInputStyleMask | Toolkit::TextEditor::InputStyle::FONT_STYLE); } - if( InputStyle::NONE != static_cast( inputStyleMask & InputStyle::INPUT_FONT_WIDTH ) ) + if(InputStyle::NONE != static_cast(inputStyleMask & InputStyle::INPUT_FONT_WIDTH)) { - editorInputStyleMask = static_cast( editorInputStyleMask | Toolkit::TextEditor::InputStyle::FONT_STYLE ); + editorInputStyleMask = static_cast(editorInputStyleMask | Toolkit::TextEditor::InputStyle::FONT_STYLE); } - if( InputStyle::NONE != static_cast( inputStyleMask & InputStyle::INPUT_FONT_SLANT ) ) + if(InputStyle::NONE != static_cast(inputStyleMask & InputStyle::INPUT_FONT_SLANT)) { - editorInputStyleMask = static_cast( editorInputStyleMask | Toolkit::TextEditor::InputStyle::FONT_STYLE ); + editorInputStyleMask = static_cast(editorInputStyleMask | Toolkit::TextEditor::InputStyle::FONT_STYLE); } - if( InputStyle::NONE != static_cast( inputStyleMask & InputStyle::INPUT_LINE_SPACING ) ) + if(InputStyle::NONE != static_cast(inputStyleMask & InputStyle::INPUT_LINE_SPACING)) { - editorInputStyleMask = static_cast( editorInputStyleMask | Toolkit::TextEditor::InputStyle::LINE_SPACING ); + editorInputStyleMask = static_cast(editorInputStyleMask | Toolkit::TextEditor::InputStyle::LINE_SPACING); } - if( InputStyle::NONE != static_cast( inputStyleMask & InputStyle::INPUT_UNDERLINE ) ) + if(InputStyle::NONE != static_cast(inputStyleMask & InputStyle::INPUT_UNDERLINE)) { - editorInputStyleMask = static_cast( editorInputStyleMask | Toolkit::TextEditor::InputStyle::UNDERLINE ); + editorInputStyleMask = static_cast(editorInputStyleMask | Toolkit::TextEditor::InputStyle::UNDERLINE); } - if( InputStyle::NONE != static_cast( inputStyleMask & InputStyle::INPUT_SHADOW ) ) + if(InputStyle::NONE != static_cast(inputStyleMask & InputStyle::INPUT_SHADOW)) { - editorInputStyleMask = static_cast( editorInputStyleMask | Toolkit::TextEditor::InputStyle::SHADOW ); + editorInputStyleMask = static_cast(editorInputStyleMask | Toolkit::TextEditor::InputStyle::SHADOW); } - if( InputStyle::NONE != static_cast( inputStyleMask & InputStyle::INPUT_EMBOSS ) ) + if(InputStyle::NONE != static_cast(inputStyleMask & InputStyle::INPUT_EMBOSS)) { - editorInputStyleMask = static_cast( editorInputStyleMask | Toolkit::TextEditor::InputStyle::EMBOSS ); + editorInputStyleMask = static_cast(editorInputStyleMask | Toolkit::TextEditor::InputStyle::EMBOSS); } - if( InputStyle::NONE != static_cast( inputStyleMask & InputStyle::INPUT_OUTLINE ) ) + if(InputStyle::NONE != static_cast(inputStyleMask & InputStyle::INPUT_OUTLINE)) { - editorInputStyleMask = static_cast( editorInputStyleMask | Toolkit::TextEditor::InputStyle::OUTLINE ); + editorInputStyleMask = static_cast(editorInputStyleMask | Toolkit::TextEditor::InputStyle::OUTLINE); } - mInputStyleChangedSignal.Emit( handle, editorInputStyleMask ); + mInputStyleChangedSignal.Emit(handle, editorInputStyleMask); +} + +void TextEditor::AnchorClicked(const std::string& href) +{ + Dali::Toolkit::TextEditor handle(GetOwner()); + mAnchorClickedSignal.Emit(handle, href.c_str(), href.length()); } -void TextEditor::AddDecoration( Actor& actor, bool needsClipping ) +void TextEditor::AddDecoration(Actor& actor, bool needsClipping) { - if( actor ) + if(actor) { - if( needsClipping ) + if(needsClipping) { - mClippingDecorationActors.push_back( actor ); + mClippingDecorationActors.push_back(actor); } else { - actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); - actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); - Self().Add( actor ); + actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT); + actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT); + Self().Add(actor); mActiveLayer = actor; } } } -void TextEditor::SetTextSelectionRange(const uint32_t *start, const uint32_t *end) +void TextEditor::SetTextSelectionRange(const uint32_t* start, const uint32_t* end) { - if( mController && mController->IsShowingRealText() ) + if(mController && mController->IsShowingRealText()) { - mController->SetTextSelectionRange( start, end ); + mController->SetTextSelectionRange(start, end); SetKeyInputFocus(); } } @@ -1670,7 +1849,7 @@ void TextEditor::SetTextSelectionRange(const uint32_t *start, const uint32_t *en Uint32Pair TextEditor::GetTextSelectionRange() const { Uint32Pair range(0, 0); - if( mController && mController->IsShowingRealText() ) + if(mController && mController->IsShowingRealText()) { range = mController->GetTextSelectionRange(); } @@ -1684,100 +1863,100 @@ void TextEditor::UpdateScrollBar() float scrollPosition; float controlSize; float layoutSize; - bool latestScrolled; + bool latestScrolled; - if ( !mScrollBarEnabled ) + if(!mScrollBarEnabled) { return; } - latestScrolled = mController->GetTextScrollInfo( scrollPosition, controlSize, layoutSize ); - if ( !latestScrolled || controlSize > layoutSize) + latestScrolled = mController->GetTextScrollInfo(scrollPosition, controlSize, layoutSize); + if(!latestScrolled || controlSize > layoutSize) { return; } CustomActor self = Self(); - if( !mScrollBar ) + if(!mScrollBar) { - mScrollBar = Toolkit::ScrollBar::New( Toolkit::ScrollBar::VERTICAL ); - mScrollBar.SetIndicatorHeightPolicy( Toolkit::ScrollBar::VARIABLE ); - mScrollBar.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_RIGHT ); - mScrollBar.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_RIGHT ); - mScrollBar.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::HEIGHT ); - mScrollBar.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::WIDTH ); + mScrollBar = Toolkit::ScrollBar::New(Toolkit::ScrollBar::VERTICAL); + mScrollBar.SetIndicatorHeightPolicy(Toolkit::ScrollBar::VARIABLE); + mScrollBar.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_RIGHT); + mScrollBar.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_RIGHT); + mScrollBar.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::HEIGHT); + mScrollBar.SetResizePolicy(ResizePolicy::FIT_TO_CHILDREN, Dimension::WIDTH); // Register the scroll position property - Property::Index propertyScrollPosition = self.RegisterProperty( SCROLL_BAR_POSITION, scrollPosition ); + Property::Index propertyScrollPosition = self.RegisterProperty(SCROLL_BAR_POSITION, scrollPosition); // Register the minimum scroll position property - Property::Index propertyMinScrollPosition = self.RegisterProperty( SCROLL_BAR_POSITION_MIN, 0.0f ); + Property::Index propertyMinScrollPosition = self.RegisterProperty(SCROLL_BAR_POSITION_MIN, 0.0f); // Register the maximum scroll position property - Property::Index propertyMaxScrollPosition = self.RegisterProperty( SCROLL_BAR_POSITION_MAX, (layoutSize - controlSize) ); + Property::Index propertyMaxScrollPosition = self.RegisterProperty(SCROLL_BAR_POSITION_MAX, (layoutSize - controlSize)); // Register the scroll content size property - Property::Index propertyScrollContentSize = self.RegisterProperty( SCROLL_BAR_CONTENT_SIZE, layoutSize ); + Property::Index propertyScrollContentSize = self.RegisterProperty(SCROLL_BAR_CONTENT_SIZE, layoutSize); mScrollBar.SetScrollPropertySource(self, propertyScrollPosition, propertyMinScrollPosition, propertyMaxScrollPosition, propertyScrollContentSize); // Set style name of ScrollBar for styling mScrollBar.SetStyleName("TextEditorScrollBar"); - Toolkit::Control scrollIndicator = Toolkit::Control::DownCast( mScrollBar.GetScrollIndicator() ); - if( scrollIndicator ) + Toolkit::Control scrollIndicator = Toolkit::Control::DownCast(mScrollBar.GetScrollIndicator()); + if(scrollIndicator) { // Set style name of ScrollBarIndicator for styling scrollIndicator.SetStyleName("TextEditorScrollBarIndicator"); } - self.Add( mScrollBar ); + self.Add(mScrollBar); } else { - Property::Index propertyScrollPosition = self.GetPropertyIndex( SCROLL_BAR_POSITION ); - Property::Index propertyMaxScrollPosition = self.GetPropertyIndex( SCROLL_BAR_POSITION_MAX ); - Property::Index propertyScrollContentSize = self.GetPropertyIndex( SCROLL_BAR_CONTENT_SIZE ); + Property::Index propertyScrollPosition = self.GetPropertyIndex(SCROLL_BAR_POSITION); + Property::Index propertyMaxScrollPosition = self.GetPropertyIndex(SCROLL_BAR_POSITION_MAX); + Property::Index propertyScrollContentSize = self.GetPropertyIndex(SCROLL_BAR_CONTENT_SIZE); - self.SetProperty( propertyScrollPosition, scrollPosition ); - self.SetProperty( propertyMaxScrollPosition, (layoutSize - controlSize) ); - self.SetProperty( propertyScrollContentSize, layoutSize ); + self.SetProperty(propertyScrollPosition, scrollPosition); + self.SetProperty(propertyMaxScrollPosition, (layoutSize - controlSize)); + self.SetProperty(propertyScrollContentSize, layoutSize); } // If scrolling is not started, start scrolling and emit ScrollStateChangedSignal - if( !mScrollStarted ) + if(!mScrollStarted) { mScrollStarted = true; - Dali::Toolkit::TextEditor handle( GetOwner() ); - mScrollStateChangedSignal.Emit( handle, Toolkit::TextEditor::Scroll::STARTED ); + Dali::Toolkit::TextEditor handle(GetOwner()); + mScrollStateChangedSignal.Emit(handle, Toolkit::TextEditor::Scroll::STARTED); } Actor indicator = mScrollBar.GetScrollIndicator(); - if( mAnimation ) + if(mAnimation) { mAnimation.Stop(); // Cancel any animation } else { - mAnimation = Animation::New( mAnimationPeriod.durationSeconds ); + mAnimation = Animation::New(mAnimationPeriod.durationSeconds); } - indicator.SetProperty( Actor::Property::OPACITY,1.0f); - mAnimation.AnimateTo( Property( indicator, Actor::Property::COLOR_ALPHA ), 0.0f, AlphaFunction::EASE_IN, mAnimationPeriod ); + indicator.SetProperty(Actor::Property::OPACITY, 1.0f); + mAnimation.AnimateTo(Property(indicator, Actor::Property::COLOR_ALPHA), 0.0f, AlphaFunction::EASE_IN, mAnimationPeriod); mAnimation.Play(); - mAnimation.FinishedSignal().Connect( this, &TextEditor::OnScrollIndicatorAnimationFinished ); + mAnimation.FinishedSignal().Connect(this, &TextEditor::OnScrollIndicatorAnimationFinished); } -void TextEditor::OnScrollIndicatorAnimationFinished( Animation& animation ) +void TextEditor::OnScrollIndicatorAnimationFinished(Animation& animation) { // If animation is successfully ended, then emit ScrollStateChangedSignal - if( animation.GetCurrentProgress() == 0.0f ) + if(animation.GetCurrentProgress() == 0.0f) { mScrollStarted = false; - Dali::Toolkit::TextEditor handle( GetOwner() ); - mScrollStateChangedSignal.Emit( handle, Toolkit::TextEditor::Scroll::FINISHED ); + Dali::Toolkit::TextEditor handle(GetOwner()); + mScrollStateChangedSignal.Emit(handle, Toolkit::TextEditor::Scroll::FINISHED); } } -void TextEditor::OnSceneConnect( Dali::Actor actor ) +void TextEditor::OnSceneConnect(Dali::Actor actor) { - if ( mHasBeenStaged ) + if(mHasBeenStaged) { - RenderText( static_cast( Text::Controller::MODEL_UPDATED | Text::Controller::DECORATOR_UPDATED ) ); + RenderText(static_cast(Text::Controller::MODEL_UPDATED | Text::Controller::DECORATOR_UPDATED)); } else { @@ -1785,33 +1964,33 @@ void TextEditor::OnSceneConnect( Dali::Actor actor ) } } -InputMethodContext::CallbackData TextEditor::OnInputMethodContextEvent( Dali::InputMethodContext& inputMethodContext, const InputMethodContext::EventData& inputMethodContextEvent ) +InputMethodContext::CallbackData TextEditor::OnInputMethodContextEvent(Dali::InputMethodContext& inputMethodContext, const InputMethodContext::EventData& inputMethodContextEvent) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextEditor::OnInputMethodContextEvent %p eventName %d\n", mController.Get(), inputMethodContextEvent.eventName ); - return mController->OnInputMethodContextEvent( inputMethodContext, inputMethodContextEvent ); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextEditor::OnInputMethodContextEvent %p eventName %d\n", mController.Get(), inputMethodContextEvent.eventName); + return mController->OnInputMethodContextEvent(inputMethodContext, inputMethodContextEvent); } -void TextEditor::GetHandleImagePropertyValue( Property::Value& value, Text::HandleType handleType, Text::HandleImageType handleImageType ) +void TextEditor::GetHandleImagePropertyValue(Property::Value& value, Text::HandleType handleType, Text::HandleImageType handleImageType) { - if( mDecorator ) + if(mDecorator) { Property::Map map; - map[ IMAGE_MAP_FILENAME_STRING ] = mDecorator->GetHandleImage( handleType, handleImageType ); - value = map; + map[IMAGE_MAP_FILENAME_STRING] = mDecorator->GetHandleImage(handleType, handleImageType); + value = map; } } -void TextEditor::OnClipboardTextSelected( ClipboardEventNotifier& clipboard ) +void TextEditor::OnClipboardTextSelected(ClipboardEventNotifier& clipboard) { mController->PasteClipboardItemEvent(); } void TextEditor::KeyboardStatusChanged(bool keyboardShown) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextEditor::KeyboardStatusChanged %p keyboardShown %d\n", mController.Get(), keyboardShown ); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextEditor::KeyboardStatusChanged %p keyboardShown %d\n", mController.Get(), keyboardShown); // Just hide the grab handle when keyboard is hidden. - if (!keyboardShown ) + if(!keyboardShown) { mController->KeyboardFocusLostEvent(); } @@ -1821,18 +2000,18 @@ void TextEditor::KeyboardStatusChanged(bool keyboardShown) } } -void TextEditor::OnSceneConnection( int depth ) +void TextEditor::OnSceneConnection(int depth) { // Sets the depth to the visuals inside the text's decorator. - mDecorator->SetTextDepth( depth ); + mDecorator->SetTextDepth(depth); // The depth of the text renderer is set in the RenderText() called from OnRelayout(). // Call the Control::OnSceneConnection() to set the depth of the background. - Control::OnSceneConnection( depth ); + Control::OnSceneConnection(depth); } -bool TextEditor::OnTouched( Actor actor, const TouchEvent& touch ) +bool TextEditor::OnTouched(Actor actor, const TouchEvent& touch) { return false; } @@ -1849,28 +2028,28 @@ void TextEditor::OnIdleSignal() void TextEditor::ApplyScrollPosition() { const Vector2& scrollOffset = mController->GetTextModel()->GetScrollPosition(); - float scrollAmount = 0.0f; + float scrollAmount = 0.0f; - if ( mScrollAnimationEnabled ) + if(mScrollAnimationEnabled) { scrollAmount = mController->GetScrollAmountByUserInput(); } - if ( mTextVerticalScroller ) + if(mTextVerticalScroller) { - mTextVerticalScroller->CheckStartAnimation( mRenderableActor, scrollOffset.x + mAlignmentOffset, scrollOffset.y - scrollAmount, scrollAmount ); + mTextVerticalScroller->CheckStartAnimation(mRenderableActor, scrollOffset.x + mAlignmentOffset, scrollOffset.y - scrollAmount, scrollAmount); } - else if ( Equals( scrollAmount, 0.0f, Math::MACHINE_EPSILON_1 )) + else if(Equals(scrollAmount, 0.0f, Math::MACHINE_EPSILON_1)) { - mRenderableActor.SetProperty( Actor::Property::POSITION, Vector2( scrollOffset.x + mAlignmentOffset, scrollOffset.y - scrollAmount )); + mRenderableActor.SetProperty(Actor::Property::POSITION, Vector2(scrollOffset.x + mAlignmentOffset, scrollOffset.y - scrollAmount)); } else { mTextVerticalScroller = Text::TextVerticalScroller::New(); - if ( !Equals( mScrollAnimationDuration, 0.0f, Math::MACHINE_EPSILON_1 )) + if(!Equals(mScrollAnimationDuration, 0.0f, Math::MACHINE_EPSILON_1)) { - mTextVerticalScroller->SetDuration( mScrollAnimationDuration ); + mTextVerticalScroller->SetDuration(mScrollAnimationDuration); } - mTextVerticalScroller->CheckStartAnimation( mRenderableActor, scrollOffset.x + mAlignmentOffset, scrollOffset.y - scrollAmount, scrollAmount ); + mTextVerticalScroller->CheckStartAnimation(mRenderableActor, scrollOffset.x + mAlignmentOffset, scrollOffset.y - scrollAmount, scrollAmount); } } @@ -1879,39 +2058,254 @@ bool TextEditor::IsEditable() const return mController->IsEditable(); } -void TextEditor::SetEditable( bool editable ) +void TextEditor::SetEditable(bool editable) { mController->SetEditable(editable); - if ( mInputMethodContext && !editable ) + if(mInputMethodContext && !editable) { mInputMethodContext.Deactivate(); } } TextEditor::TextEditor() -: Control( ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ), - mAnimationPeriod( 0.0f, 0.0f ), - mIdleCallback( NULL ), - mAlignmentOffset( 0.f ), - mScrollAnimationDuration( 0.f ), - mLineSpacing( 0.f ), - mRenderingBackend( DEFAULT_RENDERING_BACKEND ), - mHasBeenStaged( false ), - mScrollAnimationEnabled( false ), - mScrollBarEnabled( false ), - mScrollStarted( false ) +: Control(ControlBehaviour(CONTROL_BEHAVIOUR_DEFAULT)), + mAnimationPeriod(0.0f, 0.0f), + mIdleCallback(NULL), + mAlignmentOffset(0.f), + mScrollAnimationDuration(0.f), + mLineSpacing(0.f), + mRenderingBackend(DEFAULT_RENDERING_BACKEND), + mHasBeenStaged(false), + mScrollAnimationEnabled(false), + mScrollBarEnabled(false), + mScrollStarted(false), + mTextChanged(false) { } TextEditor::~TextEditor() { - UnparentAndReset( mStencil ); + UnparentAndReset(mStencil); - if( ( NULL != mIdleCallback ) && Adaptor::IsAvailable() ) + if((NULL != mIdleCallback) && Adaptor::IsAvailable()) { // Removes the callback from the callback manager in case the text-editor is destroyed before the callback is executed. - Adaptor::Get().RemoveIdle( mIdleCallback ); + Adaptor::Get().RemoveIdle(mIdleCallback); + } +} + +std::string TextEditor::AccessibleImpl::GetName() +{ + auto slf = Toolkit::TextEditor::DownCast(Self()); + return slf.GetProperty(Toolkit::TextEditor::Property::TEXT) + .Get(); +} + +std::string TextEditor::AccessibleImpl::GetText(size_t startOffset, + size_t endOffset) +{ + if(endOffset <= startOffset) + return {}; + + auto slf = Toolkit::TextEditor::DownCast(Self()); + auto txt = + slf.GetProperty(Toolkit::TextEditor::Property::TEXT).Get(); + + if(startOffset > txt.size() || endOffset > txt.size()) + return {}; + + return txt.substr(startOffset, endOffset - startOffset); +} + +size_t TextEditor::AccessibleImpl::GetCharacterCount() +{ + auto slf = Toolkit::TextEditor::DownCast(Self()); + auto txt = + slf.GetProperty(Toolkit::TextEditor::Property::TEXT).Get(); + + return txt.size(); +} + +size_t TextEditor::AccessibleImpl::GetCaretOffset() +{ + auto slf = Toolkit::TextEditor::DownCast(Self()); + return Dali::Toolkit::GetImpl(slf).getController()->GetCursorPosition(); +} + +bool TextEditor::AccessibleImpl::SetCaretOffset(size_t offset) +{ + auto slf = Toolkit::TextEditor::DownCast(Self()); + auto txt = slf.GetProperty(Toolkit::TextEditor::Property::TEXT).Get(); + if(offset > txt.size()) + return false; + + auto& slfImpl = Dali::Toolkit::GetImpl(slf); + slfImpl.getController()->ResetCursorPosition(offset); + slfImpl.RequestTextRelayout(); + return true; +} + +Dali::Accessibility::Range TextEditor::AccessibleImpl::GetTextAtOffset( + size_t offset, Dali::Accessibility::TextBoundary boundary) +{ + auto slf = Toolkit::TextEditor::DownCast(Self()); + auto txt = slf.GetProperty(Toolkit::TextEditor::Property::TEXT).Get(); + auto txt_size = txt.size(); + + auto range = Dali::Accessibility::Range{}; + + switch(boundary) + { + case Dali::Accessibility::TextBoundary::CHARACTER: + { + if(offset < txt_size) + { + range.content = txt[offset]; + range.startOffset = offset; + range.endOffset = offset + 1; + } + } + break; + case Dali::Accessibility::TextBoundary::WORD: + case Dali::Accessibility::TextBoundary::LINE: + { + auto txt_c_string = txt.c_str(); + auto breaks = std::vector(txt_size, 0); + if(boundary == Dali::Accessibility::TextBoundary::WORD) + Accessibility::Accessible::FindWordSeparationsUtf8((const utf8_t*)txt_c_string, txt_size, "", breaks.data()); + else + Accessibility::Accessible::FindLineSeparationsUtf8((const utf8_t*)txt_c_string, txt_size, "", breaks.data()); + auto index = 0u; + auto counter = 0u; + while(index < txt_size && 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 = txt.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 efl */ + } + break; + case Dali::Accessibility::TextBoundary::PARAGRAPH: + { + /* Paragraph is not supported by libunibreak library */ + } + break; + default: + break; + } + + return range; +} + +Dali::Accessibility::Range +TextEditor::AccessibleImpl::GetSelection(size_t selectionNum) +{ + // Since DALi supports only one selection indexes higher than 0 are ignored + if(selectionNum > 0) + return {}; + + auto slf = Toolkit::TextEditor::DownCast(Self()); + auto ctrl = Dali::Toolkit::GetImpl(slf).getController(); + std::string ret; + ctrl->RetrieveSelection(ret); + auto r = ctrl->GetSelectionIndexes(); + + return {static_cast(r.first), static_cast(r.second), ret}; +} + +bool TextEditor::AccessibleImpl::RemoveSelection(size_t selectionNum) +{ + // Since DALi supports only one selection indexes higher than 0 are ignored + if(selectionNum > 0) + return false; + + auto slf = Toolkit::TextEditor::DownCast(Self()); + Dali::Toolkit::GetImpl(slf).getController()->SetSelection(0, 0); + return true; +} + +bool TextEditor::AccessibleImpl::SetSelection(size_t selectionNum, + size_t startOffset, + size_t endOffset) +{ + // Since DALi supports only one selection indexes higher than 0 are ignored + if(selectionNum > 0) + return false; + + auto slf = Toolkit::TextEditor::DownCast(Self()); + Dali::Toolkit::GetImpl(slf).getController()->SetSelection(startOffset, + endOffset); + return true; +} + +bool TextEditor::AccessibleImpl::CopyText(size_t startPosition, + size_t endPosition) +{ + if(endPosition <= startPosition) + return false; + + auto slf = Toolkit::TextEditor::DownCast(Self()); + auto txt = slf.GetProperty(Toolkit::TextEditor::Property::TEXT).Get(); + Dali::Toolkit::GetImpl(slf).getController()->CopyStringToClipboard(txt.substr(startPosition, endPosition - startPosition)); + + return true; +} + +bool TextEditor::AccessibleImpl::CutText(size_t startPosition, + size_t endPosition) +{ + if(endPosition <= startPosition) + return false; + + auto slf = Toolkit::TextEditor::DownCast(Self()); + auto txt = slf.GetProperty(Toolkit::TextEditor::Property::TEXT).Get(); + Dali::Toolkit::GetImpl(slf).getController()->CopyStringToClipboard(txt.substr(startPosition, endPosition - startPosition)); + + slf.SetProperty(Toolkit::TextEditor::Property::TEXT, + txt.substr(0, startPosition) + txt.substr(endPosition - startPosition, txt.size())); + + return true; +} + +Dali::Accessibility::States TextEditor::AccessibleImpl::CalculateStates() +{ + using namespace Dali::Accessibility; + + auto states = DevelControl::AccessibleImpl::CalculateStates(); + states[State::EDITABLE] = true; + states[State::FOCUSABLE] = true; + + Toolkit::Control focusControl = Toolkit::KeyInputFocusManager::Get().GetCurrentFocusControl(); + if(self == focusControl) + { + states[State::FOCUSED] = true; } + + return states; } } // namespace Internal