X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Ftext-controls%2Ftext-editor-impl.cpp;h=e4f245d634ab5e130eeaad85f67b113b7396d633;hp=77005c0d751420c02f92cd4a0f9d91ae1ed59df1;hb=781bcb1f3697b58f1da3f662b033345814dd903a;hpb=8aebf59068ab407648c303efb0e593ce8305d699 diff --git a/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp old mode 100644 new mode 100755 index 77005c0..e4f245d --- 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) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 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. @@ -32,16 +32,19 @@ // INTERNAL INCLUDES #include +#include #include #include #include #include -#include +#include +#include #include #include #include #include #include +#include using namespace Dali::Toolkit::Text; @@ -67,23 +70,6 @@ const float DEFAULT_SCROLL_SPEED = 1200.f; ///< The default scroll speed for the namespace { - -const Scripting::StringEnum HORIZONTAL_ALIGNMENT_STRING_TABLE[] = -{ - { "BEGIN", Toolkit::Text::Layout::HORIZONTAL_ALIGN_BEGIN }, - { "CENTER", Toolkit::Text::Layout::HORIZONTAL_ALIGN_CENTER }, - { "END", Toolkit::Text::Layout::HORIZONTAL_ALIGN_END }, -}; -const unsigned int HORIZONTAL_ALIGNMENT_STRING_TABLE_COUNT = sizeof( HORIZONTAL_ALIGNMENT_STRING_TABLE ) / sizeof( HORIZONTAL_ALIGNMENT_STRING_TABLE[0] ); - - -const Scripting::StringEnum LINE_WRAP_MODE_STRING_TABLE[] = -{ - { "WORD", Toolkit::Text::Layout::LineWrap::WORD }, - { "CHARACTER", Toolkit::Text::Layout::LineWrap::CHARACTER } -}; -const unsigned int LINE_WRAP_MODE_STRING_TABLE_COUNT = sizeof( LINE_WRAP_MODE_STRING_TABLE ) / sizeof( LINE_WRAP_MODE_STRING_TABLE[0] ); - const char* const SCROLL_BAR_POSITION("sourcePosition"); const char* const SCROLL_BAR_POSITION_MIN("sourcePositionMin"); const char* const SCROLL_BAR_POSITION_MAX("sourcePositionMax"); @@ -138,18 +124,21 @@ DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "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_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextEditor, "smoothScroll", BOOLEAN, SMOOTH_SCROLL ) -DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextEditor, "smoothScrollDuration", FLOAT, SMOOTH_SCROLL_DURATION ) -DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextEditor, "enableScrollBar", BOOLEAN, ENABLE_SCROLL_BAR ) -DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextEditor, "scrollBarShowDuration", FLOAT, SCROLL_BAR_SHOW_DURATION ) -DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextEditor, "scrollBarFadeDuration", FLOAT, SCROLL_BAR_FADE_DURATION ) -DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextEditor, "pixelSize", FLOAT, PIXEL_SIZE ) -DALI_DEVEL_PROPERTY_REGISTRATION_READ_ONLY( Toolkit, TextEditor, "lineCount", INTEGER, LINE_COUNT ) +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, "enableSelection", BOOLEAN, ENABLE_SELECTION ) -DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextEditor, "placeholder", MAP, PLACEHOLDER ) -DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextEditor, "lineWrapMode", STRING, LINE_WRAP_MODE ) +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_SIGNAL_REGISTRATION( Toolkit, TextEditor, "textChanged", SIGNAL_TEXT_CHANGED ) DALI_SIGNAL_REGISTRATION( Toolkit, TextEditor, "inputStyleChanged", SIGNAL_INPUT_STYLE_CHANGED ) @@ -259,15 +248,10 @@ void TextEditor::SetProperty( BaseObject* object, Property::Index index, const P { if( impl.mController ) { - const std::string& alignStr = value.Get< std::string >(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextEditor %p HORIZONTAL_ALIGNMENT %s\n", impl.mController.Get(), alignStr.c_str() ); - - Layout::HorizontalAlignment alignment( Layout::HORIZONTAL_ALIGN_BEGIN ); - if( Scripting::GetEnumeration< Layout::HorizontalAlignment >( alignStr.c_str(), - HORIZONTAL_ALIGNMENT_STRING_TABLE, - HORIZONTAL_ALIGNMENT_STRING_TABLE_COUNT, - 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 ) ) { + DALI_LOG_INFO( gLogFilter, Debug::General, "TextEditor %p HORIZONTAL_ALIGNMENT %d\n", impl.mController.Get(), alignment ); impl.mController->SetHorizontalAlignment( alignment ); } } @@ -530,8 +514,14 @@ void TextEditor::SetProperty( BaseObject* object, Property::Index index, const P { if( impl.mController ) { + + // The line spacing isn't supported by the TextEditor. Since it's supported + // 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.mController->SetDefaultLineSpacing( lineSpacing ); + impl.mLineSpacing = lineSpacing; + // set it to 0.0 due to missing implementation + impl.mController->SetDefaultLineSpacing( 0.0f ); impl.mRenderer.Reset(); } break; @@ -618,7 +608,7 @@ void TextEditor::SetProperty( BaseObject* object, Property::Index index, const P } break; } - case Toolkit::DevelTextEditor::Property::SMOOTH_SCROLL: + case Toolkit::TextEditor::Property::SMOOTH_SCROLL: { const bool enable = value.Get< bool >(); DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextEditor SMOOTH_SCROLL %d\n", enable ); @@ -626,7 +616,7 @@ void TextEditor::SetProperty( BaseObject* object, Property::Index index, const P impl.mScrollAnimationEnabled = enable; break; } - case Toolkit::DevelTextEditor::Property::SMOOTH_SCROLL_DURATION: + 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 ); @@ -638,7 +628,7 @@ void TextEditor::SetProperty( BaseObject* object, Property::Index index, const P } break; } - case Toolkit::DevelTextEditor::Property::ENABLE_SCROLL_BAR: + 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 ); @@ -646,7 +636,7 @@ void TextEditor::SetProperty( BaseObject* object, Property::Index index, const P impl.mScrollBarEnabled = enable; break; } - case Toolkit::DevelTextEditor::Property::SCROLL_BAR_SHOW_DURATION: + 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 ); @@ -654,7 +644,7 @@ void TextEditor::SetProperty( BaseObject* object, Property::Index index, const P impl.mAnimationPeriod.delaySeconds = duration; break; } - case Toolkit::DevelTextEditor::Property::SCROLL_BAR_FADE_DURATION: + 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 ); @@ -662,7 +652,7 @@ void TextEditor::SetProperty( BaseObject* object, Property::Index index, const P impl.mAnimationPeriod.durationSeconds = duration; break; } - case Toolkit::DevelTextEditor::Property::PIXEL_SIZE: + case Toolkit::TextEditor::Property::PIXEL_SIZE: { if( impl.mController ) { @@ -702,7 +692,7 @@ void TextEditor::SetProperty( BaseObject* object, Property::Index index, const P } break; } - case Toolkit::DevelTextEditor::Property::ENABLE_SELECTION: + case Toolkit::TextEditor::Property::ENABLE_SELECTION: { if( impl.mController ) { @@ -712,7 +702,7 @@ void TextEditor::SetProperty( BaseObject* object, Property::Index index, const P } break; } - case Toolkit::DevelTextEditor::Property::PLACEHOLDER: + case Toolkit::TextEditor::Property::PLACEHOLDER: { const Property::Map* map = value.GetMap(); if( map ) @@ -721,18 +711,46 @@ void TextEditor::SetProperty( BaseObject* object, Property::Index index, const P } break; } - case Toolkit::DevelTextEditor::Property::LINE_WRAP_MODE: + case Toolkit::TextEditor::Property::LINE_WRAP_MODE: + { + if( impl.mController ) + { + 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 ) ) + { + 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: + { + if( impl.mController ) + { + const bool shiftSelection = value.Get(); + DALI_LOG_INFO( gLogFilter, Debug::General, "TextEditor %p ENABLE_SHIFT_SELECTION %d\n", impl.mController.Get(), shiftSelection ); + + impl.mController->SetShiftSelectionEnabled( shiftSelection ); + } + break; + } + case Toolkit::DevelTextEditor::Property::ENABLE_GRAB_HANDLE: { - const std::string& wrapModeStr = value.Get< std::string >(); - DALI_LOG_INFO( gLogFilter, Debug::General, "TextEditor %p LINE_WRAP_MODE %s\n", impl.mController.Get(), wrapModeStr.c_str() ); + if( impl.mController ) + { + const bool grabHandleEnabled = value.Get(); + DALI_LOG_INFO( gLogFilter, Debug::General, "TextEditor %p ENABLE_GRAB_HANDLE %d\n", impl.mController.Get(), grabHandleEnabled ); - Layout::LineWrap::Mode lineWrapMode( Layout::LineWrap::WORD ); - if( Scripting::GetEnumeration< Layout::LineWrap::Mode >( wrapModeStr.c_str(), - LINE_WRAP_MODE_STRING_TABLE, - LINE_WRAP_MODE_STRING_TABLE_COUNT, - lineWrapMode ) ) + impl.mController->SetGrabHandleEnabled( grabHandleEnabled ); + } + break; + } + case Toolkit::DevelTextEditor::Property::MATCH_SYSTEM_LANGUAGE_DIRECTION: + { + if( impl.mController ) { - impl.mController->SetLineWrapMode( lineWrapMode ); + impl.mController->SetMatchSystemLanguageDirection(value.Get< bool >()); } break; } @@ -801,9 +819,7 @@ Property::Value TextEditor::GetProperty( BaseObject* object, Property::Index ind { if( impl.mController ) { - const char* name = Scripting::GetEnumerationName< Toolkit::Text::Layout::HorizontalAlignment >( impl.mController->GetHorizontalAlignment(), - HORIZONTAL_ALIGNMENT_STRING_TABLE, - HORIZONTAL_ALIGNMENT_STRING_TABLE_COUNT ); + const char* name = GetHorizontalAlignmentString( impl.mController->GetHorizontalAlignment() ); if( name ) { value = std::string( name ); @@ -985,7 +1001,9 @@ Property::Value TextEditor::GetProperty( BaseObject* object, Property::Index ind { if( impl.mController ) { - value = impl.mController->GetDefaultLineSpacing(); + // LINE_SPACING isn't implemented for the TextEditor. Returning + // only shadowed value, not the real one. + value = impl.mLineSpacing; } break; } @@ -1037,32 +1055,32 @@ Property::Value TextEditor::GetProperty( BaseObject* object, Property::Index ind GetOutlineProperties( impl.mController, value, Text::EffectStyle::INPUT ); break; } - case Toolkit::DevelTextEditor::Property::SMOOTH_SCROLL: + case Toolkit::TextEditor::Property::SMOOTH_SCROLL: { value = impl.mScrollAnimationEnabled; break; } - case Toolkit::DevelTextEditor::Property::SMOOTH_SCROLL_DURATION: + case Toolkit::TextEditor::Property::SMOOTH_SCROLL_DURATION: { value = impl.mScrollAnimationDuration; break; } - case Toolkit::DevelTextEditor::Property::ENABLE_SCROLL_BAR: + case Toolkit::TextEditor::Property::ENABLE_SCROLL_BAR: { value = impl.mScrollBarEnabled; break; } - case Toolkit::DevelTextEditor::Property::SCROLL_BAR_SHOW_DURATION: + case Toolkit::TextEditor::Property::SCROLL_BAR_SHOW_DURATION: { value = impl.mAnimationPeriod.delaySeconds; break; } - case Toolkit::DevelTextEditor::Property::SCROLL_BAR_FADE_DURATION: + case Toolkit::TextEditor::Property::SCROLL_BAR_FADE_DURATION: { value = impl.mAnimationPeriod.durationSeconds; break; } - case Toolkit::DevelTextEditor::Property::PIXEL_SIZE: + case Toolkit::TextEditor::Property::PIXEL_SIZE: { if( impl.mController ) { @@ -1070,7 +1088,7 @@ Property::Value TextEditor::GetProperty( BaseObject* object, Property::Index ind } break; } - case Toolkit::DevelTextEditor::Property::LINE_COUNT: + case Toolkit::TextEditor::Property::LINE_COUNT: { if( impl.mController ) { @@ -1097,7 +1115,7 @@ Property::Value TextEditor::GetProperty( BaseObject* object, Property::Index ind } break; } - case Toolkit::DevelTextEditor::Property::ENABLE_SELECTION: + case Toolkit::TextEditor::Property::ENABLE_SELECTION: { if( impl.mController ) { @@ -1105,19 +1123,44 @@ Property::Value TextEditor::GetProperty( BaseObject* object, Property::Index ind } break; } - case Toolkit::DevelTextEditor::Property::PLACEHOLDER: + case Toolkit::TextEditor::Property::PLACEHOLDER: { Property::Map map; impl.mController->GetPlaceholderProperty( map ); value = map; break; } - case Toolkit::DevelTextEditor::Property::LINE_WRAP_MODE: + case Toolkit::TextEditor::Property::LINE_WRAP_MODE: { if( impl.mController ) { value = impl.mController->GetLineWrapMode(); } + break; + } + case Toolkit::DevelTextEditor::Property::ENABLE_SHIFT_SELECTION: + { + if( impl.mController ) + { + value = impl.mController->IsShiftSelectionEnabled(); + } + break; + } + case Toolkit::DevelTextEditor::Property::ENABLE_GRAB_HANDLE: + { + if( impl.mController ) + { + value = impl.mController->IsGrabHandleEnabled(); + } + break; + } + case Toolkit::DevelTextEditor::Property::MATCH_SYSTEM_LANGUAGE_DIRECTION: + { + if( impl.mController ) + { + value = impl.mController->IsMatchSystemLanguageDirection(); + } + break; } } //switch } @@ -1125,6 +1168,11 @@ Property::Value TextEditor::GetProperty( BaseObject* object, Property::Index ind return value; } +InputMethodContext TextEditor::GetInputMethodContext() +{ + return mInputMethodContext; +} + bool TextEditor::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor ) { Dali::BaseHandle handle( object ); @@ -1159,7 +1207,7 @@ Toolkit::TextEditor::InputStyleChangedSignalType& TextEditor::InputStyleChangedS return mInputStyleChangedSignal; } -Toolkit::DevelTextEditor::ScrollStateChangedSignalType& TextEditor::ScrollStateChangedSignal() +Toolkit::TextEditor::ScrollStateChangedSignalType& TextEditor::ScrollStateChangedSignal() { return mScrollStateChangedSignal; } @@ -1173,10 +1221,12 @@ void TextEditor::OnInitialize() mDecorator = Text::Decorator::New( *mController, *mController ); + mInputMethodContext = InputMethodContext::New( self ); + mController->GetLayoutEngine().SetLayout( Layout::Engine::MULTI_LINE_BOX ); // Enables the text input. - mController->EnableTextInput( mDecorator ); + mController->EnableTextInput( mDecorator, mInputMethodContext ); // Enables the vertical scrolling after the text input has been enabled. mController->SetVerticalScrollEnabled( true ); @@ -1193,12 +1243,15 @@ void TextEditor::OnInitialize() 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 ); + // Forward input events to controller EnableGestureDetection( static_cast( Gesture::Tap | Gesture::Pan | Gesture::LongPress ) ); GetTapGestureDetector().SetMaximumTapsRequired( 2 ); - mImfManager = ImfManager::Get(); - self.TouchSignal().Connect( this, &TextEditor::OnTouched ); // Set BoundingBox to stage size if not already set. @@ -1222,6 +1275,8 @@ void TextEditor::OnInitialize() self.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::HEIGHT ); self.OnStageSignal().Connect( this, &TextEditor::OnStageConnect ); + DevelControl::SetInputMethodContext( *this, mInputMethodContext ); + // Creates an extra control to be used as stencil buffer. mStencil = Control::New(); mStencil.SetAnchorPoint( AnchorPoint::TOP_LEFT ); @@ -1229,11 +1284,11 @@ void TextEditor::OnInitialize() // 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, DevelVisual::COLOR ). + 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_CHILDREN ); + mStencil.SetProperty( Actor::Property::CLIPPING_MODE, ClippingMode::CLIP_TO_BOUNDING_BOX ); mStencil.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); self.Add( mStencil ); @@ -1274,13 +1329,20 @@ void TextEditor::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange: Vector3 TextEditor::GetNaturalSize() { - return mController->GetNaturalSize(); + Extents padding; + padding = Self().GetProperty( Toolkit::Control::Property::PADDING ); + + Vector3 naturalSize = mController->GetNaturalSize(); + naturalSize.width += ( padding.start + padding.end ); + naturalSize.height += ( padding.top + padding.bottom ); + + return naturalSize; } float TextEditor::GetHeightForWidth( float width ) { - Padding padding; - Self().GetPadding( padding ); + Extents padding; + padding = Self().GetProperty( Toolkit::Control::Property::PADDING ); return mController->GetHeightForWidth( width ) + padding.top + padding.bottom; } @@ -1289,22 +1351,29 @@ void TextEditor::OnRelayout( const Vector2& size, RelayoutContainer& container ) DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextEditor OnRelayout\n"); Actor self = Self(); - Padding padding; - self.GetPadding( padding ); - Vector2 contentSize( size.x - ( padding.left + padding.right ), size.y - ( padding.top + padding.bottom ) ); + Extents padding; + padding = self.GetProperty( Toolkit::Control::Property::PADDING ); + + Vector2 contentSize( size.x - ( padding.start + padding.end ), size.y - ( padding.top + padding.bottom ) ); + + // Support Right-To-Left of padding + Dali::LayoutDirection::Type layoutDirection = static_cast( self.GetProperty( Dali::Actor::Property::LAYOUT_DIRECTION ).Get() ); + if( Dali::LayoutDirection::RIGHT_TO_LEFT == layoutDirection ) + { + std::swap( padding.start, padding.end ); + } if( mStencil ) { - mStencil.SetPosition( padding.left , padding.top ); + mStencil.SetPosition( padding.start, padding.top ); } if( mActiveLayer ) { - mActiveLayer.SetPosition( padding.left , padding.top ); + mActiveLayer.SetPosition( padding.start, padding.top ); } - - const Text::Controller::UpdateTextType updateTextType = mController->Relayout( contentSize ); + const Text::Controller::UpdateTextType updateTextType = mController->Relayout( contentSize, layoutDirection ); if( ( Text::Controller::NONE_UPDATED != updateTextType ) || !mRenderer ) @@ -1340,7 +1409,7 @@ void TextEditor::OnRelayout( const Vector2& size, RelayoutContainer& container ) { // @note: The callback manager takes the ownership of the callback object. mIdleCallback = MakeCallback( this, &TextEditor::OnIdleSignal ); - adaptor.AddIdle( mIdleCallback ); + adaptor.AddIdle( mIdleCallback, false ); } } } @@ -1375,13 +1444,13 @@ void TextEditor::RenderText( Text::Controller::UpdateTextType updateTextType ) // Make sure the actors are parented correctly with/without clipping Actor self = mStencil ? mStencil : Self(); - for( std::vector::const_iterator it = mClippingDecorationActors.begin(), + for( std::vector::iterator it = mClippingDecorationActors.begin(), endIt = mClippingDecorationActors.end(); it != endIt; ++it ) { self.Add( *it ); - DevelActor::LowerToBottom( *it ); + it->LowerToBottom(); } mClippingDecorationActors.clear(); @@ -1395,23 +1464,24 @@ void TextEditor::RenderText( Text::Controller::UpdateTextType updateTextType ) void TextEditor::OnKeyInputFocusGained() { DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextEditor::OnKeyInputFocusGained %p\n", mController.Get() ); + if ( mInputMethodContext ) + { + mInputMethodContext.StatusChangedSignal().Connect( this, &TextEditor::KeyboardStatusChanged ); - mImfManager.StatusChangedSignal().Connect( this, &TextEditor::KeyboardStatusChanged ); - - mImfManager.EventReceivedSignal().Connect( this, &TextEditor::OnImfEvent ); - - // Notify that the text editing start. - mImfManager.Activate(); + mInputMethodContext.EventReceivedSignal().Connect( this, &TextEditor::OnInputMethodContextEvent ); - // When window gain lost focus, the imf manager is deactivated. Thus when window gain focus again, the imf manager must be activated. - mImfManager.SetRestoreAfterFocusLost( true ); + // Notify that the text editing start. + mInputMethodContext.Activate(); - ClipboardEventNotifier notifier( ClipboardEventNotifier::Get() ); + // When window gain lost focus, the InputMethodContext is deactivated. Thus when window gain focus again, the InputMethodContext must be activated. + mInputMethodContext.SetRestoreAfterFocusLost( true ); + } + ClipboardEventNotifier notifier( ClipboardEventNotifier::Get() ); - if ( notifier ) - { - notifier.ContentSelectedSignal().Connect( this, &TextEditor::OnClipboardTextSelected ); - } + if ( notifier ) + { + notifier.ContentSelectedSignal().Connect( this, &TextEditor::OnClipboardTextSelected ); + } mController->KeyboardFocusGainEvent(); // Called in the case of no virtual keyboard to trigger this event @@ -1421,17 +1491,18 @@ void TextEditor::OnKeyInputFocusGained() void TextEditor::OnKeyInputFocusLost() { DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextEditor:OnKeyInputFocusLost %p\n", mController.Get() ); + if ( mInputMethodContext ) + { + mInputMethodContext.StatusChangedSignal().Disconnect( this, &TextEditor::KeyboardStatusChanged ); - mImfManager.StatusChangedSignal().Disconnect( this, &TextEditor::KeyboardStatusChanged ); - - // The text editing is finished. Therefore the imf manager don't have restore activation. - mImfManager.SetRestoreAfterFocusLost( false ); - - // Notify that the text editing finish. - mImfManager.Deactivate(); + // The text editing is finished. Therefore the InputMethodContext don't have restore activation. + mInputMethodContext.SetRestoreAfterFocusLost( false ); - mImfManager.EventReceivedSignal().Disconnect( this, &TextEditor::OnImfEvent ); + // Notify that the text editing finish. + mInputMethodContext.Deactivate(); + mInputMethodContext.EventReceivedSignal().Disconnect( this, &TextEditor::OnInputMethodContextEvent ); + } ClipboardEventNotifier notifier( ClipboardEventNotifier::Get() ); if ( notifier ) @@ -1447,13 +1518,14 @@ void TextEditor::OnKeyInputFocusLost() void TextEditor::OnTap( const TapGesture& gesture ) { DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextEditor::OnTap %p\n", mController.Get() ); - - mImfManager.Activate(); - + if ( mInputMethodContext ) + { + mInputMethodContext.Activate(); + } // Deliver the tap before the focus event to controller; this allows us to detect when focus is gained due to tap-gestures - Padding padding; - Self().GetPadding( padding ); - mController->TapEvent( gesture.numberOfTaps, gesture.localPoint.x - padding.left, gesture.localPoint.y - padding.top ); + Extents padding; + padding = Self().GetProperty( Toolkit::Control::Property::PADDING ); + mController->TapEvent( gesture.numberOfTaps, gesture.localPoint.x - padding.start, gesture.localPoint.y - padding.top ); SetKeyInputFocus(); } @@ -1465,11 +1537,13 @@ void TextEditor::OnPan( const PanGesture& gesture ) void TextEditor::OnLongPress( const LongPressGesture& gesture ) { - mImfManager.Activate(); - - Padding padding; - Self().GetPadding( padding ); - mController->LongPressEvent( gesture.state, gesture.localPoint.x - padding.left, gesture.localPoint.y - padding.top ); + if ( mInputMethodContext ) + { + mInputMethodContext.Activate(); + } + Extents padding; + padding = Self().GetProperty( Toolkit::Control::Property::PADDING ); + mController->LongPressEvent( gesture.state, gesture.localPoint.x - padding.start, gesture.localPoint.y - padding.top ); SetKeyInputFocus(); } @@ -1647,7 +1721,7 @@ void TextEditor::UpdateScrollBar() { mScrollStarted = true; Dali::Toolkit::TextEditor handle( GetOwner() ); - mScrollStateChangedSignal.Emit( handle, DevelTextEditor::Scroll::STARTED ); + mScrollStateChangedSignal.Emit( handle, Toolkit::TextEditor::Scroll::STARTED ); } Actor indicator = mScrollBar.GetScrollIndicator(); @@ -1672,7 +1746,7 @@ void TextEditor::OnScrollIndicatorAnimationFinished( Animation& animation ) { mScrollStarted = false; Dali::Toolkit::TextEditor handle( GetOwner() ); - mScrollStateChangedSignal.Emit( handle, DevelTextEditor::Scroll::FINISHED ); + mScrollStateChangedSignal.Emit( handle, Toolkit::TextEditor::Scroll::FINISHED ); } } @@ -1688,10 +1762,10 @@ void TextEditor::OnStageConnect( Dali::Actor actor ) } } -ImfManager::ImfCallbackData TextEditor::OnImfEvent( Dali::ImfManager& imfManager, const ImfManager::ImfEventData& imfEvent ) +InputMethodContext::CallbackData TextEditor::OnInputMethodContextEvent( Dali::InputMethodContext& inputMethodContext, const InputMethodContext::EventData& inputMethodContextEvent ) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextEditor::OnImfEvent %p eventName %d\n", mController.Get(), imfEvent.eventName ); - return mController->OnImfEvent( imfManager, imfEvent ); + 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 ) @@ -1788,6 +1862,7 @@ TextEditor::TextEditor() mIdleCallback( NULL ), mAlignmentOffset( 0.f ), mScrollAnimationDuration( 0.f ), + mLineSpacing( 0.f ), mRenderingBackend( DEFAULT_RENDERING_BACKEND ), mHasBeenStaged( false ), mScrollAnimationEnabled( false ),