X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Ftext-controls%2Ftext-editor-impl.cpp;h=77974d57a6417895313ed44afec00ee07a0ce128;hb=9817d4be0f95105f1cc8c5a211296da86af6d471;hp=638cf3710313ccfffa1188bd52e02d509eb75cea;hpb=eb651a8273140d65bebbe6d88fdfaf9b57caf0d2;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git 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 638cf37..77974d5 100644 --- a/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp @@ -135,6 +135,7 @@ DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "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_SIGNAL_REGISTRATION( Toolkit, TextEditor, "textChanged", SIGNAL_TEXT_CHANGED ) DALI_SIGNAL_REGISTRATION( Toolkit, TextEditor, "inputStyleChanged", SIGNAL_INPUT_STYLE_CHANGED ) @@ -510,8 +511,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; @@ -708,12 +715,23 @@ void TextEditor::SetProperty( BaseObject* object, Property::Index index, const P 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, "TextLabel %p LineWrap::MODE %d\n", impl.mController.Get(), 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; + } } // switch } // texteditor } @@ -961,7 +979,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; } @@ -1094,6 +1114,15 @@ Property::Value TextEditor::GetProperty( BaseObject* object, Property::Index ind { value = impl.mController->GetLineWrapMode(); } + break; + } + case Toolkit::DevelTextEditor::Property::ENABLE_SHIFT_SELECTION: + { + if( impl.mController ) + { + value = impl.mController->IsShiftSelectionEnabled(); + } + break; } } //switch } @@ -1205,7 +1234,7 @@ 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, Visual::COLOR ). + Property::Map().Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::COLOR ). Add( ColorVisual::Property::MIX_COLOR, Color::TRANSPARENT ) ); // Enable the clipping property. @@ -1250,13 +1279,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; } @@ -1265,21 +1301,28 @@ 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 ); if( ( Text::Controller::NONE_UPDATED != updateTextType ) || @@ -1427,9 +1470,9 @@ void TextEditor::OnTap( const TapGesture& gesture ) mImfManager.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(); } @@ -1443,9 +1486,9 @@ 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 ); + Extents padding; + padding = Self().GetProperty( Toolkit::Control::Property::PADDING ); + mController->LongPressEvent( gesture.state, gesture.localPoint.x - padding.start, gesture.localPoint.y - padding.top ); SetKeyInputFocus(); } @@ -1764,6 +1807,7 @@ TextEditor::TextEditor() mIdleCallback( NULL ), mAlignmentOffset( 0.f ), mScrollAnimationDuration( 0.f ), + mLineSpacing( 0.f ), mRenderingBackend( DEFAULT_RENDERING_BACKEND ), mHasBeenStaged( false ), mScrollAnimationEnabled( false ),