#include <dali/public-api/common/stage.h>
#include <dali/public-api/images/resource-image.h>
#include <dali/public-api/object/type-registry.h>
-#include <dali/public-api/object/type-registry-helper.h>
-#include <dali/public-api/scripting/scripting.h>
-#include <dali/public-api/adaptor-framework/virtual-keyboard.h>
+#include <dali/devel-api/object/type-registry-helper.h>
+#include <dali/devel-api/scripting/scripting.h>
+#include <dali/devel-api/adaptor-framework/virtual-keyboard.h>
#include <dali/integration-api/debug.h>
// INTERNAL INCLUDES
DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "selection-handle-pressed-image-right", STRING, SELECTION_HANDLE_PRESSED_IMAGE_RIGHT )
DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "selection-highlight-color", STRING, SELECTION_HIGHLIGHT_COLOR )
DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "decoration-bounding-box", RECTANGLE, DECORATION_BOUNDING_BOX )
+DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "input-method-settings", MAP, INPUT_METHOD_SETTINGS )
DALI_SIGNAL_REGISTRATION( Toolkit, TextField, "max-length-reached", SIGNAL_MAX_LENGTH_REACHED )
{
impl.mRenderingBackend = backend;
impl.mRenderer.Reset();
+ impl.RequestTextRelayout();
}
break;
}
{
if( impl.mController )
{
- std::string text = value.Get< std::string >();
+ 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() );
impl.mController->SetText( text );
{
if( impl.mController )
{
- std::string text = value.Get< std::string >();
+ 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() );
impl.mController->SetPlaceholderText( PLACEHOLDER_TYPE_INACTIVE, text );
{
if( impl.mController )
{
- std::string text = value.Get< std::string >();
+ 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() );
impl.mController->SetPlaceholderText( PLACEHOLDER_TYPE_ACTIVE, text );
{
if( impl.mController )
{
- std::string fontFamily = value.Get< std::string >();
+ 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() );
if( impl.mController->GetDefaultFontFamily() != fontFamily )
{
impl.mController->SetDefaultFontFamily( fontFamily );
- impl.RequestTextRelayout();
}
}
break;
{
if( impl.mController )
{
- std::string fontStyle = value.Get< std::string >();
+ const std::string fontStyle = value.Get< std::string >();
DALI_LOG_INFO( gLogFilter, Debug::General, "TextField %p FONT_STYLE %s\n", impl.mController.Get(), fontStyle.c_str() );
if( impl.mController->GetDefaultFontStyle() != fontStyle )
{
impl.mController->SetDefaultFontStyle( fontStyle );
- impl.RequestTextRelayout();
}
}
break;
{
if( impl.mController )
{
- float pointSize = value.Get< float >();
+ const float pointSize = value.Get< float >();
DALI_LOG_INFO( gLogFilter, Debug::General, "TextField %p FONT_STYLE %f\n", impl.mController.Get(), pointSize );
if( !Equals( impl.mController->GetDefaultPointSize(), pointSize ) )
{
impl.mController->SetDefaultPointSize( pointSize );
- impl.RequestTextRelayout();
}
}
break;
{
if( impl.mController )
{
- std::string alignStr = value.Get< std::string >();
+ const std::string alignStr = value.Get< std::string >();
DALI_LOG_INFO( gLogFilter, Debug::General, "TextField %p HORIZONTAL_ALIGNMENT %f\n", impl.mController.Get(), alignStr.c_str() );
- LayoutEngine& engine = impl.mController->GetLayoutEngine();
- LayoutEngine::HorizontalAlignment alignment = Scripting::GetEnumeration< LayoutEngine::HorizontalAlignment >( alignStr.c_str(),
+ const LayoutEngine::HorizontalAlignment alignment = Scripting::GetEnumeration< LayoutEngine::HorizontalAlignment >( alignStr.c_str(),
HORIZONTAL_ALIGNMENT_STRING_TABLE,
HORIZONTAL_ALIGNMENT_STRING_TABLE_COUNT );
- if( engine.GetHorizontalAlignment() != alignment )
- {
- engine.SetHorizontalAlignment( alignment );
- impl.RequestTextRelayout();
- }
+ impl.mController->SetHorizontalAlignment( alignment );
}
break;
}
{
if( impl.mController )
{
- std::string alignStr = value.Get< std::string >();
+ const std::string alignStr = value.Get< std::string >();
DALI_LOG_INFO( gLogFilter, Debug::General, "TextField %p VERTICAL_ALIGNMENT %f\n", impl.mController.Get(), alignStr.c_str() );
- LayoutEngine& engine = impl.mController->GetLayoutEngine();
LayoutEngine::VerticalAlignment alignment = Scripting::GetEnumeration< LayoutEngine::VerticalAlignment >( alignStr.c_str(),
VERTICAL_ALIGNMENT_STRING_TABLE,
VERTICAL_ALIGNMENT_STRING_TABLE_COUNT );
- if( engine.GetVerticalAlignment() != alignment )
- {
- engine.SetVerticalAlignment( alignment );
- impl.RequestTextRelayout();
- }
+ impl.mController->SetVerticalAlignment( alignment );
}
break;
}
case Toolkit::TextField::Property::TEXT_COLOR:
{
- if ( impl.mController )
+ if( impl.mController )
{
- Vector4 textColor = value.Get< Vector4 >();
+ 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 );
- if ( impl.mController->GetTextColor() != textColor )
+ if( impl.mController->GetTextColor() != textColor )
{
impl.mController->SetTextColor( textColor );
- impl.RequestTextRelayout();
+ impl.mRenderer.Reset();
}
}
break;
}
case Toolkit::TextField::Property::PLACEHOLDER_TEXT_COLOR:
{
- if ( impl.mController )
+ if( impl.mController )
{
- Vector4 textColor = value.Get< Vector4 >();
+ 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 );
- if ( impl.mController->GetPlaceholderTextColor() != textColor )
+ if( impl.mController->GetPlaceholderTextColor() != textColor )
{
impl.mController->SetPlaceholderTextColor( textColor );
- impl.RequestTextRelayout();
+ impl.mRenderer.Reset();
}
}
break;
{
if( impl.mController )
{
- Vector2 shadowOffset = value.Get< Vector2 >();
+ const Vector2 shadowOffset = value.Get< Vector2 >();
DALI_LOG_INFO( gLogFilter, Debug::General, "TextField %p SHADOW_OFFSET %f,%f\n", impl.mController.Get(), shadowOffset.x, shadowOffset.y );
if ( impl.mController->GetShadowOffset() != shadowOffset )
{
impl.mController->SetShadowOffset( shadowOffset );
- impl.RequestTextRelayout();
+ impl.mRenderer.Reset();
}
}
break;
{
if( impl.mController )
{
- Vector4 shadowColor = value.Get< Vector4 >();
+ const Vector4 shadowColor = value.Get< Vector4 >();
DALI_LOG_INFO( gLogFilter, Debug::General, "TextField %p SHADOW_COLOR %f,%f,%f,%f\n", impl.mController.Get(), shadowColor.r, shadowColor.g, shadowColor.b, shadowColor.a );
if ( impl.mController->GetShadowColor() != shadowColor )
{
impl.mController->SetShadowColor( shadowColor );
- impl.RequestTextRelayout();
+ impl.mRenderer.Reset();
}
}
break;
{
if( impl.mDecorator )
{
- Vector4 color = value.Get< Vector4 >();
+ const Vector4 color = value.Get< Vector4 >();
DALI_LOG_INFO( gLogFilter, Debug::General, "TextField %p PRIMARY_CURSOR_COLOR %f,%f\n", impl.mController.Get(), color.r, color.g, color.b, color.a );
impl.mDecorator->SetColor( PRIMARY_CURSOR, color );
+ impl.RequestTextRelayout();
}
break;
}
{
if( impl.mDecorator )
{
- Vector4 color = value.Get< Vector4 >();
+ const Vector4 color = value.Get< Vector4 >();
DALI_LOG_INFO( gLogFilter, Debug::General, "TextField %p SECONDARY_CURSOR_COLOR %f,%f\n", impl.mController.Get(), color.r, color.g, color.b, color.a );
impl.mDecorator->SetColor( SECONDARY_CURSOR, color );
+ impl.RequestTextRelayout();
}
break;
}
{
if( impl.mController )
{
- bool enable = value.Get< bool >();
+ const bool enable = value.Get< bool >();
DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextField %p ENABLE_CURSOR_BLINK %d\n", impl.mController.Get(), enable );
impl.mController->SetEnableCursorBlink( enable );
+ impl.RequestTextRelayout();
}
break;
}
{
if( impl.mDecorator )
{
- float interval = value.Get< float >();
+ const float interval = value.Get< float >();
DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextField %p CURSOR_BLINK_INTERVAL %f\n", impl.mController.Get(), interval );
impl.mDecorator->SetCursorBlinkInterval( interval );
{
if( impl.mDecorator )
{
- float duration = value.Get< float >();
+ const float duration = value.Get< float >();
DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextField %p CURSOR_BLINK_INTERVAL %f\n", impl.mController.Get(), duration );
impl.mDecorator->SetCursorBlinkDuration( duration );
}
case Toolkit::TextField::Property::GRAB_HANDLE_IMAGE:
{
- ResourceImage image = ResourceImage::New( value.Get< std::string >() );
+ const ResourceImage image = ResourceImage::New( value.Get< std::string >() );
DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextField %p GRAB_HANDLE_IMAGE %s\n", impl.mController.Get(), image.GetUrl().c_str() );
if( impl.mDecorator )
{
impl.mDecorator->SetHandleImage( GRAB_HANDLE, HANDLE_IMAGE_RELEASED, image );
+ impl.RequestTextRelayout();
}
break;
}
case Toolkit::TextField::Property::GRAB_HANDLE_PRESSED_IMAGE:
{
- ResourceImage image = ResourceImage::New( value.Get< std::string >() );
+ const ResourceImage image = ResourceImage::New( value.Get< std::string >() );
DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextField %p GRAB_HANDLE_PRESSED_IMAGE %s\n", impl.mController.Get(), image.GetUrl().c_str() );
if( impl.mDecorator )
{
impl.mDecorator->SetHandleImage( GRAB_HANDLE, HANDLE_IMAGE_PRESSED, image );
+ impl.RequestTextRelayout();
}
break;
}
case Toolkit::TextField::Property::SCROLL_THRESHOLD:
{
- float threshold = value.Get< float >();
+ const float threshold = value.Get< float >();
DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextField %p SCROLL_THRESHOLD %f\n", impl.mController.Get(), threshold );
if( impl.mDecorator )
}
case Toolkit::TextField::Property::SCROLL_SPEED:
{
- float speed = value.Get< float >();
+ const float speed = value.Get< float >();
DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextField %p SCROLL_SPEED %f\n", impl.mController.Get(), speed );
if( impl.mDecorator )
}
case Toolkit::TextField::Property::SELECTION_HANDLE_IMAGE_LEFT:
{
- ResourceImage image = ResourceImage::New( value.Get< std::string >() );
+ const ResourceImage image = ResourceImage::New( value.Get< std::string >() );
DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextField %p SELECTION_HANDLE_IMAGE_LEFT %f\n", impl.mController.Get(), image.GetUrl().c_str() );
if( impl.mDecorator )
{
impl.mDecorator->SetHandleImage( LEFT_SELECTION_HANDLE, HANDLE_IMAGE_RELEASED, image );
+ impl.RequestTextRelayout();
}
break;
}
case Toolkit::TextField::Property::SELECTION_HANDLE_IMAGE_RIGHT:
{
- ResourceImage image = ResourceImage::New( value.Get< std::string >() );
+ const ResourceImage image = ResourceImage::New( value.Get< std::string >() );
DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextField %p SELECTION_HANDLE_IMAGE_RIGHT %f\n", impl.mController.Get(), image.GetUrl().c_str() );
if( impl.mDecorator )
{
impl.mDecorator->SetHandleImage( RIGHT_SELECTION_HANDLE, HANDLE_IMAGE_RELEASED, image );
+ impl.RequestTextRelayout();
}
break;
}
case Toolkit::TextField::Property::SELECTION_HANDLE_PRESSED_IMAGE_LEFT:
{
- ResourceImage image = ResourceImage::New( value.Get< std::string >() );
+ const ResourceImage image = ResourceImage::New( value.Get< std::string >() );
DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextField %p SELECTION_HANDLE_PRESSED_IMAGE_LEFT %f\n", impl.mController.Get(), image.GetUrl().c_str() );
if( impl.mDecorator )
{
impl.mDecorator->SetHandleImage( LEFT_SELECTION_HANDLE, HANDLE_IMAGE_PRESSED, image );
+ impl.RequestTextRelayout();
}
break;
}
case Toolkit::TextField::Property::SELECTION_HANDLE_PRESSED_IMAGE_RIGHT:
{
- ResourceImage image = ResourceImage::New( value.Get< std::string >() );
+ const ResourceImage image = ResourceImage::New( value.Get< std::string >() );
DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextField %p SELECTION_HANDLE_PRESSED_IMAGE_RIGHT %f\n", impl.mController.Get(), image.GetUrl().c_str() );
if( impl.mDecorator )
{
impl.mDecorator->SetHandleImage( RIGHT_SELECTION_HANDLE, HANDLE_IMAGE_PRESSED, image );
+ impl.RequestTextRelayout();
}
break;
}
case Toolkit::TextField::Property::SELECTION_HIGHLIGHT_COLOR:
{
- Vector4 color = value.Get< Vector4 >();
+ const Vector4 color = value.Get< Vector4 >();
DALI_LOG_INFO( gLogFilter, Debug::General, "TextField %p SELECTION_HIGHLIGHT_COLOR %f,%f\n", impl.mController.Get(), color.r, color.g, color.b, color.a );
if( impl.mDecorator )
{
impl.mDecorator->SetHighlightColor( color );
+ impl.RequestTextRelayout();
}
break;
}
{
if( impl.mDecorator )
{
- Rect<int> box = value.Get< Rect<int> >();
+ const Rect<int> box = value.Get< Rect<int> >();
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.RequestTextRelayout();
}
break;
}
{
if( impl.mController )
{
- int max = value.Get< int >();
+ const int max = value.Get< int >();
DALI_LOG_INFO( gLogFilter, Debug::General, "TextField %p MAX_LENGTH %d\n", impl.mController.Get(), max );
impl.mController->SetMaximumNumberOfCharacters( max );
}
break;
}
+ case Toolkit::TextField::Property::INPUT_METHOD_SETTINGS:
+ {
+ const Property::Map map = value.Get<Property::Map>();
+ VirtualKeyboard::ApplySettings( map );
+ break;
+ }
} // switch
} // textfield
}
}
break;
}
+ case Toolkit::TextField::Property::FONT_FAMILY:
+ {
+ if( impl.mController )
+ {
+ value = impl.mController->GetDefaultFontFamily();
+ }
+ break;
+ }
+ case Toolkit::TextField::Property::FONT_STYLE:
+ {
+ if( impl.mController )
+ {
+ value = impl.mController->GetDefaultFontStyle();
+ }
+ break;
+ }
+ case Toolkit::TextField::Property::POINT_SIZE:
+ {
+ if( impl.mController )
+ {
+ value = impl.mController->GetDefaultPointSize();
+ }
+ break;
+ }
case Toolkit::TextField::Property::EXCEED_POLICY:
{
value = impl.mExceedPolicy;
}
break;
}
+ case Toolkit::TextField::Property::INPUT_METHOD_SETTINGS:
+ {
+ break;
+ }
} //switch
}
GetTapGestureDetector().SetMaximumTapsRequired( 2 );
EnableGestureDetection(Gesture::Pan);
+ self.TouchedSignal().Connect( this, &TextField::OnTouched );
+
// Set BoundingBox to stage size if not already set.
if ( mDecorator->GetBoundingBox().IsEmpty() )
{
self.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::HEIGHT );
}
-void TextField::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange change )
+void TextField::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change )
{
GetImpl( styleManager ).ApplyThemeStyle( Toolkit::Control( GetOwner() ) );
}
ImfManager::ImfCallbackData TextField::OnImfEvent( Dali::ImfManager& imfManager, const ImfManager::ImfEventData& imfEvent )
{
- DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextField::OnImfEvent %p eventName %d\n", imfEvent.eventName );
-
- bool update( false );
-
- std::string text;
- unsigned int cursorPosition( 0 );
-
- switch ( imfEvent.eventName )
- {
- case ImfManager::COMMIT:
- {
- mController->InsertText( imfEvent.predictiveString, Text::Controller::COMMIT );
- break;
- }
- case ImfManager::PREEDIT:
- {
- mController->InsertText( imfEvent.predictiveString, Text::Controller::PRE_EDIT );
- update = true;
- break;
- }
- case ImfManager::DELETESURROUNDING:
- {
- mController->RemoveText( imfEvent.cursorOffset, imfEvent.numberOfChars );
- break;
- }
- case ImfManager::GETSURROUNDING:
- {
- mController->GetText( text );
- cursorPosition = mController->GetLogicalCursorPosition();
-
- imfManager.SetSurroundingText( text );
- imfManager.SetCursorPosition( cursorPosition );
- break;
- }
- case ImfManager::VOID:
- {
- // do nothing
- break;
- }
- } // end switch
-
- if( ImfManager::GETSURROUNDING != imfEvent.eventName )
- {
- mController->GetText( text );
- cursorPosition = mController->GetLogicalCursorPosition();
- }
-
- ImfManager::ImfCallbackData callbackData( update, cursorPosition, text, false );
-
- return callbackData;
+ DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextField::OnImfEvent %p eventName %d\n", mController.Get(), imfEvent.eventName );
+ return mController->OnImfEvent( imfManager, imfEvent );
}
void TextField::RequestTextRelayout()
void TextField::KeyboardStatusChanged(bool keyboardShown)
{
- DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextField::KeyboardStatusChanged %p keyboardShown %d\n", 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 )
}
}
+bool TextField::OnTouched( Actor actor, const TouchEvent& event )
+{
+ return true;
+}
+
TextField::TextField()
: Control( ControlBehaviour( REQUIRES_STYLE_CHANGE_SIGNALS ) ),
mRenderingBackend( DEFAULT_RENDERING_BACKEND ),
projects / platform / core / uifw / dali-toolkit.git / blobdiff