X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Ftext-controls%2Ftext-field-impl.cpp;h=6083974475db04a4c2dc3ee6fc75228a6c5a8b24;hb=refs%2Fchanges%2F54%2F132954%2F5;hp=63568e652ba16e96e5870ebc1835c6eb652774b3;hpb=db152116b8c7de79b206d7d361c9d3875d05d0ac;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git 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 63568e6..6083974 100644 --- a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp @@ -23,7 +23,8 @@ #include #include #include -#include +#include +#include #include #include #include @@ -32,6 +33,8 @@ #include #include #include +#include +#include #include #include #include @@ -135,6 +138,8 @@ DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "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_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextField, "hiddenInputSettings", MAP, HIDDEN_INPUT_SETTINGS ) +DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextField, "pixelSize", FLOAT, PIXEL_SIZE ) DALI_SIGNAL_REGISTRATION( Toolkit, TextField, "textChanged", SIGNAL_TEXT_CHANGED ) DALI_SIGNAL_REGISTRATION( Toolkit, TextField, "maxLengthReached", SIGNAL_MAX_LENGTH_REACHED ) @@ -252,9 +257,9 @@ void TextField::SetProperty( BaseObject* object, Property::Index index, const Pr const float pointSize = value.Get< float >(); DALI_LOG_INFO( gLogFilter, Debug::General, "TextField %p POINT_SIZE %f\n", impl.mController.Get(), pointSize ); - if( !Equals( impl.mController->GetDefaultPointSize(), pointSize ) ) + if( !Equals( impl.mController->GetDefaultFontSize( Text::Controller::POINT_SIZE ), pointSize ) ) { - impl.mController->SetDefaultPointSize( pointSize ); + impl.mController->SetDefaultFontSize( pointSize, Text::Controller::POINT_SIZE ); } } break; @@ -590,8 +595,18 @@ void TextField::SetProperty( BaseObject* object, Property::Index index, const Pr } case Toolkit::TextField::Property::INPUT_METHOD_SETTINGS: { - const Property::Map map = value.Get(); - VirtualKeyboard::ApplySettings( map ); + const Property::Map* map = value.GetMap(); + if (map) + { + impl.mInputMethodOptions.ApplyProperty( *map ); + } + impl.mController->SetInputModePassword( impl.mInputMethodOptions.IsPassword() ); + + Toolkit::Control control = Toolkit::KeyInputFocusManager::Get().GetCurrentFocusControl(); + if (control == textField) + { + impl.mImfManager.ApplyOptions( impl.mInputMethodOptions ); + } break; } case Toolkit::TextField::Property::INPUT_COLOR: @@ -713,6 +728,29 @@ void TextField::SetProperty( BaseObject* object, Property::Index index, const Pr } break; } + case Toolkit::DevelTextField::Property::HIDDEN_INPUT_SETTINGS: + { + const Property::Map* map = value.GetMap(); + if (map) + { + impl.mController->SetHiddenInputOption(*map); + } + break; + } + case Toolkit::DevelTextField::Property::PIXEL_SIZE: + { + if( impl.mController ) + { + const float pixelSize = value.Get< float >(); + 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 ) ) + { + impl.mController->SetDefaultFontSize( pixelSize, Text::Controller::PIXEL_SIZE ); + } + } + break; + } } // switch } // textfield } @@ -782,7 +820,7 @@ Property::Value TextField::GetProperty( BaseObject* object, Property::Index inde { if( impl.mController ) { - value = impl.mController->GetDefaultPointSize(); + value = impl.mController->GetDefaultFontSize( Text::Controller::POINT_SIZE ); } break; } @@ -994,6 +1032,9 @@ Property::Value TextField::GetProperty( BaseObject* object, Property::Index inde } case Toolkit::TextField::Property::INPUT_METHOD_SETTINGS: { + Property::Map map; + impl.mInputMethodOptions.RetrieveProperty( map ); + value = map; break; } case Toolkit::TextField::Property::INPUT_COLOR: @@ -1073,6 +1114,21 @@ Property::Value TextField::GetProperty( BaseObject* object, Property::Index inde GetOutlineProperties( impl.mController, value, Text::EffectStyle::INPUT ); break; } + case Toolkit::DevelTextField::Property::HIDDEN_INPUT_SETTINGS: + { + Property::Map map; + impl.mController->GetHiddenInputOption(map); + value = map; + break; + } + case Toolkit::DevelTextField::Property::PIXEL_SIZE: + { + if( impl.mController ) + { + value = impl.mController->GetDefaultFontSize( Text::Controller::PIXEL_SIZE ); + } + break; + } } //switch } @@ -1149,10 +1205,15 @@ void TextField::OnInitialize() // Disable the smooth handle panning. mController->SetSmoothHandlePanEnabled( false ); + mController->SetNoTextDoubleTapAction( Controller::NoTextTap::HIGHLIGHT ); + mController->SetNoTextLongPressAction( Controller::NoTextTap::HIGHLIGHT ); + // 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. @@ -1191,20 +1252,25 @@ void TextField::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange:: const std::string& newFont = GetImpl( styleManager ).GetDefaultFontFamily(); // Property system did not set the font so should update it. mController->UpdateAfterFontChange( newFont ); + RelayoutRequest(); break; } case StyleChange::DEFAULT_FONT_SIZE_CHANGE: { GetImpl( styleManager ).ApplyThemeStyle( Toolkit::Control( GetOwner() ) ); + RelayoutRequest(); break; } case StyleChange::THEME_CHANGE: { - GetImpl( styleManager ).ApplyThemeStyle( Toolkit::Control( GetOwner() ) ); + // Nothing to do, let control base class handle this break; } } + + // Up call to Control + Control::OnStyleChange( styleManager, change ); } Vector3 TextField::GetNaturalSize() @@ -1272,7 +1338,7 @@ void TextField::RenderText( Text::Controller::UpdateTextType updateTextType ) { renderableActor = mRenderer->Render( mController->GetView(), mAlignmentOffset, - DepthIndex::TEXT ); + DepthIndex::CONTENT ); } if( renderableActor != mRenderableActor ) @@ -1297,6 +1363,7 @@ void TextField::RenderText( Text::Controller::UpdateTextType updateTextType ) ++it ) { self.Add( *it ); + DevelActor::LowerToBottom(*it); } mClippingDecorationActors.clear(); @@ -1308,20 +1375,17 @@ void TextField::OnKeyInputFocusGained() { DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextField::OnKeyInputFocusGained %p\n", mController.Get() ); - VirtualKeyboard::StatusChangedSignal().Connect( this, &TextField::KeyboardStatusChanged ); + mImfManager.ApplyOptions( mInputMethodOptions ); - ImfManager imfManager = ImfManager::Get(); + mImfManager.StatusChangedSignal().Connect( this, &TextField::KeyboardStatusChanged ); - if ( imfManager ) - { - imfManager.EventReceivedSignal().Connect( this, &TextField::OnImfEvent ); + mImfManager.EventReceivedSignal().Connect( this, &TextField::OnImfEvent ); - // Notify that the text editing start. - imfManager.Activate(); + // Notify that the text editing start. + mImfManager.Activate(); - // When window gain lost focus, the imf manager is deactivated. Thus when window gain focus again, the imf manager must be activated. - imfManager.SetRestoreAfterFocusLost( true ); - } + // 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 ); ClipboardEventNotifier notifier( ClipboardEventNotifier::Get() ); @@ -1339,19 +1403,14 @@ void TextField::OnKeyInputFocusLost() { DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextField:OnKeyInputFocusLost %p\n", mController.Get() ); - VirtualKeyboard::StatusChangedSignal().Disconnect( this, &TextField::KeyboardStatusChanged ); - - ImfManager imfManager = ImfManager::Get(); - if ( imfManager ) - { - // The text editing is finished. Therefore the imf manager don't have restore activation. - imfManager.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. - imfManager.Deactivate(); + // Notify that the text editing finish. + mImfManager.Deactivate(); - imfManager.EventReceivedSignal().Disconnect( this, &TextField::OnImfEvent ); - } + mImfManager.EventReceivedSignal().Disconnect( this, &TextField::OnImfEvent ); ClipboardEventNotifier notifier( ClipboardEventNotifier::Get() ); @@ -1369,11 +1428,7 @@ void TextField::OnTap( const TapGesture& gesture ) { DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextField::OnTap %p\n", mController.Get() ); - // Show the keyboard if it was hidden. - if (!VirtualKeyboard::IsVisible()) - { - VirtualKeyboard::Show(); - } + mImfManager.Activate(); // Deliver the tap before the focus event to controller; this allows us to detect when focus is gained due to tap-gestures mController->TapEvent( gesture.numberOfTaps, gesture.localPoint.x, gesture.localPoint.y ); @@ -1388,11 +1443,7 @@ void TextField::OnPan( const PanGesture& gesture ) void TextField::OnLongPress( const LongPressGesture& gesture ) { - // Show the keyboard if it was hidden. - if (!VirtualKeyboard::IsVisible()) - { - VirtualKeyboard::Show(); - } + mImfManager.Activate(); mController->LongPressEvent( gesture.state, gesture.localPoint.x, gesture.localPoint.y ); @@ -1403,10 +1454,14 @@ bool TextField::OnKeyEvent( const KeyEvent& event ) { DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextField::OnKeyEvent %p keyCode %d\n", mController.Get(), event.keyCode ); - if( Dali::DALI_KEY_ESCAPE == event.keyCode || - "Return" == event.keyPressedName ) // Make a Dali key code for this + if( Dali::DALI_KEY_ESCAPE == event.keyCode ) // Make a Dali key code for this { - ClearKeyInputFocus(); + // Make sure ClearKeyInputFocus when only key is up + if( event.state == KeyEvent::Up ) + { + ClearKeyInputFocus(); + } + return true; }