From: Joogab Yun Date: Fri, 19 Mar 2021 08:57:34 +0000 (+0900) Subject: Unnecessary TextChanged callbacks are being called. X-Git-Tag: submit/tizen_6.0/20210323.091331^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cef89858f1d7ca38d2db7aecb934ceada5439e09;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git Unnecessary TextChanged callbacks are being called. Change it to be called only once at the end. example) Typing "호두" on the keyboard Whenever COMMIT/PREEDIT in OnInputMethodContextEvent(), TextChanged callback is called OnTextFieldTextChanged(159) > [ㅎ] // PRE_EDIT OnTextFieldTextChanged(159) > [호] // PRE_EDIT OnTextFieldTextChanged(159) > [혿] // PRE_EDIT OnTextFieldTextChanged(159) > [] // PRE_EDIT OnTextFieldTextChanged(159) > [호] // COMMIT OnTextFieldTextChanged(159) > [호두] // PRE_EDIT If you change the text to call the TextChanged callback only once at the end of the change, OnTextFieldTextChanged(159) > [ㅎ] OnTextFieldTextChanged(159) > [호] OnTextFieldTextChanged(159) > [혿] OnTextFieldTextChanged(159) > [호두] Change-Id: I9b81d4ca703eeb92bb0ddd771dbf083374ac4202 --- diff --git a/automated-tests/src/dali-toolkit/utc-Dali-TextEditor.cpp b/automated-tests/src/dali-toolkit/utc-Dali-TextEditor.cpp index b6f3da8..d688e2c 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-TextEditor.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-TextEditor.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. @@ -957,20 +957,94 @@ int utcDaliTextEditorTextChangedP(void) gTextChangedCallBackCalled = false; editor.SetProperty( TextEditor::Property::TEXT, "ABC" ); + application.SendNotification(); + application.Render(); DALI_TEST_CHECK( gTextChangedCallBackCalled ); DALI_TEST_CHECK( textChangedSignal ); + editor.SetKeyInputFocus(); + + gTextChangedCallBackCalled = false; + application.ProcessEvent( GenerateKey( "D", "", "D", KEY_D_CODE, 0, 0, Integration::KeyEvent::DOWN, "D", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) ); application.SendNotification(); + application.Render(); + DALI_TEST_CHECK( gTextChangedCallBackCalled ); + + END_TEST; +} + +int utcDaliTextEditorTextChangedWithInputMethodContext(void) +{ + ToolkitTestApplication application; + tet_infoline(" utcDaliTextEditorTextChangedWithInputMethodContext"); + TextEditor editor = TextEditor::New(); + DALI_TEST_CHECK( editor ); + + + application.GetScene().Add( editor ); + + // connect to the text changed signal. + ConnectionTracker* testTracker = new ConnectionTracker(); + editor.TextChangedSignal().Connect(&TestTextChangedCallback); + bool textChangedSignal = false; + editor.ConnectSignal( testTracker, "textChanged", CallbackFunctor(&textChangedSignal) ); + + + // get InputMethodContext + std::string text; + InputMethodContext::EventData imfEvent; + InputMethodContext inputMethodContext = DevelTextEditor::GetInputMethodContext( editor ); editor.SetKeyInputFocus(); + editor.SetProperty( DevelTextEditor::Property::ENABLE_EDITING, true ); + // input text gTextChangedCallBackCalled = false; - application.ProcessEvent( GenerateKey( "D", "", "D", KEY_D_CODE, 0, 0, Integration::KeyEvent::DOWN, "D", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) ); + imfEvent = InputMethodContext::EventData( InputMethodContext::PRE_EDIT, "ㅎ", 0, 1 ); + inputMethodContext.EventReceivedSignal().Emit(inputMethodContext, imfEvent); + application.SendNotification(); + application.Render(); + DALI_TEST_CHECK( gTextChangedCallBackCalled ); + DALI_TEST_EQUALS( editor.GetProperty( TextEditor::Property::TEXT ), std::string("ㅎ"), TEST_LOCATION ); + + gTextChangedCallBackCalled = false; + imfEvent = InputMethodContext::EventData( InputMethodContext::PRE_EDIT, "호", 0, 1 ); + inputMethodContext.EventReceivedSignal().Emit(inputMethodContext, imfEvent); + application.SendNotification(); + application.Render(); + DALI_TEST_CHECK( gTextChangedCallBackCalled ); + DALI_TEST_EQUALS( editor.GetProperty( TextEditor::Property::TEXT ), std::string("호"), TEST_LOCATION ); + + gTextChangedCallBackCalled = false; + imfEvent = InputMethodContext::EventData( InputMethodContext::PRE_EDIT, "혿", 0, 1 ); + inputMethodContext.EventReceivedSignal().Emit(inputMethodContext, imfEvent); + application.SendNotification(); + application.Render(); + DALI_TEST_CHECK( gTextChangedCallBackCalled ); + DALI_TEST_EQUALS( editor.GetProperty( TextEditor::Property::TEXT ), std::string("혿"), TEST_LOCATION ); + + gTextChangedCallBackCalled = false; + imfEvent = InputMethodContext::EventData( InputMethodContext::PRE_EDIT, "", 0, 1 ); + inputMethodContext.EventReceivedSignal().Emit(inputMethodContext, imfEvent); + DALI_TEST_CHECK( !gTextChangedCallBackCalled ); + + imfEvent = InputMethodContext::EventData( InputMethodContext::COMMIT, "호", 0, 1 ); + inputMethodContext.EventReceivedSignal().Emit(inputMethodContext, imfEvent); + DALI_TEST_CHECK( !gTextChangedCallBackCalled ); + + imfEvent = InputMethodContext::EventData( InputMethodContext::PRE_EDIT, "두", 1, 2 ); + inputMethodContext.EventReceivedSignal().Emit(inputMethodContext, imfEvent); + DALI_TEST_CHECK( !gTextChangedCallBackCalled ); + + application.SendNotification(); + application.Render(); DALI_TEST_CHECK( gTextChangedCallBackCalled ); + DALI_TEST_EQUALS( editor.GetProperty( TextEditor::Property::TEXT ), std::string("호두"), TEST_LOCATION ); END_TEST; } + int utcDaliTextEditorInputStyleChanged01(void) { // The text-editor emits signals when the input style changes. These changes of style are diff --git a/automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp b/automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp index 2dd61c2..efcaacb 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-TextField.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. @@ -1028,20 +1028,23 @@ int utcDaliTextFieldTextChangedP(void) gTextChangedCallBackCalled = false; field.SetProperty( TextField::Property::TEXT, "ABC" ); + application.SendNotification(); + application.Render(); DALI_TEST_CHECK( gTextChangedCallBackCalled ); DALI_TEST_CHECK( textChangedSignal ); - application.SendNotification(); - field.SetKeyInputFocus(); gTextChangedCallBackCalled = false; application.ProcessEvent( GenerateKey( "D", "", "D", KEY_D_CODE, 0, 0, Integration::KeyEvent::DOWN, "D", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) ); + application.SendNotification(); + application.Render(); DALI_TEST_CHECK( gTextChangedCallBackCalled ); END_TEST; } + // Negative test for the textChanged signal. int utcDaliTextFieldTextChangedN(void) { @@ -1060,6 +1063,8 @@ int utcDaliTextFieldTextChangedN(void) gTextChangedCallBackCalled = false; field.SetProperty( TextField::Property::PLACEHOLDER_TEXT, "ABC" ); // Setting placeholder, not TEXT + application.SendNotification(); + application.Render(); DALI_TEST_CHECK( !gTextChangedCallBackCalled ); DALI_TEST_CHECK( !textChangedSignal ); 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 60db674..e216301 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,48 @@ #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 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 @@ -82,88 +77,88 @@ BaseHandle Create() } // 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, "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, "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_END() -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; @@ -174,10 +169,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... @@ -186,27 +181,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(); @@ -216,267 +210,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: @@ -485,23 +479,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(); } @@ -509,8 +503,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(); } @@ -518,8 +512,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(); } @@ -527,8 +521,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(); } @@ -536,8 +530,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(); } @@ -545,8 +539,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(); } @@ -554,8 +548,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(); } @@ -563,8 +557,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(); } @@ -572,172 +566,172 @@ 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; } } // 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: { @@ -747,8 +741,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; } @@ -764,20 +758,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; } @@ -793,12 +787,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: @@ -823,42 +817,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: @@ -869,7 +863,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; } @@ -890,7 +884,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: @@ -912,42 +906,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: @@ -977,19 +971,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; } @@ -1006,7 +1000,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; } @@ -1037,19 +1031,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: @@ -1065,7 +1059,7 @@ Property::Value TextEditor::GetProperty( BaseObject* object, Property::Index ind void TextEditor::SelectWholeText() { - if( mController && mController->IsShowingRealText() ) + if(mController && mController->IsShowingRealText()) { mController->SelectWholeText(); SetKeyInputFocus(); @@ -1074,7 +1068,7 @@ void TextEditor::SelectWholeText() void TextEditor::SelectNone() { - if( mController && mController->IsShowingRealText() ) + if(mController && mController->IsShowingRealText()) { mController->SelectNone(); } @@ -1083,9 +1077,9 @@ void TextEditor::SelectNone() string TextEditor::GetSelectedText() const { string selectedText = ""; - if( mController && mController->IsShowingRealText() ) + if(mController && mController->IsShowingRealText()) { - selectedText = mController->GetSelectedText( ); + selectedText = mController->GetSelectedText(); } return selectedText; } @@ -1100,27 +1094,27 @@ DevelTextEditor::MaxLengthReachedSignalType& TextEditor::MaxLengthReachedSignal( return mMaxLengthReachedSignal; } -bool TextEditor::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor ) +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 @@ -1151,103 +1145,102 @@ void TextEditor::OnInitialize() { Actor self = Self(); - mController = Text::Controller::New( this, this, this); + mController = Text::Controller::New(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); - 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); } -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; } @@ -1259,145 +1252,152 @@ 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::OnRelayout(const Vector2& size, RelayoutContainer& container) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextEditor OnRelayout\n"); + 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)); } - if( mActiveLayer ) + if(mActiveLayer) { - mActiveLayer.SetProperty( Actor::Property::POSITION, Vector2( padding.start, padding.top )); + mActiveLayer.SetProperty(Actor::Property::POSITION, Vector2(padding.start, padding.top)); } - const Text::Controller::UpdateTextType updateTextType = mController->Relayout( contentSize, layoutDirection ); + const Text::Controller::UpdateTextType updateTextType = mController->Relayout(contentSize, layoutDirection); - if( ( Text::Controller::NONE_UPDATED != updateTextType ) || - !mRenderer ) + 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(size); } - if( !mRenderer ) + if(!mRenderer) { - mRenderer = Backend::Get().NewRenderer( mRenderingBackend ); + mRenderer = Backend::Get().NewRenderer(mRenderingBackend); } - RenderText( updateTextType ); + RenderText(updateTextType); + // If there is text changed, callback is called. + if(mTextChanged) + { + Dali::Toolkit::TextEditor handle(GetOwner()); + mTextChangedSignal.Emit(handle); + mTextChanged = false; + } } // 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(); } @@ -1406,101 +1406,101 @@ 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 ); + 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 ) +void TextEditor::OnTap(const TapGesture& gesture) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextEditor::OnTap %p\n", mController.Get() ); - if ( mInputMethodContext && IsEditable() ) + 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); 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(); } @@ -1508,7 +1508,7 @@ bool TextEditor::OnKeyEvent( const KeyEvent& event ) return true; } - return mController->KeyEvent( event ); + return mController->KeyEvent(event); } void TextEditor::RequestTextRelayout() @@ -1518,93 +1518,92 @@ void TextEditor::RequestTextRelayout() void TextEditor::TextChanged() { - Dali::Toolkit::TextEditor handle( GetOwner() ); - mTextChangedSignal.Emit( handle ); + mTextChanged = true; } 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::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(); } } @@ -1612,7 +1611,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(); } @@ -1626,100 +1625,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 { @@ -1727,33 +1726,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(); } @@ -1763,18 +1762,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; } @@ -1791,28 +1790,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); } } @@ -1821,38 +1820,39 @@ 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); } } diff --git a/dali-toolkit/internal/controls/text-controls/text-editor-impl.h b/dali-toolkit/internal/controls/text-controls/text-editor-impl.h old mode 100755 new mode 100644 index 2aca941..102600d --- a/dali-toolkit/internal/controls/text-controls/text-editor-impl.h +++ b/dali-toolkit/internal/controls/text-controls/text-editor-impl.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_TEXT_EDITOR_H /* - * 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. @@ -24,24 +24,22 @@ #include // INTERNAL INCLUDES -#include #include -#include #include #include +#include #include +#include #include #include -#include #include -#include +#include +#include namespace Dali { - namespace Toolkit { - namespace Internal { /** @@ -50,7 +48,6 @@ namespace Internal class TextEditor : public Control, public Text::ControlInterface, public Text::EditableControlInterface, public Text::SelectableControlInterface { public: - /** * @copydoc Dali::Toollkit::TextEditor::New() */ @@ -65,7 +62,7 @@ public: * @param[in] index The property index. * @param[in] value The new property value. */ - static void SetProperty( BaseObject* object, Property::Index index, const Property::Value& value ); + static void SetProperty(BaseObject* object, Property::Index index, const Property::Value& value); /** * @brief Called to retrieve a property of an object of this type. @@ -74,7 +71,7 @@ public: * @param[in] index The property index. * @return The current value of the property. */ - static Property::Value GetProperty( BaseObject* object, Property::Index index ); + static Property::Value GetProperty(BaseObject* object, Property::Index index); /** * @copydoc Dali::Toollkit::TextEditor::GetInputMethodContext() @@ -84,7 +81,7 @@ public: /** * @copydoc Dali::Toollkit::TextEditor::MaxLengthReachedSignal() */ - DevelTextEditor::MaxLengthReachedSignalType& MaxLengthReachedSignal(); + DevelTextEditor::MaxLengthReachedSignalType& MaxLengthReachedSignal(); /** * Connects a callback function with the object's signals. @@ -95,12 +92,12 @@ public: * @return True if the signal was connected. * @post If a signal was connected, ownership of functor was passed to CallbackBase. Otherwise the caller is responsible for deleting the unused functor. */ - static bool DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor ); + static bool DoConnectSignal(BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor); /** * @copydoc TextEditor::TextChangedSignal() */ - Toolkit::TextEditor::TextChangedSignalType& TextChangedSignal(); + Toolkit::TextEditor::TextChangedSignalType& TextChangedSignal(); /** * @copydoc TextEditor::TextChangedSignal() @@ -113,7 +110,6 @@ public: Toolkit::TextEditor::ScrollStateChangedSignalType& ScrollStateChangedSignal(); private: // From Control - /** * @copydoc Control::OnInitialize() */ @@ -122,7 +118,7 @@ private: // From Control /** * @copydoc Control::OnStyleChange() */ - void OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change ) override; + void OnStyleChange(Toolkit::StyleManager styleManager, StyleChange::Type change) override; /** * @copydoc Control::GetNaturalSize() @@ -132,12 +128,12 @@ private: // From Control /** * @copydoc Control::GetHeightForWidth() */ - float GetHeightForWidth( float width ) override; + float GetHeightForWidth(float width) override; /** * @copydoc Control::OnInitialize() */ - void OnRelayout( const Vector2& size, RelayoutContainer& container ) override; + void OnRelayout(const Vector2& size, RelayoutContainer& container) override; /** * @copydoc Control::OnKeyInputFocusGained() @@ -152,36 +148,36 @@ private: // From Control /** * @copydoc Control::OnTap() */ - void OnTap( const TapGesture& tap ) override; + void OnTap(const TapGesture& tap) override; /** * @copydoc Control::OnPan() */ - void OnPan( const PanGesture& gesture ) override; + void OnPan(const PanGesture& gesture) override; /** * @copydoc Control::OnLongPress() */ - void OnLongPress( const LongPressGesture& gesture ) override; + void OnLongPress(const LongPressGesture& gesture) override; /** * @copydoc Control::OnSceneConnection() */ - void OnSceneConnection( int depth ) override; + void OnSceneConnection(int depth) override; /** * @copydoc Dali::CustomActorImpl::OnKeyEvent(const KeyEvent&) */ bool OnKeyEvent(const KeyEvent& event) override; -// From ControlInterface + // From ControlInterface /** * @copydoc Text::ControlInterface::RequestTextRelayout() */ void RequestTextRelayout() override; -// From EditableControlInterface + // From EditableControlInterface /** * @copydoc Text::EditableControlInterface::TextChanged() @@ -196,19 +192,19 @@ private: // From Control /** * @copydoc Text::EditableControlInterface::InputStyleChanged() */ - void InputStyleChanged( Text::InputStyle::Mask inputStyleMask ) override; + void InputStyleChanged(Text::InputStyle::Mask inputStyleMask) override; /** * @copydoc Text::EditableControlInterface::AddDecoration() */ - void AddDecoration( Actor& actor, bool needsClipping ) override; + void AddDecoration(Actor& actor, bool needsClipping) override; -// From SelectableControlInterface + // From SelectableControlInterface public: /** * @copydoc Text::SelectableControlInterface::SetTextSelectionRange() */ - void SetTextSelectionRange(const uint32_t *start, const uint32_t *end) override; + void SetTextSelectionRange(const uint32_t* start, const uint32_t* end) override; /** * @copydoc Text::SelectableControlInterface::GetTextSelectionRange() @@ -238,20 +234,19 @@ public: /** * @copydoc Text::EditableControlInterface::SetEditable() */ - void SetEditable( bool editable ) override; + void SetEditable(bool editable) override; private: // Implementation - /** * @copydoc Dali::Toolkit::Text::Controller::(InputMethodContext& inputMethodContext, const InputMethodContext::EventData& inputMethodContextEvent) */ - InputMethodContext::CallbackData OnInputMethodContextEvent( InputMethodContext& inputMethodContext, const InputMethodContext::EventData& inputMethodContextEvent ); + InputMethodContext::CallbackData OnInputMethodContextEvent(InputMethodContext& inputMethodContext, const InputMethodContext::EventData& inputMethodContextEvent); /** * @brief Callback when Clipboard signals an item should be pasted * @param[in] clipboard handle to Clipboard Event Notifier */ - void OnClipboardTextSelected( ClipboardEventNotifier& clipboard ); + void OnClipboardTextSelected(ClipboardEventNotifier& clipboard); /** * @brief Get a Property Map for the image used for the required Handle Image @@ -259,14 +254,14 @@ private: // Implementation * @param[in] handleType the type of handle * @param[in] handleImageType the type of image for the given handleType */ - void GetHandleImagePropertyValue( Property::Value& value, Text::HandleType handleType, Text::HandleImageType handleImageType ); + void GetHandleImagePropertyValue(Property::Value& value, Text::HandleType handleType, Text::HandleImageType handleImageType); /** * @brief Callback when keyboard is shown/hidden. * * @param[in] keyboardShown True if keyboard is shown. */ - void KeyboardStatusChanged( bool keyboardShown ); + void KeyboardStatusChanged(bool keyboardShown); /** * @brief update scroll bar position @@ -281,7 +276,7 @@ private: // Implementation * @param[in] actor TextEditor touched * @param[in] touch Touch information */ - bool OnTouched( Actor actor, const TouchEvent& touch ); + bool OnTouched(Actor actor, const TouchEvent& touch); /** * @brief Callbacks called on idle. @@ -302,7 +297,7 @@ private: // Implementation * * Emit ScrollBarStateChanged Signal and toggle mScrollStarted flag to false */ - void OnScrollIndicatorAnimationFinished( Animation& animation ); + void OnScrollIndicatorAnimationFinished(Animation& animation); /** * Construct a new TextEditor. @@ -321,48 +316,49 @@ private: // Implementation /** * @brief Render view, create and attach actor(s) to this text editor. */ - void RenderText( Text::Controller::UpdateTextType updateTextType ); + void RenderText(Text::Controller::UpdateTextType updateTextType); // Connection needed to re-render text, when a text editor returns to the scene. - void OnSceneConnect( Dali::Actor actor ); + void OnSceneConnect(Dali::Actor actor); private: // Data // Signals - Toolkit::TextEditor::TextChangedSignalType mTextChangedSignal; - Toolkit::TextEditor::InputStyleChangedSignalType mInputStyleChangedSignal; - Toolkit::TextEditor::ScrollStateChangedSignalType mScrollStateChangedSignal; + Toolkit::TextEditor::TextChangedSignalType mTextChangedSignal; + Toolkit::TextEditor::InputStyleChangedSignalType mInputStyleChangedSignal; + Toolkit::TextEditor::ScrollStateChangedSignalType mScrollStateChangedSignal; Toolkit::DevelTextEditor::MaxLengthReachedSignalType mMaxLengthReachedSignal; - InputMethodContext mInputMethodContext; - Text::ControllerPtr mController; - Text::RendererPtr mRenderer; - Text::DecoratorPtr mDecorator; + InputMethodContext mInputMethodContext; + Text::ControllerPtr mController; + Text::RendererPtr mRenderer; + Text::DecoratorPtr mDecorator; Text::TextVerticalScrollerPtr mTextVerticalScroller; - Toolkit::Control mStencil; - Toolkit::ScrollBar mScrollBar; - Dali::Animation mAnimation; ///< Scroll indicator Show/Hide Animation. - Dali::TimePeriod mAnimationPeriod; - std::vector mClippingDecorationActors; ///< Decoration actors which need clipping. - - Actor mRenderableActor; - Actor mActiveLayer; + Toolkit::Control mStencil; + Toolkit::ScrollBar mScrollBar; + Dali::Animation mAnimation; ///< Scroll indicator Show/Hide Animation. + Dali::TimePeriod mAnimationPeriod; + std::vector mClippingDecorationActors; ///< Decoration actors which need clipping. + + Actor mRenderableActor; + Actor mActiveLayer; CallbackBase* mIdleCallback; float mAlignmentOffset; float mScrollAnimationDuration; float mLineSpacing; - int mRenderingBackend; - bool mHasBeenStaged:1; - bool mScrollAnimationEnabled:1; - bool mScrollBarEnabled:1; - bool mScrollStarted:1; + int mRenderingBackend; + bool mHasBeenStaged : 1; + bool mScrollAnimationEnabled : 1; + bool mScrollBarEnabled : 1; + bool mScrollStarted : 1; + bool mTextChanged : 1; }; } // namespace Internal // Helpers for public-api forwarding methods -inline Toolkit::Internal::TextEditor& GetImpl( Toolkit::TextEditor& textEditor ) +inline Toolkit::Internal::TextEditor& GetImpl(Toolkit::TextEditor& textEditor) { DALI_ASSERT_ALWAYS(textEditor); @@ -371,7 +367,7 @@ inline Toolkit::Internal::TextEditor& GetImpl( Toolkit::TextEditor& textEditor ) return static_cast(handle); } -inline const Toolkit::Internal::TextEditor& GetImpl( const Toolkit::TextEditor& textEditor ) +inline const Toolkit::Internal::TextEditor& GetImpl(const Toolkit::TextEditor& textEditor) { DALI_ASSERT_ALWAYS(textEditor); diff --git a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp index 5a81020..dccd577 100644 --- a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 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,55 +19,51 @@ #include // EXTERNAL INCLUDES -#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 +#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"); +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 unsigned int DEFAULT_RENDERING_BACKEND = Dali::Toolkit::DevelText::DEFAULT_RENDERING_BACKEND; } // unnamed namespace namespace @@ -79,87 +75,87 @@ BaseHandle Create() } // Setup properties, signals and actions using the type-registry. -DALI_TYPE_REGISTRATION_BEGIN( Toolkit::TextField, Toolkit::Control, Create ); - -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "text", STRING, TEXT ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "placeholderText", STRING, PLACEHOLDER_TEXT ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "placeholderTextFocused", STRING, PLACEHOLDER_TEXT_FOCUSED ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "fontFamily", STRING, FONT_FAMILY ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "fontStyle", MAP, FONT_STYLE ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "pointSize", FLOAT, POINT_SIZE ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "maxLength", INTEGER, MAX_LENGTH ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "exceedPolicy", INTEGER, EXCEED_POLICY ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "horizontalAlignment", STRING, HORIZONTAL_ALIGNMENT ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "verticalAlignment", STRING, VERTICAL_ALIGNMENT ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "textColor", VECTOR4, TEXT_COLOR ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "placeholderTextColor", VECTOR4, PLACEHOLDER_TEXT_COLOR ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "primaryCursorColor", VECTOR4, PRIMARY_CURSOR_COLOR ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "secondaryCursorColor", VECTOR4, SECONDARY_CURSOR_COLOR ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "enableCursorBlink", BOOLEAN, ENABLE_CURSOR_BLINK ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "cursorBlinkInterval", FLOAT, CURSOR_BLINK_INTERVAL ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "cursorBlinkDuration", FLOAT, CURSOR_BLINK_DURATION ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "cursorWidth", INTEGER, CURSOR_WIDTH ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "grabHandleImage", STRING, GRAB_HANDLE_IMAGE ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "grabHandlePressedImage", STRING, GRAB_HANDLE_PRESSED_IMAGE ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "scrollThreshold", FLOAT, SCROLL_THRESHOLD ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "scrollSpeed", FLOAT, SCROLL_SPEED ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "selectionHandleImageLeft", MAP, SELECTION_HANDLE_IMAGE_LEFT ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "selectionHandleImageRight", MAP, SELECTION_HANDLE_IMAGE_RIGHT ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "selectionHandlePressedImageLeft", MAP, SELECTION_HANDLE_PRESSED_IMAGE_LEFT ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "selectionHandlePressedImageRight", MAP, SELECTION_HANDLE_PRESSED_IMAGE_RIGHT ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "selectionHandleMarkerImageLeft", MAP, SELECTION_HANDLE_MARKER_IMAGE_LEFT ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "selectionHandleMarkerImageRight", MAP, SELECTION_HANDLE_MARKER_IMAGE_RIGHT ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "selectionHighlightColor", VECTOR4, SELECTION_HIGHLIGHT_COLOR ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "decorationBoundingBox", RECTANGLE, DECORATION_BOUNDING_BOX ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "inputMethodSettings", MAP, INPUT_METHOD_SETTINGS ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "inputColor", VECTOR4, INPUT_COLOR ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "enableMarkup", BOOLEAN, ENABLE_MARKUP ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "inputFontFamily", STRING, INPUT_FONT_FAMILY ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "inputFontStyle", MAP, INPUT_FONT_STYLE ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "inputPointSize", FLOAT, INPUT_POINT_SIZE ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "underline", MAP, UNDERLINE ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "inputUnderline", MAP, INPUT_UNDERLINE ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "shadow", MAP, SHADOW ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "inputShadow", MAP, INPUT_SHADOW ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "emboss", MAP, EMBOSS ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "inputEmboss", MAP, INPUT_EMBOSS ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "outline", MAP, OUTLINE ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "inputOutline", MAP, INPUT_OUTLINE ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "hiddenInputSettings", MAP, HIDDEN_INPUT_SETTINGS ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "pixelSize", FLOAT, PIXEL_SIZE ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "enableSelection", BOOLEAN, ENABLE_SELECTION ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "placeholder", MAP, PLACEHOLDER ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "ellipsis", BOOLEAN, ELLIPSIS ) -DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextField, "enableShiftSelection", BOOLEAN, ENABLE_SHIFT_SELECTION ) -DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextField, "enableGrabHandle", BOOLEAN, ENABLE_GRAB_HANDLE ) -DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextField, "matchSystemLanguageDirection", BOOLEAN, MATCH_SYSTEM_LANGUAGE_DIRECTION ) -DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextField, "enableGrabHandlePopup", BOOLEAN, ENABLE_GRAB_HANDLE_POPUP ) -DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextField, "textBackground", VECTOR4, BACKGROUND ) -DALI_DEVEL_PROPERTY_REGISTRATION_READ_ONLY( Toolkit, TextField, "selectedText", STRING, SELECTED_TEXT ) -DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextField, "renderingBackend", INTEGER, RENDERING_BACKEND ) -DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextField, "selectedTextStart", INTEGER, SELECTED_TEXT_START ) -DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextField, "selectedTextEnd", INTEGER, SELECTED_TEXT_END ) -DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextField, "enableEditing", BOOLEAN, ENABLE_EDITING ) - -DALI_SIGNAL_REGISTRATION( Toolkit, TextField, "textChanged", SIGNAL_TEXT_CHANGED ) -DALI_SIGNAL_REGISTRATION( Toolkit, TextField, "maxLengthReached", SIGNAL_MAX_LENGTH_REACHED ) -DALI_SIGNAL_REGISTRATION( Toolkit, TextField, "inputStyleChanged", SIGNAL_INPUT_STYLE_CHANGED ) +DALI_TYPE_REGISTRATION_BEGIN(Toolkit::TextField, Toolkit::Control, Create); + +DALI_PROPERTY_REGISTRATION(Toolkit, TextField, "text", STRING, TEXT) +DALI_PROPERTY_REGISTRATION(Toolkit, TextField, "placeholderText", STRING, PLACEHOLDER_TEXT) +DALI_PROPERTY_REGISTRATION(Toolkit, TextField, "placeholderTextFocused", STRING, PLACEHOLDER_TEXT_FOCUSED) +DALI_PROPERTY_REGISTRATION(Toolkit, TextField, "fontFamily", STRING, FONT_FAMILY) +DALI_PROPERTY_REGISTRATION(Toolkit, TextField, "fontStyle", MAP, FONT_STYLE) +DALI_PROPERTY_REGISTRATION(Toolkit, TextField, "pointSize", FLOAT, POINT_SIZE) +DALI_PROPERTY_REGISTRATION(Toolkit, TextField, "maxLength", INTEGER, MAX_LENGTH) +DALI_PROPERTY_REGISTRATION(Toolkit, TextField, "exceedPolicy", INTEGER, EXCEED_POLICY) +DALI_PROPERTY_REGISTRATION(Toolkit, TextField, "horizontalAlignment", STRING, HORIZONTAL_ALIGNMENT) +DALI_PROPERTY_REGISTRATION(Toolkit, TextField, "verticalAlignment", STRING, VERTICAL_ALIGNMENT) +DALI_PROPERTY_REGISTRATION(Toolkit, TextField, "textColor", VECTOR4, TEXT_COLOR) +DALI_PROPERTY_REGISTRATION(Toolkit, TextField, "placeholderTextColor", VECTOR4, PLACEHOLDER_TEXT_COLOR) +DALI_PROPERTY_REGISTRATION(Toolkit, TextField, "primaryCursorColor", VECTOR4, PRIMARY_CURSOR_COLOR) +DALI_PROPERTY_REGISTRATION(Toolkit, TextField, "secondaryCursorColor", VECTOR4, SECONDARY_CURSOR_COLOR) +DALI_PROPERTY_REGISTRATION(Toolkit, TextField, "enableCursorBlink", BOOLEAN, ENABLE_CURSOR_BLINK) +DALI_PROPERTY_REGISTRATION(Toolkit, TextField, "cursorBlinkInterval", FLOAT, CURSOR_BLINK_INTERVAL) +DALI_PROPERTY_REGISTRATION(Toolkit, TextField, "cursorBlinkDuration", FLOAT, CURSOR_BLINK_DURATION) +DALI_PROPERTY_REGISTRATION(Toolkit, TextField, "cursorWidth", INTEGER, CURSOR_WIDTH) +DALI_PROPERTY_REGISTRATION(Toolkit, TextField, "grabHandleImage", STRING, GRAB_HANDLE_IMAGE) +DALI_PROPERTY_REGISTRATION(Toolkit, TextField, "grabHandlePressedImage", STRING, GRAB_HANDLE_PRESSED_IMAGE) +DALI_PROPERTY_REGISTRATION(Toolkit, TextField, "scrollThreshold", FLOAT, SCROLL_THRESHOLD) +DALI_PROPERTY_REGISTRATION(Toolkit, TextField, "scrollSpeed", FLOAT, SCROLL_SPEED) +DALI_PROPERTY_REGISTRATION(Toolkit, TextField, "selectionHandleImageLeft", MAP, SELECTION_HANDLE_IMAGE_LEFT) +DALI_PROPERTY_REGISTRATION(Toolkit, TextField, "selectionHandleImageRight", MAP, SELECTION_HANDLE_IMAGE_RIGHT) +DALI_PROPERTY_REGISTRATION(Toolkit, TextField, "selectionHandlePressedImageLeft", MAP, SELECTION_HANDLE_PRESSED_IMAGE_LEFT) +DALI_PROPERTY_REGISTRATION(Toolkit, TextField, "selectionHandlePressedImageRight", MAP, SELECTION_HANDLE_PRESSED_IMAGE_RIGHT) +DALI_PROPERTY_REGISTRATION(Toolkit, TextField, "selectionHandleMarkerImageLeft", MAP, SELECTION_HANDLE_MARKER_IMAGE_LEFT) +DALI_PROPERTY_REGISTRATION(Toolkit, TextField, "selectionHandleMarkerImageRight", MAP, SELECTION_HANDLE_MARKER_IMAGE_RIGHT) +DALI_PROPERTY_REGISTRATION(Toolkit, TextField, "selectionHighlightColor", VECTOR4, SELECTION_HIGHLIGHT_COLOR) +DALI_PROPERTY_REGISTRATION(Toolkit, TextField, "decorationBoundingBox", RECTANGLE, DECORATION_BOUNDING_BOX) +DALI_PROPERTY_REGISTRATION(Toolkit, TextField, "inputMethodSettings", MAP, INPUT_METHOD_SETTINGS) +DALI_PROPERTY_REGISTRATION(Toolkit, TextField, "inputColor", VECTOR4, INPUT_COLOR) +DALI_PROPERTY_REGISTRATION(Toolkit, TextField, "enableMarkup", BOOLEAN, ENABLE_MARKUP) +DALI_PROPERTY_REGISTRATION(Toolkit, TextField, "inputFontFamily", STRING, INPUT_FONT_FAMILY) +DALI_PROPERTY_REGISTRATION(Toolkit, TextField, "inputFontStyle", MAP, INPUT_FONT_STYLE) +DALI_PROPERTY_REGISTRATION(Toolkit, TextField, "inputPointSize", FLOAT, INPUT_POINT_SIZE) +DALI_PROPERTY_REGISTRATION(Toolkit, TextField, "underline", MAP, UNDERLINE) +DALI_PROPERTY_REGISTRATION(Toolkit, TextField, "inputUnderline", MAP, INPUT_UNDERLINE) +DALI_PROPERTY_REGISTRATION(Toolkit, TextField, "shadow", MAP, SHADOW) +DALI_PROPERTY_REGISTRATION(Toolkit, TextField, "inputShadow", MAP, INPUT_SHADOW) +DALI_PROPERTY_REGISTRATION(Toolkit, TextField, "emboss", MAP, EMBOSS) +DALI_PROPERTY_REGISTRATION(Toolkit, TextField, "inputEmboss", MAP, INPUT_EMBOSS) +DALI_PROPERTY_REGISTRATION(Toolkit, TextField, "outline", MAP, OUTLINE) +DALI_PROPERTY_REGISTRATION(Toolkit, TextField, "inputOutline", MAP, INPUT_OUTLINE) +DALI_PROPERTY_REGISTRATION(Toolkit, TextField, "hiddenInputSettings", MAP, HIDDEN_INPUT_SETTINGS) +DALI_PROPERTY_REGISTRATION(Toolkit, TextField, "pixelSize", FLOAT, PIXEL_SIZE) +DALI_PROPERTY_REGISTRATION(Toolkit, TextField, "enableSelection", BOOLEAN, ENABLE_SELECTION) +DALI_PROPERTY_REGISTRATION(Toolkit, TextField, "placeholder", MAP, PLACEHOLDER) +DALI_PROPERTY_REGISTRATION(Toolkit, TextField, "ellipsis", BOOLEAN, ELLIPSIS) +DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextField, "enableShiftSelection", BOOLEAN, ENABLE_SHIFT_SELECTION) +DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextField, "enableGrabHandle", BOOLEAN, ENABLE_GRAB_HANDLE) +DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextField, "matchSystemLanguageDirection", BOOLEAN, MATCH_SYSTEM_LANGUAGE_DIRECTION) +DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextField, "enableGrabHandlePopup", BOOLEAN, ENABLE_GRAB_HANDLE_POPUP) +DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextField, "textBackground", VECTOR4, BACKGROUND) +DALI_DEVEL_PROPERTY_REGISTRATION_READ_ONLY(Toolkit, TextField, "selectedText", STRING, SELECTED_TEXT) +DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextField, "renderingBackend", INTEGER, RENDERING_BACKEND) +DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextField, "selectedTextStart", INTEGER, SELECTED_TEXT_START) +DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextField, "selectedTextEnd", INTEGER, SELECTED_TEXT_END) +DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextField, "enableEditing", BOOLEAN, ENABLE_EDITING) + +DALI_SIGNAL_REGISTRATION(Toolkit, TextField, "textChanged", SIGNAL_TEXT_CHANGED) +DALI_SIGNAL_REGISTRATION(Toolkit, TextField, "maxLengthReached", SIGNAL_MAX_LENGTH_REACHED) +DALI_SIGNAL_REGISTRATION(Toolkit, TextField, "inputStyleChanged", SIGNAL_INPUT_STYLE_CHANGED) DALI_TYPE_REGISTRATION_END() -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; @@ -170,10 +166,10 @@ std::string GetImageFileNameFromPropertyValue( const Property::Value& value ) Toolkit::TextField TextField::New() { // Create the implementation, temporarily owned by this handle on stack - IntrusivePtr< TextField > impl = new TextField(); + IntrusivePtr impl = new TextField(); // Pass ownership to CustomActor handle - Toolkit::TextField handle( *impl ); + Toolkit::TextField handle(*impl); // Second-phase init of the implementation // This can only be done after the CustomActor connection has been made... @@ -182,388 +178,388 @@ Toolkit::TextField TextField::New() return handle; } -void TextField::SetProperty( BaseObject* object, Property::Index index, const Property::Value& value ) +void TextField::SetProperty(BaseObject* object, Property::Index index, const Property::Value& value) { - Toolkit::TextField textField = Toolkit::TextField::DownCast( Dali::BaseHandle( object ) ); + Toolkit::TextField textField = Toolkit::TextField::DownCast(Dali::BaseHandle(object)); - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextField SetProperty\n"); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField SetProperty\n"); - if( textField ) + if(textField) { - TextField& impl( GetImpl( textField ) ); - DALI_ASSERT_DEBUG( impl.mController && "No text contoller" ); - DALI_ASSERT_DEBUG( impl.mDecorator && "No text decorator" ); + TextField& impl(GetImpl(textField)); + DALI_ASSERT_DEBUG(impl.mController && "No text contoller"); + DALI_ASSERT_DEBUG(impl.mDecorator && "No text decorator"); - switch( index ) + switch(index) { case Toolkit::DevelTextField::Property::RENDERING_BACKEND: { - int backend = value.Get< int >(); - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextField %p RENDERING_BACKEND %d\n", impl.mController.Get(), backend ); + int backend = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField %p RENDERING_BACKEND %d\n", impl.mController.Get(), backend); #ifndef ENABLE_VECTOR_BASED_TEXT_RENDERING - if( DevelText::RENDERING_VECTOR_BASED == backend ) + if(DevelText::RENDERING_VECTOR_BASED == backend) { backend = TextAbstraction::BITMAP_GLYPH; // Fallback to bitmap-based rendering } #endif - if( impl.mRenderingBackend != backend ) + if(impl.mRenderingBackend != backend) { impl.mRenderingBackend = backend; impl.mRenderer.Reset(); // When using the vector-based rendering, the size of the GLyphs are different TextAbstraction::GlyphType glyphType = (DevelText::RENDERING_VECTOR_BASED == impl.mRenderingBackend) ? TextAbstraction::VECTOR_GLYPH : TextAbstraction::BITMAP_GLYPH; - impl.mController->SetGlyphType( glyphType ); + impl.mController->SetGlyphType(glyphType); } break; } case Toolkit::TextField::Property::TEXT: { - const std::string& text = value.Get< std::string >(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextField %p TEXT %s\n", impl.mController.Get(), text.c_str() ); + const std::string& text = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p TEXT %s\n", impl.mController.Get(), text.c_str()); - impl.mController->SetText( text ); + impl.mController->SetText(text); break; } case Toolkit::TextField::Property::PLACEHOLDER_TEXT: { - const std::string& text = value.Get< std::string >(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextField %p PLACEHOLDER_TEXT %s\n", impl.mController.Get(), text.c_str() ); + const std::string& text = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p PLACEHOLDER_TEXT %s\n", impl.mController.Get(), text.c_str()); - impl.mController->SetPlaceholderText( Controller::PLACEHOLDER_TYPE_INACTIVE, text ); + impl.mController->SetPlaceholderText(Controller::PLACEHOLDER_TYPE_INACTIVE, text); break; } case Toolkit::TextField::Property::PLACEHOLDER_TEXT_FOCUSED: { - const std::string& text = value.Get< std::string >(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextField %p PLACEHOLDER_TEXT_FOCUSED %s\n", impl.mController.Get(), text.c_str() ); + const std::string& text = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p PLACEHOLDER_TEXT_FOCUSED %s\n", impl.mController.Get(), text.c_str()); - impl.mController->SetPlaceholderText( Controller::PLACEHOLDER_TYPE_ACTIVE, text ); + impl.mController->SetPlaceholderText(Controller::PLACEHOLDER_TYPE_ACTIVE, text); break; } case Toolkit::TextField::Property::FONT_FAMILY: { - const std::string& fontFamily = value.Get< std::string >(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextField %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, "TextField %p FONT_FAMILY %s\n", impl.mController.Get(), fontFamily.c_str()); + impl.mController->SetDefaultFontFamily(fontFamily); break; } case Toolkit::TextField::Property::FONT_STYLE: { - SetFontStyleProperty( impl.mController, value, Text::FontStyle::DEFAULT ); + SetFontStyleProperty(impl.mController, value, Text::FontStyle::DEFAULT); break; } case Toolkit::TextField::Property::POINT_SIZE: { - const float pointSize = value.Get< float >(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextField %p POINT_SIZE %f\n", impl.mController.Get(), pointSize ); + const float pointSize = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p POINT_SIZE %f\n", impl.mController.Get(), pointSize); - if( !Equals( impl.mController->GetDefaultFontSize( Text::Controller::POINT_SIZE ), pointSize ) ) + 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::TextField::Property::MAX_LENGTH: { - const int max = value.Get< int >(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextField %p MAX_LENGTH %d\n", impl.mController.Get(), max ); + const int max = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p MAX_LENGTH %d\n", impl.mController.Get(), max); - impl.mController->SetMaximumNumberOfCharacters( max ); + impl.mController->SetMaximumNumberOfCharacters(max); break; } case Toolkit::TextField::Property::EXCEED_POLICY: { impl.mExceedPolicy = value.Get(); - if( Dali::Toolkit::TextField::EXCEED_POLICY_CLIP == impl.mExceedPolicy ) + if(Dali::Toolkit::TextField::EXCEED_POLICY_CLIP == impl.mExceedPolicy) { impl.EnableClipping(); } else { - UnparentAndReset( impl.mStencil ); + UnparentAndReset(impl.mStencil); } impl.RequestTextRelayout(); break; } case Toolkit::TextField::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( GetHorizontalAlignmentEnumeration( value, alignment ) ) + Text::HorizontalAlignment::Type alignment(static_cast(-1)); // Set to invalid value to ensure a valid mode does get set + if(GetHorizontalAlignmentEnumeration(value, alignment)) { - DALI_LOG_INFO( gLogFilter, Debug::General, "TextField %p HORIZONTAL_ALIGNMENT %d\n", impl.mController.Get(), alignment ); - impl.mController->SetHorizontalAlignment( alignment ); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p HORIZONTAL_ALIGNMENT %d\n", impl.mController.Get(), alignment); + impl.mController->SetHorizontalAlignment(alignment); } break; } case Toolkit::TextField::Property::VERTICAL_ALIGNMENT: { - Toolkit::Text::VerticalAlignment::Type alignment( static_cast< Text::VerticalAlignment::Type >( -1 ) ); // Set to invalid value to ensure a valid mode does get set - if( GetVerticalAlignmentEnumeration( value, alignment ) ) + Toolkit::Text::VerticalAlignment::Type alignment(static_cast(-1)); // Set to invalid value to ensure a valid mode does get set + if(GetVerticalAlignmentEnumeration(value, alignment)) { - impl.mController->SetVerticalAlignment( alignment ); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextField %p VERTICAL_ALIGNMENT %d\n", impl.mController.Get(), alignment ); + impl.mController->SetVerticalAlignment(alignment); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p VERTICAL_ALIGNMENT %d\n", impl.mController.Get(), alignment); } break; } case Toolkit::TextField::Property::TEXT_COLOR: { - const Vector4& textColor = value.Get< Vector4 >(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextField %p TEXT_COLOR %f,%f,%f,%f\n", impl.mController.Get(), textColor.r, textColor.g, textColor.b, textColor.a ); + const Vector4& textColor = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p TEXT_COLOR %f,%f,%f,%f\n", impl.mController.Get(), textColor.r, textColor.g, textColor.b, textColor.a); - if( impl.mController->GetDefaultColor() != textColor ) + 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::TextField::Property::PLACEHOLDER_TEXT_COLOR: { - const Vector4& textColor = value.Get< Vector4 >(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextField %p PLACEHOLDER_TEXT_COLOR %f,%f,%f,%f\n", impl.mController.Get(), textColor.r, textColor.g, textColor.b, textColor.a ); + const Vector4& textColor = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p PLACEHOLDER_TEXT_COLOR %f,%f,%f,%f\n", impl.mController.Get(), textColor.r, textColor.g, textColor.b, textColor.a); - if( impl.mController->GetPlaceholderTextColor() != textColor ) + if(impl.mController->GetPlaceholderTextColor() != textColor) { - impl.mController->SetPlaceholderTextColor( textColor ); + impl.mController->SetPlaceholderTextColor(textColor); impl.mRenderer.Reset(); } break; } case Toolkit::TextField::Property::PRIMARY_CURSOR_COLOR: { - const Vector4& color = value.Get< Vector4 >(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextField %p PRIMARY_CURSOR_COLOR %f,%f,%f,%f\n", impl.mController.Get(), color.r, color.g, color.b, color.a ); + const Vector4& color = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p PRIMARY_CURSOR_COLOR %f,%f,%f,%f\n", impl.mController.Get(), color.r, color.g, color.b, color.a); - impl.mDecorator->SetCursorColor( PRIMARY_CURSOR, color ); + impl.mDecorator->SetCursorColor(PRIMARY_CURSOR, color); impl.RequestTextRelayout(); break; } case Toolkit::TextField::Property::SECONDARY_CURSOR_COLOR: { - const Vector4& color = value.Get< Vector4 >(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextField %p SECONDARY_CURSOR_COLOR %f,%f,%f,%f\n", impl.mController.Get(), color.r, color.g, color.b, color.a ); + const Vector4& color = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p SECONDARY_CURSOR_COLOR %f,%f,%f,%f\n", impl.mController.Get(), color.r, color.g, color.b, color.a); - impl.mDecorator->SetCursorColor( SECONDARY_CURSOR, color ); + impl.mDecorator->SetCursorColor(SECONDARY_CURSOR, color); impl.RequestTextRelayout(); break; } case Toolkit::TextField::Property::ENABLE_CURSOR_BLINK: { - const bool enable = value.Get< bool >(); - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextField %p ENABLE_CURSOR_BLINK %d\n", impl.mController.Get(), enable ); + const bool enable = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField %p ENABLE_CURSOR_BLINK %d\n", impl.mController.Get(), enable); - impl.mController->SetEnableCursorBlink( enable ); + impl.mController->SetEnableCursorBlink(enable); impl.RequestTextRelayout(); break; } case Toolkit::TextField::Property::CURSOR_BLINK_INTERVAL: { - const float interval = value.Get< float >(); - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextField %p CURSOR_BLINK_INTERVAL %f\n", impl.mController.Get(), interval ); + const float interval = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField %p CURSOR_BLINK_INTERVAL %f\n", impl.mController.Get(), interval); - impl.mDecorator->SetCursorBlinkInterval( interval ); + impl.mDecorator->SetCursorBlinkInterval(interval); break; } case Toolkit::TextField::Property::CURSOR_BLINK_DURATION: { - const float duration = value.Get< float >(); - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextField %p CURSOR_BLINK_DURATION %f\n", impl.mController.Get(), duration ); + const float duration = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField %p CURSOR_BLINK_DURATION %f\n", impl.mController.Get(), duration); - impl.mDecorator->SetCursorBlinkDuration( duration ); + impl.mDecorator->SetCursorBlinkDuration(duration); break; } case Toolkit::TextField::Property::CURSOR_WIDTH: { - const int width = value.Get< int >(); - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextField %p CURSOR_WIDTH %d\n", impl.mController.Get(), width ); + const int width = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField %p CURSOR_WIDTH %d\n", impl.mController.Get(), width); - impl.mDecorator->SetCursorWidth( width ); - impl.mController->GetLayoutEngine().SetCursorWidth( width ); + impl.mDecorator->SetCursorWidth(width); + impl.mController->GetLayoutEngine().SetCursorWidth(width); break; } case Toolkit::TextField::Property::GRAB_HANDLE_IMAGE: { - const std::string imageFileName = value.Get< std::string >(); - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextField %p GRAB_HANDLE_IMAGE %s\n", impl.mController.Get(), imageFileName.c_str() ); + const std::string imageFileName = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField %p GRAB_HANDLE_IMAGE %s\n", impl.mController.Get(), imageFileName.c_str()); - if( imageFileName.size() ) + 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::TextField::Property::GRAB_HANDLE_PRESSED_IMAGE: { - const std::string imageFileName = value.Get< std::string >(); - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextField %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, "TextField %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::TextField::Property::SCROLL_THRESHOLD: { - const float threshold = value.Get< float >(); - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextField %p SCROLL_THRESHOLD %f\n", impl.mController.Get(), threshold ); + const float threshold = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField %p SCROLL_THRESHOLD %f\n", impl.mController.Get(), threshold); - impl.mDecorator->SetScrollThreshold( threshold ); + impl.mDecorator->SetScrollThreshold(threshold); break; } case Toolkit::TextField::Property::SCROLL_SPEED: { - const float speed = value.Get< float >(); - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextField %p SCROLL_SPEED %f\n", impl.mController.Get(), speed ); + const float speed = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField %p SCROLL_SPEED %f\n", impl.mController.Get(), speed); - impl.mDecorator->SetScrollSpeed( speed ); + impl.mDecorator->SetScrollSpeed(speed); break; } case Toolkit::TextField::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::TextField::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::TextField::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::TextField::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::TextField::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::TextField::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::TextField::Property::SELECTION_HIGHLIGHT_COLOR: { - const Vector4 color = value.Get< Vector4 >(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextField %p SELECTION_HIGHLIGHT_COLOR %f,%f,%f,%f\n", impl.mController.Get(), color.r, color.g, color.b, color.a ); + const Vector4 color = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p SELECTION_HIGHLIGHT_COLOR %f,%f,%f,%f\n", impl.mController.Get(), color.r, color.g, color.b, color.a); - impl.mDecorator->SetHighlightColor( color ); + impl.mDecorator->SetHighlightColor(color); impl.RequestTextRelayout(); break; } case Toolkit::TextField::Property::DECORATION_BOUNDING_BOX: { - const Rect box = value.Get< Rect >(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextField %p DECORATION_BOUNDING_BOX %d,%d %dx%d\n", impl.mController.Get(), box.x, box.y, box.width, box.height ); + const Rect box = value.Get >(); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p DECORATION_BOUNDING_BOX %d,%d %dx%d\n", impl.mController.Get(), box.x, box.y, box.width, box.height); - impl.mDecorator->SetBoundingBox( box ); + impl.mDecorator->SetBoundingBox(box); impl.RequestTextRelayout(); break; } case Toolkit::TextField::Property::INPUT_METHOD_SETTINGS: { const Property::Map* map = value.GetMap(); - if (map) + if(map) { - impl.mInputMethodOptions.ApplyProperty( *map ); + impl.mInputMethodOptions.ApplyProperty(*map); } - impl.mController->SetInputModePassword( impl.mInputMethodOptions.IsPassword() ); + impl.mController->SetInputModePassword(impl.mInputMethodOptions.IsPassword()); Toolkit::Control control = Toolkit::KeyInputFocusManager::Get().GetCurrentFocusControl(); - if (control == textField) + if(control == textField) { - impl.mInputMethodContext.ApplyOptions( impl.mInputMethodOptions ); + impl.mInputMethodContext.ApplyOptions(impl.mInputMethodOptions); } break; } case Toolkit::TextField::Property::INPUT_COLOR: { - const Vector4 inputColor = value.Get< Vector4 >(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextField %p INPUT_COLOR %f,%f,%f,%f\n", impl.mController.Get(), inputColor.r, inputColor.g, inputColor.b, inputColor.a ); + const Vector4 inputColor = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p INPUT_COLOR %f,%f,%f,%f\n", impl.mController.Get(), inputColor.r, inputColor.g, inputColor.b, inputColor.a); - impl.mController->SetInputColor( inputColor ); + impl.mController->SetInputColor(inputColor); break; } case Toolkit::TextField::Property::ENABLE_MARKUP: { const bool enableMarkup = value.Get(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextField %p ENABLE_MARKUP %d\n", impl.mController.Get(), enableMarkup ); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p ENABLE_MARKUP %d\n", impl.mController.Get(), enableMarkup); - impl.mController->SetMarkupProcessorEnabled( enableMarkup ); + impl.mController->SetMarkupProcessorEnabled(enableMarkup); break; } case Toolkit::TextField::Property::INPUT_FONT_FAMILY: { - const std::string& fontFamily = value.Get< std::string >(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextField %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, "TextField %p INPUT_FONT_FAMILY %s\n", impl.mController.Get(), fontFamily.c_str()); + impl.mController->SetInputFontFamily(fontFamily); break; } case Toolkit::TextField::Property::INPUT_FONT_STYLE: { - SetFontStyleProperty( impl.mController, value, Text::FontStyle::INPUT ); + SetFontStyleProperty(impl.mController, value, Text::FontStyle::INPUT); break; } case Toolkit::TextField::Property::INPUT_POINT_SIZE: { - const float pointSize = value.Get< float >(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextField %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, "TextField %p INPUT_POINT_SIZE %f\n", impl.mController.Get(), pointSize); + impl.mController->SetInputFontPointSize(pointSize); break; } case Toolkit::TextField::Property::UNDERLINE: { - const bool update = SetUnderlineProperties( impl.mController, value, Text::EffectStyle::DEFAULT ); - if( update ) + const bool update = SetUnderlineProperties(impl.mController, value, Text::EffectStyle::DEFAULT); + if(update) { impl.mRenderer.Reset(); } @@ -571,8 +567,8 @@ void TextField::SetProperty( BaseObject* object, Property::Index index, const Pr } case Toolkit::TextField::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(); } @@ -580,8 +576,8 @@ void TextField::SetProperty( BaseObject* object, Property::Index index, const Pr } case Toolkit::TextField::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(); } @@ -589,8 +585,8 @@ void TextField::SetProperty( BaseObject* object, Property::Index index, const Pr } case Toolkit::TextField::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(); } @@ -598,8 +594,8 @@ void TextField::SetProperty( BaseObject* object, Property::Index index, const Pr } case Toolkit::TextField::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(); } @@ -607,8 +603,8 @@ void TextField::SetProperty( BaseObject* object, Property::Index index, const Pr } case Toolkit::TextField::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(); } @@ -616,8 +612,8 @@ void TextField::SetProperty( BaseObject* object, Property::Index index, const Pr } case Toolkit::TextField::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(); } @@ -625,8 +621,8 @@ void TextField::SetProperty( BaseObject* object, Property::Index index, const Pr } case Toolkit::TextField::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(); } @@ -635,7 +631,7 @@ void TextField::SetProperty( BaseObject* object, Property::Index index, const Pr case Toolkit::TextField::Property::HIDDEN_INPUT_SETTINGS: { const Property::Map* map = value.GetMap(); - if (map) + if(map) { impl.mController->SetHiddenInputOption(*map); } @@ -643,58 +639,58 @@ void TextField::SetProperty( BaseObject* object, Property::Index index, const Pr } case Toolkit::TextField::Property::PIXEL_SIZE: { - const float pixelSize = value.Get< float >(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextField %p PIXEL_SIZE %f\n", impl.mController.Get(), pixelSize ); + const float pixelSize = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p PIXEL_SIZE %f\n", impl.mController.Get(), pixelSize); - if( !Equals( impl.mController->GetDefaultFontSize( Text::Controller::PIXEL_SIZE ), pixelSize ) ) + 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::TextField::Property::ENABLE_SELECTION: { - const bool enableSelection = value.Get< bool >(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextField %p ENABLE_SELECTION %d\n", impl.mController.Get(), enableSelection ); - impl.mController->SetSelectionEnabled( enableSelection ); + const bool enableSelection = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p ENABLE_SELECTION %d\n", impl.mController.Get(), enableSelection); + impl.mController->SetSelectionEnabled(enableSelection); break; } case Toolkit::TextField::Property::PLACEHOLDER: { const Property::Map* map = value.GetMap(); - if( map ) + if(map) { - impl.mController->SetPlaceholderProperty( *map ); + impl.mController->SetPlaceholderProperty(*map); } break; } case Toolkit::TextField::Property::ELLIPSIS: { const bool ellipsis = value.Get(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextField %p ELLIPSIS %d\n", impl.mController.Get(), ellipsis ); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p ELLIPSIS %d\n", impl.mController.Get(), ellipsis); - impl.mController->SetTextElideEnabled( ellipsis ); + impl.mController->SetTextElideEnabled(ellipsis); break; } case Toolkit::DevelTextField::Property::ENABLE_SHIFT_SELECTION: { const bool shiftSelection = value.Get(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextField %p ENABLE_SHIFT_SELECTION %d\n", impl.mController.Get(), shiftSelection ); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p ENABLE_SHIFT_SELECTION %d\n", impl.mController.Get(), shiftSelection); - impl.mController->SetShiftSelectionEnabled( shiftSelection ); + impl.mController->SetShiftSelectionEnabled(shiftSelection); break; } case Toolkit::DevelTextField::Property::ENABLE_GRAB_HANDLE: { const bool grabHandleEnabled = value.Get(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextField %p ENABLE_GRAB_HANDLE %d\n", impl.mController.Get(), grabHandleEnabled ); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p ENABLE_GRAB_HANDLE %d\n", impl.mController.Get(), grabHandleEnabled); - impl.mController->SetGrabHandleEnabled( grabHandleEnabled ); + impl.mController->SetGrabHandleEnabled(grabHandleEnabled); break; } case Toolkit::DevelTextField::Property::MATCH_SYSTEM_LANGUAGE_DIRECTION: { - impl.mController->SetMatchSystemLanguageDirection(value.Get< bool >()); + impl.mController->SetMatchSystemLanguageDirection(value.Get()); break; } case Toolkit::DevelTextField::Property::ENABLE_GRAB_HANDLE_POPUP: @@ -707,51 +703,51 @@ void TextField::SetProperty( BaseObject* object, Property::Index index, const Pr } case Toolkit::DevelTextField::Property::BACKGROUND: { - const Vector4 backgroundColor = value.Get< Vector4 >(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextField %p BACKGROUND %f,%f,%f,%f\n", impl.mController.Get(), backgroundColor.r, backgroundColor.g, backgroundColor.b, backgroundColor.a ); + const Vector4 backgroundColor = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p BACKGROUND %f,%f,%f,%f\n", impl.mController.Get(), backgroundColor.r, backgroundColor.g, backgroundColor.b, backgroundColor.a); - impl.mController->SetBackgroundEnabled( true ); - impl.mController->SetBackgroundColor( backgroundColor ); + impl.mController->SetBackgroundEnabled(true); + impl.mController->SetBackgroundColor(backgroundColor); break; } case Toolkit::DevelTextField::Property::SELECTED_TEXT_START: { - uint32_t start = static_cast(value.Get< int >()); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextField %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, "TextField %p SELECTED_TEXT_START %d\n", impl.mController.Get(), start); + impl.SetTextSelectionRange(&start, nullptr); break; } case Toolkit::DevelTextField::Property::SELECTED_TEXT_END: { - uint32_t end = static_cast(value.Get< int >()); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextField %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, "TextField %p SELECTED_TEXT_END %d\n", impl.mController.Get(), end); + impl.SetTextSelectionRange(nullptr, &end); break; } case Toolkit::DevelTextField::Property::ENABLE_EDITING: { - const bool editable = value.Get< bool >(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextField %p ENABLE_EDITING %d\n", impl.mController.Get(), editable ); - impl.SetEditable( editable ); + const bool editable = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p ENABLE_EDITING %d\n", impl.mController.Get(), editable); + impl.SetEditable(editable); break; } } // switch - } // textfield + } // textfield } -Property::Value TextField::GetProperty( BaseObject* object, Property::Index index ) +Property::Value TextField::GetProperty(BaseObject* object, Property::Index index) { Property::Value value; - Toolkit::TextField textField = Toolkit::TextField::DownCast( Dali::BaseHandle( object ) ); + Toolkit::TextField textField = Toolkit::TextField::DownCast(Dali::BaseHandle(object)); - if( textField ) + if(textField) { - TextField& impl( GetImpl( textField ) ); - DALI_ASSERT_DEBUG( impl.mController && "No text contoller" ); - DALI_ASSERT_DEBUG( impl.mDecorator && "No text decorator" ); + TextField& impl(GetImpl(textField)); + DALI_ASSERT_DEBUG(impl.mController && "No text contoller"); + DALI_ASSERT_DEBUG(impl.mDecorator && "No text decorator"); - switch( index ) + switch(index) { case Toolkit::DevelTextField::Property::RENDERING_BACKEND: { @@ -761,22 +757,22 @@ Property::Value TextField::GetProperty( BaseObject* object, Property::Index inde case Toolkit::TextField::Property::TEXT: { std::string text; - impl.mController->GetText( text ); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextField %p returning text: %s\n", impl.mController.Get(), text.c_str() ); + impl.mController->GetText(text); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p returning text: %s\n", impl.mController.Get(), text.c_str()); value = text; break; } case Toolkit::TextField::Property::PLACEHOLDER_TEXT: { std::string text; - impl.mController->GetPlaceholderText( Controller::PLACEHOLDER_TYPE_INACTIVE, text ); + impl.mController->GetPlaceholderText(Controller::PLACEHOLDER_TYPE_INACTIVE, text); value = text; break; } case Toolkit::TextField::Property::PLACEHOLDER_TEXT_FOCUSED: { std::string text; - impl.mController->GetPlaceholderText( Controller::PLACEHOLDER_TYPE_ACTIVE, text ); + impl.mController->GetPlaceholderText(Controller::PLACEHOLDER_TYPE_ACTIVE, text); value = text; break; } @@ -787,12 +783,12 @@ Property::Value TextField::GetProperty( BaseObject* object, Property::Index inde } case Toolkit::TextField::Property::FONT_STYLE: { - GetFontStyleProperty( impl.mController, value, Text::FontStyle::DEFAULT ); + GetFontStyleProperty(impl.mController, value, Text::FontStyle::DEFAULT); break; } case Toolkit::TextField::Property::POINT_SIZE: { - value = impl.mController->GetDefaultFontSize( Text::Controller::POINT_SIZE ); + value = impl.mController->GetDefaultFontSize(Text::Controller::POINT_SIZE); break; } case Toolkit::TextField::Property::MAX_LENGTH: @@ -807,21 +803,21 @@ Property::Value TextField::GetProperty( BaseObject* object, Property::Index inde } case Toolkit::TextField::Property::HORIZONTAL_ALIGNMENT: { - const char* name = Text::GetHorizontalAlignmentString( impl.mController->GetHorizontalAlignment() ); + const char* name = Text::GetHorizontalAlignmentString(impl.mController->GetHorizontalAlignment()); - if ( name ) + if(name) { - value = std::string( name ); + value = std::string(name); } break; } case Toolkit::TextField::Property::VERTICAL_ALIGNMENT: { - const char* name = Text::GetVerticalAlignmentString( impl.mController->GetVerticalAlignment() ); + const char* name = Text::GetVerticalAlignmentString(impl.mController->GetVerticalAlignment()); - if( name ) + if(name) { - value = std::string( name ); + value = std::string(name); } break; } @@ -837,12 +833,12 @@ Property::Value TextField::GetProperty( BaseObject* object, Property::Index inde } case Toolkit::TextField::Property::PRIMARY_CURSOR_COLOR: { - value = impl.mDecorator->GetColor( PRIMARY_CURSOR ); + value = impl.mDecorator->GetColor(PRIMARY_CURSOR); break; } case Toolkit::TextField::Property::SECONDARY_CURSOR_COLOR: { - value = impl.mDecorator->GetColor( SECONDARY_CURSOR ); + value = impl.mDecorator->GetColor(SECONDARY_CURSOR); break; } case Toolkit::TextField::Property::ENABLE_CURSOR_BLINK: @@ -867,12 +863,12 @@ Property::Value TextField::GetProperty( BaseObject* object, Property::Index inde } case Toolkit::TextField::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::TextField::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::TextField::Property::SCROLL_THRESHOLD: @@ -887,32 +883,32 @@ Property::Value TextField::GetProperty( BaseObject* object, Property::Index inde } case Toolkit::TextField::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::TextField::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::TextField::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::TextField::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::TextField::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::TextField::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::TextField::Property::SELECTION_HIGHLIGHT_COLOR: @@ -923,14 +919,14 @@ Property::Value TextField::GetProperty( BaseObject* object, Property::Index inde case Toolkit::TextField::Property::DECORATION_BOUNDING_BOX: { Rect boundingBox; - impl.mDecorator->GetBoundingBox( boundingBox ); + impl.mDecorator->GetBoundingBox(boundingBox); value = boundingBox; break; } case Toolkit::TextField::Property::INPUT_METHOD_SETTINGS: { Property::Map map; - impl.mInputMethodOptions.RetrieveProperty( map ); + impl.mInputMethodOptions.RetrieveProperty(map); value = map; break; } @@ -951,7 +947,7 @@ Property::Value TextField::GetProperty( BaseObject* object, Property::Index inde } case Toolkit::TextField::Property::INPUT_FONT_STYLE: { - GetFontStyleProperty( impl.mController, value, Text::FontStyle::INPUT ); + GetFontStyleProperty(impl.mController, value, Text::FontStyle::INPUT); break; } case Toolkit::TextField::Property::INPUT_POINT_SIZE: @@ -961,42 +957,42 @@ Property::Value TextField::GetProperty( BaseObject* object, Property::Index inde } case Toolkit::TextField::Property::UNDERLINE: { - GetUnderlineProperties( impl.mController, value, Text::EffectStyle::DEFAULT ); + GetUnderlineProperties(impl.mController, value, Text::EffectStyle::DEFAULT); break; } case Toolkit::TextField::Property::INPUT_UNDERLINE: { - GetUnderlineProperties( impl.mController, value, Text::EffectStyle::INPUT ); + GetUnderlineProperties(impl.mController, value, Text::EffectStyle::INPUT); break; } case Toolkit::TextField::Property::SHADOW: { - GetShadowProperties( impl.mController, value, Text::EffectStyle::DEFAULT ); + GetShadowProperties(impl.mController, value, Text::EffectStyle::DEFAULT); break; } case Toolkit::TextField::Property::INPUT_SHADOW: { - GetShadowProperties( impl.mController, value, Text::EffectStyle::INPUT ); + GetShadowProperties(impl.mController, value, Text::EffectStyle::INPUT); break; } case Toolkit::TextField::Property::EMBOSS: { - GetEmbossProperties( impl.mController, value, Text::EffectStyle::DEFAULT ); + GetEmbossProperties(impl.mController, value, Text::EffectStyle::DEFAULT); break; } case Toolkit::TextField::Property::INPUT_EMBOSS: { - GetEmbossProperties( impl.mController, value, Text::EffectStyle::INPUT ); + GetEmbossProperties(impl.mController, value, Text::EffectStyle::INPUT); break; } case Toolkit::TextField::Property::OUTLINE: { - GetOutlineProperties( impl.mController, value, Text::EffectStyle::DEFAULT ); + GetOutlineProperties(impl.mController, value, Text::EffectStyle::DEFAULT); break; } case Toolkit::TextField::Property::INPUT_OUTLINE: { - GetOutlineProperties( impl.mController, value, Text::EffectStyle::INPUT ); + GetOutlineProperties(impl.mController, value, Text::EffectStyle::INPUT); break; } case Toolkit::TextField::Property::HIDDEN_INPUT_SETTINGS: @@ -1008,7 +1004,7 @@ Property::Value TextField::GetProperty( BaseObject* object, Property::Index inde } case Toolkit::TextField::Property::PIXEL_SIZE: { - value = impl.mController->GetDefaultFontSize( Text::Controller::PIXEL_SIZE ); + value = impl.mController->GetDefaultFontSize(Text::Controller::PIXEL_SIZE); break; } case Toolkit::TextField::Property::ENABLE_SELECTION: @@ -1019,7 +1015,7 @@ Property::Value TextField::GetProperty( BaseObject* object, Property::Index inde case Toolkit::TextField::Property::PLACEHOLDER: { Property::Map map; - impl.mController->GetPlaceholderProperty( map ); + impl.mController->GetPlaceholderProperty(map); value = map; break; } @@ -1055,19 +1051,19 @@ Property::Value TextField::GetProperty( BaseObject* object, Property::Index inde } case Toolkit::DevelTextField::Property::SELECTED_TEXT: { - value = impl.mController->GetSelectedText( ); + value = impl.mController->GetSelectedText(); break; } case Toolkit::DevelTextField::Property::SELECTED_TEXT_START: { - Uint32Pair range = impl.GetTextSelectionRange( ); - value = static_cast(range.first); + Uint32Pair range = impl.GetTextSelectionRange(); + value = static_cast(range.first); break; } case Toolkit::DevelTextField::Property::SELECTED_TEXT_END: { - Uint32Pair range = impl.GetTextSelectionRange( ); - value = static_cast(range.second); + Uint32Pair range = impl.GetTextSelectionRange(); + value = static_cast(range.second); break; } case Toolkit::DevelTextField::Property::ENABLE_EDITING: @@ -1083,7 +1079,7 @@ Property::Value TextField::GetProperty( BaseObject* object, Property::Index inde void TextField::SelectWholeText() { - if( mController && mController->IsShowingRealText() ) + if(mController && mController->IsShowingRealText()) { mController->SelectWholeText(); SetKeyInputFocus(); @@ -1092,7 +1088,7 @@ void TextField::SelectWholeText() void TextField::SelectNone() { - if( mController && mController->IsShowingRealText() ) + if(mController && mController->IsShowingRealText()) { mController->SelectNone(); } @@ -1101,18 +1097,18 @@ void TextField::SelectNone() string TextField::GetSelectedText() const { string selectedText = ""; - if( mController && mController->IsShowingRealText() ) + if(mController && mController->IsShowingRealText()) { - selectedText = mController->GetSelectedText( ); + selectedText = mController->GetSelectedText(); } return selectedText; } -void TextField::SetTextSelectionRange(const uint32_t *start, const uint32_t *end) +void TextField::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(); } } @@ -1120,37 +1116,36 @@ void TextField::SetTextSelectionRange(const uint32_t *start, const uint32_t *end Uint32Pair TextField::GetTextSelectionRange() const { Uint32Pair range; - if( mController && mController->IsShowingRealText() ) + if(mController && mController->IsShowingRealText()) { range = mController->GetTextSelectionRange(); } return range; } - InputMethodContext TextField::GetInputMethodContext() { return mInputMethodContext; } -bool TextField::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor ) +bool TextField::DoConnectSignal(BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor) { - Dali::BaseHandle handle( object ); + Dali::BaseHandle handle(object); - bool connected( true ); - Toolkit::TextField field = Toolkit::TextField::DownCast( handle ); + bool connected(true); + Toolkit::TextField field = Toolkit::TextField::DownCast(handle); - if( 0 == strcmp( signalName.c_str(), SIGNAL_TEXT_CHANGED ) ) + if(0 == strcmp(signalName.c_str(), SIGNAL_TEXT_CHANGED)) { - field.TextChangedSignal().Connect( tracker, functor ); + field.TextChangedSignal().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)) { - field.MaxLengthReachedSignal().Connect( tracker, functor ); + field.MaxLengthReachedSignal().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)) { - field.InputStyleChangedSignal().Connect( tracker, functor ); + field.InputStyleChangedSignal().Connect(tracker, functor); } else { @@ -1180,90 +1175,90 @@ void TextField::OnInitialize() { Actor self = Self(); - mController = Text::Controller::New( this, this ,this); + mController = Text::Controller::New(this, this, this); // When using the vector-based rendering, the size of the GLyphs are different TextAbstraction::GlyphType glyphType = (DevelText::RENDERING_VECTOR_BASED == mRenderingBackend) ? TextAbstraction::VECTOR_GLYPH : TextAbstraction::BITMAP_GLYPH; - mController->SetGlyphType( glyphType ); + mController->SetGlyphType(glyphType); - 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::SINGLE_LINE_BOX ); + mController->GetLayoutEngine().SetLayout(Layout::Engine::SINGLE_LINE_BOX); // Enables the text input. - mController->EnableTextInput( mDecorator, mInputMethodContext ); + mController->EnableTextInput(mDecorator, mInputMethodContext); // Enables the horizontal scrolling after the text input has been enabled. - mController->SetHorizontalScrollEnabled( true ); + mController->SetHorizontalScrollEnabled(true); // Disables the vertical scrolling. - mController->SetVerticalScrollEnabled( false ); + mController->SetVerticalScrollEnabled(false); // Disable the smooth handle panning. - mController->SetSmoothHandlePanEnabled( false ); + mController->SetSmoothHandlePanEnabled(false); - 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, &TextField::OnTouched ); + self.TouchedSignal().Connect(this, &TextField::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)); } // Flip vertically the 'left' selection handle - mDecorator->FlipHandleVertically( LEFT_SELECTION_HANDLE, true ); + mDecorator->FlipHandleVertically(LEFT_SELECTION_HANDLE, true); // 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, &TextField::OnSceneConnect ); + self.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH); + self.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::HEIGHT); + self.OnSceneSignal().Connect(this, &TextField::OnSceneConnect); - DevelControl::SetInputMethodContext( *this, mInputMethodContext ); + DevelControl::SetInputMethodContext(*this, mInputMethodContext); - if( Dali::Toolkit::TextField::EXCEED_POLICY_CLIP == mExceedPolicy ) + if(Dali::Toolkit::TextField::EXCEED_POLICY_CLIP == mExceedPolicy) { EnableClipping(); } } -void TextField::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change ) +void TextField::OnStyleChange(Toolkit::StyleManager styleManager, StyleChange::Type change) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextField::OnStyleChange\n"); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField::OnStyleChange\n"); - switch ( change ) + switch(change) { case StyleChange::DEFAULT_FONT_CHANGE: { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextField::OnStyleChange DEFAULT_FONT_CHANGE\n"); - const std::string& newFont = GetImpl( styleManager ).GetDefaultFontFamily(); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField::OnStyleChange DEFAULT_FONT_CHANGE\n"); + const std::string& newFont = GetImpl(styleManager).GetDefaultFontFamily(); // Property system did not set the font so should update it. - mController->UpdateAfterFontChange( newFont ); + 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; } @@ -1275,142 +1270,149 @@ void TextField::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange:: } // Up call to Control - Control::OnStyleChange( styleManager, change ); + Control::OnStyleChange(styleManager, change); } Vector3 TextField::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 TextField::GetHeightForWidth( float width ) +float TextField::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 TextField::OnRelayout( const Vector2& size, RelayoutContainer& container ) +void TextField::OnRelayout(const Vector2& size, RelayoutContainer& container) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextField OnRelayout\n"); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField 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)); } - if( mActiveLayer ) + if(mActiveLayer) { - mActiveLayer.SetProperty( Actor::Property::POSITION, Vector2( padding.start, padding.top )); + mActiveLayer.SetProperty(Actor::Property::POSITION, Vector2(padding.start, padding.top)); } - const Text::Controller::UpdateTextType updateTextType = mController->Relayout( contentSize, layoutDirection ); + const Text::Controller::UpdateTextType updateTextType = mController->Relayout(contentSize, layoutDirection); - if( ( Text::Controller::NONE_UPDATED != updateTextType ) || - !mRenderer ) + if((Text::Controller::NONE_UPDATED != updateTextType) || + !mRenderer) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextField::OnRelayout %p Displaying new contents\n", mController.Get() ); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField::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(size); } - if( !mRenderer ) + if(!mRenderer) { - mRenderer = Backend::Get().NewRenderer( mRenderingBackend ); + mRenderer = Backend::Get().NewRenderer(mRenderingBackend); } - RenderText( updateTextType ); + RenderText(updateTextType); + // If there is text changed, callback is called. + if(mTextChanged) + { + Dali::Toolkit::TextField handle(GetOwner()); + mTextChangedSignal.Emit(handle); + mTextChanged = false; + } } // The text-field 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-field 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, &TextField::OnIdleSignal ); - adaptor.AddIdle( mIdleCallback, false ); + mIdleCallback = MakeCallback(this, &TextField::OnIdleSignal); + adaptor.AddIdle(mIdleCallback, false); } } } } -void TextField::RenderText( Text::Controller::UpdateTextType updateTextType ) +void TextField::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::TextField handle = Dali::Toolkit::TextField( GetOwner() ); + Dali::Toolkit::TextField handle = Dali::Toolkit::TextField(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( mBackgroundActor ); - UnparentAndReset( mRenderableActor ); + UnparentAndReset(mBackgroundActor); + UnparentAndReset(mRenderableActor); mRenderableActor = renderableActor; - if ( mRenderableActor ) + if(mRenderableActor) { mBackgroundActor = mController->CreateBackgroundActor(); } } } - if( mRenderableActor ) + if(mRenderableActor) { const Vector2& scrollOffset = mController->GetTextModel()->GetScrollPosition(); float renderableActorPositionX, renderableActorPositionY; - if( mStencil ) + if(mStencil) { renderableActorPositionX = scrollOffset.x + mAlignmentOffset; renderableActorPositionY = scrollOffset.y; @@ -1418,55 +1420,55 @@ void TextField::RenderText( Text::Controller::UpdateTextType updateTextType ) else { Extents padding; - padding = Self().GetProperty( Toolkit::Control::Property::PADDING ); + padding = Self().GetProperty(Toolkit::Control::Property::PADDING); // Support Right-To-Left of padding - Dali::LayoutDirection::Type layoutDirection = static_cast( Self().GetProperty( Dali::Actor::Property::LAYOUT_DIRECTION ).Get() ); - if( Dali::LayoutDirection::RIGHT_TO_LEFT == layoutDirection ) + Dali::LayoutDirection::Type layoutDirection = static_cast(Self().GetProperty(Dali::Actor::Property::LAYOUT_DIRECTION).Get()); + if(Dali::LayoutDirection::RIGHT_TO_LEFT == layoutDirection) { - std::swap( padding.start, padding.end ); + std::swap(padding.start, padding.end); } renderableActorPositionX = scrollOffset.x + mAlignmentOffset + padding.start; renderableActorPositionY = scrollOffset.y + padding.top; } - mRenderableActor.SetProperty( Actor::Property::POSITION, Vector2( renderableActorPositionX, renderableActorPositionY )); + mRenderableActor.SetProperty(Actor::Property::POSITION, Vector2(renderableActorPositionX, renderableActorPositionY)); // Make sure the actors are parented correctly with/without clipping Actor self = mStencil ? mStencil : Self(); Actor highlightActor; - for( std::vector::iterator it = mClippingDecorationActors.begin(), - endIt = mClippingDecorationActors.end(); - it != endIt; - ++it ) + for(std::vector::iterator it = mClippingDecorationActors.begin(), + endIt = mClippingDecorationActors.end(); + it != endIt; + ++it) { - self.Add( *it ); + self.Add(*it); it->LowerToBottom(); - if ( it->GetProperty< std::string >( Dali::Actor::Property::NAME ) == "HighlightActor" ) + if(it->GetProperty(Dali::Actor::Property::NAME) == "HighlightActor") { highlightActor = *it; } } mClippingDecorationActors.clear(); - self.Add( mRenderableActor ); + self.Add(mRenderableActor); - if ( mBackgroundActor ) + if(mBackgroundActor) { - if ( mDecorator && mDecorator->IsHighlightVisible() ) + if(mDecorator && mDecorator->IsHighlightVisible()) { - self.Add( mBackgroundActor ); - mBackgroundActor.SetProperty( Actor::Property::POSITION, Vector2( renderableActorPositionX, renderableActorPositionY) ); // In text field's coords. - mBackgroundActor.LowerBelow( highlightActor ); + self.Add(mBackgroundActor); + mBackgroundActor.SetProperty(Actor::Property::POSITION, Vector2(renderableActorPositionX, renderableActorPositionY)); // In text field's coords. + mBackgroundActor.LowerBelow(highlightActor); } else { - mRenderableActor.Add( mBackgroundActor ); - mBackgroundActor.SetProperty( Actor::Property::POSITION, Vector2( 0.0f, 0.0f ) ); // In renderable actor's coords. + mRenderableActor.Add(mBackgroundActor); + mBackgroundActor.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 0.0f)); // In renderable actor's coords. mBackgroundActor.LowerToBottom(); } } @@ -1475,132 +1477,131 @@ void TextField::RenderText( Text::Controller::UpdateTextType updateTextType ) void TextField::OnKeyInputFocusGained() { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextField::OnKeyInputFocusGained %p\n", mController.Get() ); - if( mInputMethodContext && IsEditable() ) + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField::OnKeyInputFocusGained %p\n", mController.Get()); + if(mInputMethodContext && IsEditable()) { - mInputMethodContext.ApplyOptions( mInputMethodOptions ); + mInputMethodContext.ApplyOptions(mInputMethodOptions); - mInputMethodContext.StatusChangedSignal().Connect( this, &TextField::KeyboardStatusChanged ); + mInputMethodContext.StatusChangedSignal().Connect(this, &TextField::KeyboardStatusChanged); - mInputMethodContext.EventReceivedSignal().Connect( this, &TextField::OnInputMethodContextEvent ); + mInputMethodContext.EventReceivedSignal().Connect(this, &TextField::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() ); - if( notifier ) + ClipboardEventNotifier notifier(ClipboardEventNotifier::Get()); + if(notifier) { - notifier.ContentSelectedSignal().Connect( this, &TextField::OnClipboardTextSelected ); + notifier.ContentSelectedSignal().Connect(this, &TextField::OnClipboardTextSelected); } - Toolkit::Control control = Toolkit::Control::DownCast( Self() ); - Internal::Control& controlImpl = GetImplementation( control ); - Internal::Control::Impl& controlDataImpl = Internal::Control::Impl::Get( controlImpl ); - bool enableAutofill = controlDataImpl.IsAutofillEnabled(); - if( enableAutofill ) + Toolkit::Control control = Toolkit::Control::DownCast(Self()); + Internal::Control& controlImpl = GetImplementation(control); + Internal::Control::Impl& controlDataImpl = Internal::Control::Impl::Get(controlImpl); + bool enableAutofill = controlDataImpl.IsAutofillEnabled(); + if(enableAutofill) { Toolkit::AutofillContainer container = controlDataImpl.GetAutofillContainer(); - container.SetFocusedControl( control ); + container.SetFocusedControl(control); - Internal::AutofillContainer& containerImpl = GetImpl( container ); - Dali::AutofillGroup containerGroup = containerImpl.GetAutofillGroup(); - if( containerGroup != nullptr ) + Internal::AutofillContainer& containerImpl = GetImpl(container); + Dali::AutofillGroup containerGroup = containerImpl.GetAutofillGroup(); + if(containerGroup != nullptr) { containerGroup.RequestAuthentication(); } - } 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 TextField::OnKeyInputFocusLost() { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextField:OnKeyInputFocusLost %p\n", mController.Get() ); - if ( mInputMethodContext ) + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField:OnKeyInputFocusLost %p\n", mController.Get()); + if(mInputMethodContext) { - mInputMethodContext.StatusChangedSignal().Disconnect( this, &TextField::KeyboardStatusChanged ); + mInputMethodContext.StatusChangedSignal().Disconnect(this, &TextField::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, &TextField::OnInputMethodContextEvent ); + mInputMethodContext.EventReceivedSignal().Disconnect(this, &TextField::OnInputMethodContextEvent); } - ClipboardEventNotifier notifier( ClipboardEventNotifier::Get() ); + ClipboardEventNotifier notifier(ClipboardEventNotifier::Get()); - if ( notifier ) + if(notifier) { - notifier.ContentSelectedSignal().Disconnect( this, &TextField::OnClipboardTextSelected ); + notifier.ContentSelectedSignal().Disconnect(this, &TextField::OnClipboardTextSelected); } mController->KeyboardFocusLostEvent(); - EmitKeyInputFocusSignal( false ); // Calls back into the Control hence done last. + EmitKeyInputFocusSignal(false); // Calls back into the Control hence done last. } -void TextField::OnTap( const TapGesture& gesture ) +void TextField::OnTap(const TapGesture& gesture) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextField::OnTap %p\n", mController.Get() ); - if ( mInputMethodContext && IsEditable() ) + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField::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); SetKeyInputFocus(); } -void TextField::OnPan( const PanGesture& gesture ) +void TextField::OnPan(const PanGesture& gesture) { - mController->PanEvent( gesture.GetState(), gesture.GetDisplacement() ); + mController->PanEvent(gesture.GetState(), gesture.GetDisplacement()); } -void TextField::OnLongPress( const LongPressGesture& gesture ) +void TextField::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 TextField::OnKeyEvent( const KeyEvent& event ) +bool TextField::OnKeyEvent(const KeyEvent& event) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextField::OnKeyEvent %p keyCode %d\n", mController.Get(), event.GetKeyCode() ); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField::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(); } return true; } - else if( Dali::DevelKey::DALI_KEY_RETURN == event.GetKeyCode() ) + else if(Dali::DevelKey::DALI_KEY_RETURN == event.GetKeyCode()) { // Do nothing when enter is comming. return false; } - return mController->KeyEvent( event ); + return mController->KeyEvent(event); } void TextField::RequestTextRelayout() @@ -1613,10 +1614,10 @@ bool TextField::IsEditable() const return mController->IsEditable(); } -void TextField::SetEditable( bool editable ) +void TextField::SetEditable(bool editable) { mController->SetEditable(editable); - if ( mInputMethodContext && !editable ) + if(mInputMethodContext && !editable) { mInputMethodContext.Deactivate(); } @@ -1624,89 +1625,88 @@ void TextField::SetEditable( bool editable ) void TextField::TextChanged() { - Dali::Toolkit::TextField handle( GetOwner() ); - mTextChangedSignal.Emit( handle ); + mTextChanged = true; } void TextField::MaxLengthReached() { - Dali::Toolkit::TextField handle( GetOwner() ); - mMaxLengthReachedSignal.Emit( handle ); + Dali::Toolkit::TextField handle(GetOwner()); + mMaxLengthReachedSignal.Emit(handle); } -void TextField::InputStyleChanged( Text::InputStyle::Mask inputStyleMask ) +void TextField::InputStyleChanged(Text::InputStyle::Mask inputStyleMask) { - Dali::Toolkit::TextField handle( GetOwner() ); + Dali::Toolkit::TextField handle(GetOwner()); Toolkit::TextField::InputStyle::Mask fieldInputStyleMask = Toolkit::TextField::InputStyle::NONE; - if( InputStyle::NONE != static_cast( inputStyleMask & InputStyle::INPUT_COLOR ) ) + if(InputStyle::NONE != static_cast(inputStyleMask & InputStyle::INPUT_COLOR)) { - fieldInputStyleMask = static_cast( fieldInputStyleMask | Toolkit::TextField::InputStyle::COLOR ); + fieldInputStyleMask = static_cast(fieldInputStyleMask | Toolkit::TextField::InputStyle::COLOR); } - if( InputStyle::NONE != static_cast( inputStyleMask & InputStyle::INPUT_FONT_FAMILY ) ) + if(InputStyle::NONE != static_cast(inputStyleMask & InputStyle::INPUT_FONT_FAMILY)) { - fieldInputStyleMask = static_cast( fieldInputStyleMask | Toolkit::TextField::InputStyle::FONT_FAMILY ); + fieldInputStyleMask = static_cast(fieldInputStyleMask | Toolkit::TextField::InputStyle::FONT_FAMILY); } - if( InputStyle::NONE != static_cast( inputStyleMask & InputStyle::INPUT_POINT_SIZE ) ) + if(InputStyle::NONE != static_cast(inputStyleMask & InputStyle::INPUT_POINT_SIZE)) { - fieldInputStyleMask = static_cast( fieldInputStyleMask | Toolkit::TextField::InputStyle::POINT_SIZE ); + fieldInputStyleMask = static_cast(fieldInputStyleMask | Toolkit::TextField::InputStyle::POINT_SIZE); } - if( InputStyle::NONE != static_cast( inputStyleMask & InputStyle::INPUT_FONT_WEIGHT ) ) + if(InputStyle::NONE != static_cast(inputStyleMask & InputStyle::INPUT_FONT_WEIGHT)) { - fieldInputStyleMask = static_cast( fieldInputStyleMask | Toolkit::TextField::InputStyle::FONT_STYLE ); + fieldInputStyleMask = static_cast(fieldInputStyleMask | Toolkit::TextField::InputStyle::FONT_STYLE); } - if( InputStyle::NONE != static_cast( inputStyleMask & InputStyle::INPUT_FONT_WIDTH ) ) + if(InputStyle::NONE != static_cast(inputStyleMask & InputStyle::INPUT_FONT_WIDTH)) { - fieldInputStyleMask = static_cast( fieldInputStyleMask | Toolkit::TextField::InputStyle::FONT_STYLE ); + fieldInputStyleMask = static_cast(fieldInputStyleMask | Toolkit::TextField::InputStyle::FONT_STYLE); } - if( InputStyle::NONE != static_cast( inputStyleMask & InputStyle::INPUT_FONT_SLANT ) ) + if(InputStyle::NONE != static_cast(inputStyleMask & InputStyle::INPUT_FONT_SLANT)) { - fieldInputStyleMask = static_cast( fieldInputStyleMask | Toolkit::TextField::InputStyle::FONT_STYLE ); + fieldInputStyleMask = static_cast(fieldInputStyleMask | Toolkit::TextField::InputStyle::FONT_STYLE); } - if( InputStyle::NONE != static_cast( inputStyleMask & InputStyle::INPUT_UNDERLINE ) ) + if(InputStyle::NONE != static_cast(inputStyleMask & InputStyle::INPUT_UNDERLINE)) { - fieldInputStyleMask = static_cast( fieldInputStyleMask | Toolkit::TextField::InputStyle::UNDERLINE ); + fieldInputStyleMask = static_cast(fieldInputStyleMask | Toolkit::TextField::InputStyle::UNDERLINE); } - if( InputStyle::NONE != static_cast( inputStyleMask & InputStyle::INPUT_SHADOW ) ) + if(InputStyle::NONE != static_cast(inputStyleMask & InputStyle::INPUT_SHADOW)) { - fieldInputStyleMask = static_cast( fieldInputStyleMask | Toolkit::TextField::InputStyle::SHADOW ); + fieldInputStyleMask = static_cast(fieldInputStyleMask | Toolkit::TextField::InputStyle::SHADOW); } - if( InputStyle::NONE != static_cast( inputStyleMask & InputStyle::INPUT_EMBOSS ) ) + if(InputStyle::NONE != static_cast(inputStyleMask & InputStyle::INPUT_EMBOSS)) { - fieldInputStyleMask = static_cast( fieldInputStyleMask | Toolkit::TextField::InputStyle::EMBOSS ); + fieldInputStyleMask = static_cast(fieldInputStyleMask | Toolkit::TextField::InputStyle::EMBOSS); } - if( InputStyle::NONE != static_cast( inputStyleMask & InputStyle::INPUT_OUTLINE ) ) + if(InputStyle::NONE != static_cast(inputStyleMask & InputStyle::INPUT_OUTLINE)) { - fieldInputStyleMask = static_cast( fieldInputStyleMask | Toolkit::TextField::InputStyle::OUTLINE ); + fieldInputStyleMask = static_cast(fieldInputStyleMask | Toolkit::TextField::InputStyle::OUTLINE); } - mInputStyleChangedSignal.Emit( handle, fieldInputStyleMask ); + mInputStyleChangedSignal.Emit(handle, fieldInputStyleMask); } -void TextField::AddDecoration( Actor& actor, bool needsClipping ) +void TextField::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 TextField::OnSceneConnect( Dali::Actor actor ) +void TextField::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 { @@ -1714,55 +1714,54 @@ void TextField::OnSceneConnect( Dali::Actor actor ) } } -InputMethodContext::CallbackData TextField::OnInputMethodContextEvent( Dali::InputMethodContext& inputMethodContext, const InputMethodContext::EventData& inputMethodContextEvent ) +InputMethodContext::CallbackData TextField::OnInputMethodContextEvent(Dali::InputMethodContext& inputMethodContext, const InputMethodContext::EventData& inputMethodContextEvent) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextField::OnInputMethodContextEvent %p eventName %d\n", mController.Get(), inputMethodContextEvent.eventName ); - return mController->OnInputMethodContextEvent( inputMethodContext, inputMethodContextEvent ); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField::OnInputMethodContextEvent %p eventName %d\n", mController.Get(), inputMethodContextEvent.eventName); + return mController->OnInputMethodContextEvent(inputMethodContext, inputMethodContextEvent); } -void TextField::GetHandleImagePropertyValue( Property::Value& value, Text::HandleType handleType, Text::HandleImageType handleImageType ) +void TextField::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 TextField::EnableClipping() { - if( !mStencil ) + if(!mStencil) { // 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); } } -void TextField::OnClipboardTextSelected( ClipboardEventNotifier& clipboard ) +void TextField::OnClipboardTextSelected(ClipboardEventNotifier& clipboard) { mController->PasteClipboardItemEvent(); } void TextField::KeyboardStatusChanged(bool keyboardShown) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextField::KeyboardStatusChanged %p keyboardShown %d\n", mController.Get(), keyboardShown ); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField::KeyboardStatusChanged %p keyboardShown %d\n", mController.Get(), keyboardShown); // Just hide the grab handle when keyboard is hidden. - if (!keyboardShown ) + if(!keyboardShown) { mController->KeyboardFocusLostEvent(); } @@ -1772,18 +1771,18 @@ void TextField::KeyboardStatusChanged(bool keyboardShown) } } -void TextField::OnSceneConnection( int depth ) +void TextField::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 TextField::OnTouched( Actor actor, const TouchEvent& touch ) +bool TextField::OnTouched(Actor actor, const TouchEvent& touch) { return false; } @@ -1798,22 +1797,23 @@ void TextField::OnIdleSignal() } TextField::TextField() -: Control( ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ), - mIdleCallback( NULL ), - mAlignmentOffset( 0.f ), - mRenderingBackend( DEFAULT_RENDERING_BACKEND ), - mExceedPolicy( Dali::Toolkit::TextField::EXCEED_POLICY_CLIP ), - mHasBeenStaged( false ) +: Control(ControlBehaviour(CONTROL_BEHAVIOUR_DEFAULT)), + mIdleCallback(NULL), + mAlignmentOffset(0.f), + mRenderingBackend(DEFAULT_RENDERING_BACKEND), + mExceedPolicy(Dali::Toolkit::TextField::EXCEED_POLICY_CLIP), + mHasBeenStaged(false), + mTextChanged(false) { } TextField::~TextField() { - UnparentAndReset( mStencil ); + UnparentAndReset(mStencil); - if( ( NULL != mIdleCallback ) && Adaptor::IsAvailable() ) + if((NULL != mIdleCallback) && Adaptor::IsAvailable()) { - Adaptor::Get().RemoveIdle( mIdleCallback ); + Adaptor::Get().RemoveIdle(mIdleCallback); } } diff --git a/dali-toolkit/internal/controls/text-controls/text-field-impl.h b/dali-toolkit/internal/controls/text-controls/text-field-impl.h old mode 100755 new mode 100644 index 4eb609c..4ed876e --- a/dali-toolkit/internal/controls/text-controls/text-field-impl.h +++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_TEXT_FIELD_H /* - * 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,26 +19,24 @@ */ // EXTERNAL INCLUDES +#include #include #include -#include // INTERNAL INCLUDES -#include -#include #include +#include #include +#include #include #include -#include -#include +#include +#include namespace Dali { - namespace Toolkit { - namespace Internal { /** @@ -47,7 +45,6 @@ namespace Internal class TextField : public Control, public Text::ControlInterface, public Text::EditableControlInterface, public Text::SelectableControlInterface { public: - /** * @copydoc Dali::Toollkit::TextField::New() */ @@ -62,7 +59,7 @@ public: * @param[in] index The property index. * @param[in] value The new property value. */ - static void SetProperty( BaseObject* object, Property::Index index, const Property::Value& value ); + static void SetProperty(BaseObject* object, Property::Index index, const Property::Value& value); /** * @brief Called to retrieve a property of an object of this type. @@ -71,7 +68,7 @@ public: * @param[in] index The property index. * @return The current value of the property. */ - static Property::Value GetProperty( BaseObject* object, Property::Index index ); + static Property::Value GetProperty(BaseObject* object, Property::Index index); /** * @copydoc Dali::Toollkit::TextField::GetInputMethodContext() @@ -87,17 +84,17 @@ public: * @return True if the signal was connected. * @post If a signal was connected, ownership of functor was passed to CallbackBase. Otherwise the caller is responsible for deleting the unused functor. */ - static bool DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor ); + static bool DoConnectSignal(BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor); /** * @copydoc TextField::TextChangedSignal() */ - Toolkit::TextField::TextChangedSignalType& TextChangedSignal(); + Toolkit::TextField::TextChangedSignalType& TextChangedSignal(); /** * @copydoc TextField::MaxLengthReachedSignal() */ - Toolkit::TextField::MaxLengthReachedSignalType& MaxLengthReachedSignal(); + Toolkit::TextField::MaxLengthReachedSignalType& MaxLengthReachedSignal(); /** * @copydoc TextField::TextChangedSignal() @@ -105,7 +102,6 @@ public: Toolkit::TextField::InputStyleChangedSignalType& InputStyleChangedSignal(); private: // From Control - /** * @copydoc Control::OnInitialize() */ @@ -114,7 +110,7 @@ private: // From Control /** * @copydoc Control::OnStyleChange() */ - void OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change ) override; + void OnStyleChange(Toolkit::StyleManager styleManager, StyleChange::Type change) override; /** * @copydoc Control::GetNaturalSize() @@ -124,12 +120,12 @@ private: // From Control /** * @copydoc Control::GetHeightForWidth() */ - float GetHeightForWidth( float width ) override; + float GetHeightForWidth(float width) override; /** * @copydoc Control::OnInitialize() */ - void OnRelayout( const Vector2& size, RelayoutContainer& container ) override; + void OnRelayout(const Vector2& size, RelayoutContainer& container) override; /** * @copydoc Control::OnKeyInputFocusGained() @@ -144,36 +140,36 @@ private: // From Control /** * @copydoc Control::OnTap() */ - void OnTap( const TapGesture& tap ) override; + void OnTap(const TapGesture& tap) override; /** * @copydoc Control::OnPan() */ - void OnPan( const PanGesture& gesture ) override; + void OnPan(const PanGesture& gesture) override; /** * @copydoc Control::OnLongPress() */ - void OnLongPress( const LongPressGesture& gesture ) override; + void OnLongPress(const LongPressGesture& gesture) override; /** * @copydoc Control::OnSceneConnection() */ - void OnSceneConnection( int depth ) override; + void OnSceneConnection(int depth) override; /** * @copydoc Dali::CustomActorImpl::OnKeyEvent(const KeyEvent&) */ bool OnKeyEvent(const KeyEvent& event) override; -// From ControlInterface + // From ControlInterface /** * @copydoc Text::ControlInterface::RequestTextRelayout() */ void RequestTextRelayout() override; -// From EditableControlInterface + // From EditableControlInterface /** * @copydoc Text::EditableControlInterface::TextChanged() @@ -188,19 +184,19 @@ private: // From Control /** * @copydoc Text::EditableControlInterface::InputStyleChanged() */ - void InputStyleChanged( Text::InputStyle::Mask inputStyleMask ) override; + void InputStyleChanged(Text::InputStyle::Mask inputStyleMask) override; /** * @copydoc Text::EditableControlInterface::AddDecoration() */ - void AddDecoration( Actor& actor, bool needsClipping ) override; + void AddDecoration(Actor& actor, bool needsClipping) override; -// From SelectableControlInterface + // From SelectableControlInterface public: /** * @copydoc Text::SelectableControlInterface::SetTextSelectionRange() */ - void SetTextSelectionRange(const uint32_t *start, const uint32_t *end) override; + void SetTextSelectionRange(const uint32_t* start, const uint32_t* end) override; /** * @copydoc Text::SelectableControlInterface::GetTextSelectionRange() @@ -230,20 +226,19 @@ public: /** * @copydoc Text::EditableControlInterface::SetEditable() */ - void SetEditable( bool editable ) override; + void SetEditable(bool editable) override; private: // Implementation - /** * @copydoc Dali::Toolkit::Text::Controller::(InputMethodContext& inputMethodContext, const InputMethodContext::EventData& inputMethodContextEvent) */ - InputMethodContext::CallbackData OnInputMethodContextEvent( InputMethodContext& inputMethodContext, const InputMethodContext::EventData& inputMethodContextEvent ); + InputMethodContext::CallbackData OnInputMethodContextEvent(InputMethodContext& inputMethodContext, const InputMethodContext::EventData& inputMethodContextEvent); /** * @brief Callback when Clipboard signals an item should be pasted * @param[in] clipboard handle to Clipboard Event Notifier */ - void OnClipboardTextSelected( ClipboardEventNotifier& clipboard ); + void OnClipboardTextSelected(ClipboardEventNotifier& clipboard); /** * @brief Get a Property Map for the image used for the required Handle Image @@ -251,7 +246,7 @@ private: // Implementation * @param[in] handleType the type of handle * @param[in] handleImageType the type of image for the given handleType */ - void GetHandleImagePropertyValue( Property::Value& value, Text::HandleType handleType, Text::HandleImageType handleImageType ); + void GetHandleImagePropertyValue(Property::Value& value, Text::HandleType handleType, Text::HandleImageType handleImageType); /** * @brief Enable or disable clipping. @@ -263,7 +258,7 @@ private: // Implementation * * @param[in] keyboardShown True if keyboard is shown. */ - void KeyboardStatusChanged( bool keyboardShown ); + void KeyboardStatusChanged(bool keyboardShown); /** * @brief Callback when TextField is touched @@ -271,7 +266,7 @@ private: // Implementation * @param[in] actor TextField touched * @param[in] touch Touch information */ - bool OnTouched( Actor actor, const TouchEvent& touch ); + bool OnTouched(Actor actor, const TouchEvent& touch); /** * @brief Callbacks called on idle. @@ -297,47 +292,49 @@ private: // Implementation /** * @brief Render view, create and attach actor(s) to this Text Field. */ - void RenderText( Text::Controller::UpdateTextType updateTextType ); + void RenderText(Text::Controller::UpdateTextType updateTextType); // Connection needed to re-render text, when a Text Field returns to the scene. - void OnSceneConnect( Dali::Actor actor ); + void OnSceneConnect(Dali::Actor actor); public: // For UTC only - - Text::ControllerPtr GetTextController() { return mController; } + Text::ControllerPtr GetTextController() + { + return mController; + } private: // Data - // Signals - Toolkit::TextField::TextChangedSignalType mTextChangedSignal; - Toolkit::TextField::MaxLengthReachedSignalType mMaxLengthReachedSignal; + Toolkit::TextField::TextChangedSignalType mTextChangedSignal; + Toolkit::TextField::MaxLengthReachedSignalType mMaxLengthReachedSignal; Toolkit::TextField::InputStyleChangedSignalType mInputStyleChangedSignal; - InputMethodContext mInputMethodContext; - Text::ControllerPtr mController; - Text::RendererPtr mRenderer; - Text::DecoratorPtr mDecorator; - Toolkit::Control mStencil; ///< For EXCEED_POLICY_CLIP - std::vector mClippingDecorationActors; ///< Decoration actors which need clipping. + InputMethodContext mInputMethodContext; + Text::ControllerPtr mController; + Text::RendererPtr mRenderer; + Text::DecoratorPtr mDecorator; + Toolkit::Control mStencil; ///< For EXCEED_POLICY_CLIP + std::vector mClippingDecorationActors; ///< Decoration actors which need clipping. Dali::InputMethodOptions mInputMethodOptions; - Dali::AutofillItem mAutofillItem; + Dali::AutofillItem mAutofillItem; - Actor mRenderableActor; - Actor mActiveLayer; - Actor mBackgroundActor; + Actor mRenderableActor; + Actor mActiveLayer; + Actor mBackgroundActor; CallbackBase* mIdleCallback; float mAlignmentOffset; - int mRenderingBackend; - int mExceedPolicy; - bool mHasBeenStaged:1; + int mRenderingBackend; + int mExceedPolicy; + bool mHasBeenStaged : 1; + bool mTextChanged : 1; }; } // namespace Internal // Helpers for public-api forwarding methods -inline Toolkit::Internal::TextField& GetImpl( Toolkit::TextField& textField ) +inline Toolkit::Internal::TextField& GetImpl(Toolkit::TextField& textField) { DALI_ASSERT_ALWAYS(textField); @@ -346,7 +343,7 @@ inline Toolkit::Internal::TextField& GetImpl( Toolkit::TextField& textField ) return static_cast(handle); } -inline const Toolkit::Internal::TextField& GetImpl( const Toolkit::TextField& textField ) +inline const Toolkit::Internal::TextField& GetImpl(const Toolkit::TextField& textField) { DALI_ASSERT_ALWAYS(textField);