X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Ftext-controls%2Ftext-field-impl.cpp;h=2b76083bd815dc1d4a3154407c7bac199cb49c29;hp=d79fd7bb2193bec682d54b643851f427026e219b;hb=309dec1120f1f4ff528f615d3607da8422464107;hpb=d98f67ed625722368682b8a3d04d01f8180025e5 diff --git a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp old mode 100644 new mode 100755 index d79fd7b..2b76083 --- 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) 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. @@ -44,6 +44,7 @@ #include #include #include +#include using namespace Dali::Toolkit::Text; @@ -130,6 +131,8 @@ DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "enableSelection", 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_SIGNAL_REGISTRATION( Toolkit, TextField, "textChanged", SIGNAL_TEXT_CHANGED ) DALI_SIGNAL_REGISTRATION( Toolkit, TextField, "maxLengthReached", SIGNAL_MAX_LENGTH_REACHED ) @@ -585,7 +588,7 @@ void TextField::SetProperty( BaseObject* object, Property::Index index, const Pr Toolkit::Control control = Toolkit::KeyInputFocusManager::Get().GetCurrentFocusControl(); if (control == textField) { - impl.mImfManager.ApplyOptions( impl.mInputMethodOptions ); + impl.mInputMethodContext.ApplyOptions( impl.mInputMethodOptions ); } break; } @@ -772,6 +775,25 @@ void TextField::SetProperty( BaseObject* object, Property::Index index, const Pr } break; } + case Toolkit::DevelTextField::Property::ENABLE_GRAB_HANDLE: + { + if( impl.mController ) + { + const bool grabHandleEnabled = value.Get(); + DALI_LOG_INFO( gLogFilter, Debug::General, "TextField %p ENABLE_GRAB_HANDLE %d\n", impl.mController.Get(), grabHandleEnabled ); + + impl.mController->SetGrabHandleEnabled( grabHandleEnabled ); + } + break; + } + case Toolkit::DevelTextField::Property::MATCH_SYSTEM_LANGUAGE_DIRECTION: + { + if( impl.mController ) + { + impl.mController->SetMatchSystemLanguageDirection(value.Get< bool >()); + } + break; + } } // switch } // textfield } @@ -1179,12 +1201,33 @@ Property::Value TextField::GetProperty( BaseObject* object, Property::Index inde } break; } + case Toolkit::DevelTextField::Property::ENABLE_GRAB_HANDLE: + { + if( impl.mController ) + { + value = impl.mController->IsGrabHandleEnabled(); + } + break; + } + case Toolkit::DevelTextField::Property::MATCH_SYSTEM_LANGUAGE_DIRECTION: + { + if( impl.mController ) + { + value = impl.mController->IsMatchSystemLanguageDirection(); + } + break; + } } //switch } return value; } +InputMethodContext TextField::GetInputMethodContext() +{ + return mInputMethodContext; +} + bool TextField::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor ) { Dali::BaseHandle handle( object ); @@ -1241,10 +1284,12 @@ void TextField::OnInitialize() mDecorator = Text::Decorator::New( *mController, *mController ); + mInputMethodContext = InputMethodContext::New(); + mController->GetLayoutEngine().SetLayout( Layout::Engine::SINGLE_LINE_BOX ); // Enables the text input. - mController->EnableTextInput( mDecorator ); + mController->EnableTextInput( mDecorator, mInputMethodContext ); // Enables the horizontal scrolling after the text input has been enabled. mController->SetHorizontalScrollEnabled( true ); @@ -1258,12 +1303,15 @@ void TextField::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, &TextField::OnTouched ); // Set BoundingBox to stage size if not already set. @@ -1284,6 +1332,8 @@ void TextField::OnInitialize() self.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::HEIGHT ); self.OnStageSignal().Connect( this, &TextField::OnStageConnect ); + DevelControl::SetInputMethodContext( *this, mInputMethodContext ); + if( Dali::Toolkit::TextField::EXCEED_POLICY_CLIP == mExceedPolicy ) { EnableClipping(); @@ -1369,7 +1419,7 @@ void TextField::OnRelayout( const Vector2& size, RelayoutContainer& container ) 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 ) @@ -1405,7 +1455,7 @@ void TextField::OnRelayout( const Vector2& size, RelayoutContainer& container ) { // @note: The callback manager takes the ownership of the callback object. mIdleCallback = MakeCallback( this, &TextField::OnIdleSignal ); - adaptor.AddIdle( mIdleCallback ); + adaptor.AddIdle( mIdleCallback, false ); } } } @@ -1479,25 +1529,26 @@ void TextField::RenderText( Text::Controller::UpdateTextType updateTextType ) void TextField::OnKeyInputFocusGained() { DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextField::OnKeyInputFocusGained %p\n", mController.Get() ); + if ( mInputMethodContext ) + { + mInputMethodContext.ApplyOptions( mInputMethodOptions ); - mImfManager.ApplyOptions( mInputMethodOptions ); - - mImfManager.StatusChangedSignal().Connect( this, &TextField::KeyboardStatusChanged ); - - mImfManager.EventReceivedSignal().Connect( this, &TextField::OnImfEvent ); + mInputMethodContext.StatusChangedSignal().Connect( this, &TextField::KeyboardStatusChanged ); - // Notify that the text editing start. - mImfManager.Activate(); + mInputMethodContext.EventReceivedSignal().Connect( this, &TextField::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, &TextField::OnClipboardTextSelected ); - } + if ( notifier ) + { + notifier.ContentSelectedSignal().Connect( this, &TextField::OnClipboardTextSelected ); + } mController->KeyboardFocusGainEvent(); // Called in the case of no virtual keyboard to trigger this event @@ -1507,16 +1558,17 @@ void TextField::OnKeyInputFocusGained() void TextField::OnKeyInputFocusLost() { DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextField:OnKeyInputFocusLost %p\n", mController.Get() ); + if ( mInputMethodContext ) + { + mInputMethodContext.StatusChangedSignal().Disconnect( this, &TextField::KeyboardStatusChanged ); + // The text editing is finished. Therefore the inputMethodContext don't have restore activation. + mInputMethodContext.SetRestoreAfterFocusLost( false ); - mImfManager.StatusChangedSignal().Disconnect( this, &TextField::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(); - - mImfManager.EventReceivedSignal().Disconnect( this, &TextField::OnImfEvent ); + // Notify that the text editing finish. + mInputMethodContext.Deactivate(); + mInputMethodContext.EventReceivedSignal().Disconnect( this, &TextField::OnInputMethodContextEvent ); + } ClipboardEventNotifier notifier( ClipboardEventNotifier::Get() ); if ( notifier ) @@ -1532,9 +1584,10 @@ void TextField::OnKeyInputFocusLost() void TextField::OnTap( const TapGesture& gesture ) { DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextField::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 Extents padding; padding = Self().GetProperty( Toolkit::Control::Property::PADDING ); @@ -1550,8 +1603,10 @@ void TextField::OnPan( const PanGesture& gesture ) void TextField::OnLongPress( const LongPressGesture& gesture ) { - mImfManager.Activate(); - + 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 ); @@ -1679,10 +1734,10 @@ void TextField::OnStageConnect( Dali::Actor actor ) } } -ImfManager::ImfCallbackData TextField::OnImfEvent( Dali::ImfManager& imfManager, const ImfManager::ImfEventData& imfEvent ) +InputMethodContext::CallbackData TextField::OnInputMethodContextEvent( Dali::InputMethodContext& inputMethodContext, const InputMethodContext::EventData& inputMethodContextEvent ) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextField::OnImfEvent %p eventName %d\n", mController.Get(), imfEvent.eventName ); - return mController->OnImfEvent( imfManager, imfEvent ); + 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 ) @@ -1715,7 +1770,7 @@ void TextField::EnableClipping() 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 );