if( 0u != utf32Characters.Count() )
{
- uint32_t numberOfBytes = GetNumberOfUtf8Bytes( &utf32Characters[0], utf32Characters.Count() );
-
- text.resize( numberOfBytes );
-
- // This is a bit horrible but std::string returns a (signed) char*
- Utf32ToUtf8( &utf32Characters[0], utf32Characters.Count(), reinterpret_cast<uint8_t*>(&text[0]) );
+ Utf32ToUtf8( &utf32Characters[0], utf32Characters.Count(), text );
}
}
else
Vector3 Controller::GetNaturalSize()
{
+ DALI_LOG_INFO( gLogFilter, Debug::Verbose, "-->Controller::GetNaturalSize\n" );
Vector3 naturalSize;
// Make sure the model is up-to-date before layouting
mImpl->mVisualModel->SetNaturalSize( naturalSize.GetVectorXY() );
mImpl->mRecalculateNaturalSize = false;
+
+ DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::GetNaturalSize calculated %f,%f,%f\n", naturalSize.x, naturalSize.y, naturalSize.z );
}
else
{
naturalSize = mImpl->mVisualModel->GetNaturalSize();
+
+ DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::GetNaturalSize cached %f,%f,%f\n", naturalSize.x, naturalSize.y, naturalSize.z );
}
return naturalSize;
float Controller::GetHeightForWidth( float width )
{
+ DALI_LOG_INFO( gLogFilter, Debug::Verbose, "-->Controller::GetHeightForWidth %p width %f\n", this, width );
// Make sure the model is up-to-date before layouting
ProcessModifyEvents();
// Do the size related operations again.
mImpl->mOperationsPending = static_cast<OperationsMask>( mImpl->mOperationsPending | sizeOperations );
+ DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::GetHeightForWidth calculated %f\n", layoutSize.height );
}
else
{
layoutSize = mImpl->mVisualModel->GetActualSize();
+ DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::GetHeightForWidth cached %f\n", layoutSize.height );
}
return layoutSize.height;
bool Controller::Relayout( const Size& size )
{
- DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::Relayout %p --> size %f,%f\n", this, size.width, size.height );
+ DALI_LOG_INFO( gLogFilter, Debug::Verbose, "-->Controller::Relayout %p size %f,%f\n", this, size.width, size.height );
if( ( size.width < Math::MACHINE_EPSILON_1000 ) || ( size.height < Math::MACHINE_EPSILON_1000 ) )
{
glyphsRemoved = true;
}
// Not worth to relayout if width or height is equal to zero.
- DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::Relayout <-- (skipped)\n" );
+ DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::Relayout (skipped)\n" );
return glyphsRemoved;
}
updated = mImpl->ProcessInputEvents() || updated;
}
- DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::Relayout <--\n" );
+ DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::Relayout\n" );
return updated;
}
OperationsMask operationsRequired,
Size& layoutSize )
{
+ DALI_LOG_INFO( gLogFilter, Debug::Verbose, "-->Controller::DoRelayout %p size %f,%f\n", this, size.width, size.height );
bool viewUpdated( false );
// Calculate the operations to be done.
if( 0u == numberOfGlyphs )
{
// Nothing else to do if there is no glyphs.
+ DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::DoRelayout no glyphs, view updated true\n" );
return true;
}
layoutSize = mImpl->mVisualModel->GetActualSize();
}
+ DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::DoRelayout no glyphs, view updated %s\n", ( viewUpdated ? "true" : "false" ) );
return viewUpdated;
}
if( 0u == mImpl->mLogicalModel->mText.Count() )
{
ShowPlaceholderText();
+ mImpl->mEventData->mUpdateCursorPosition = true;
}
else
{
{
DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected TapEvent" );
+ if( NULL != mImpl->mEventData )
+ {
+ if( 1u == tapCount )
+ {
+ bool tapDuringEditMode( EventData::EDITING == mImpl->mEventData->mState );
+
+ mImpl->ChangeState( EventData::EDITING );
+
+ if( mImpl->IsShowingPlaceholderText() )
+ {
+ // Alternative placeholder-text is used when editing
+ ShowPlaceholderText();
+ }
+ else if( EventData::EDITING == mImpl->mEventData->mState )
+ {
+ // Grab handle is not shown until a tap is received whilst EDITING
+ if( tapDuringEditMode )
+ {
+ mImpl->mEventData->mDecorator->SetHandleActive( GRAB_HANDLE, true );
+ }
+ mImpl->mEventData->mDecorator->SetPopupActive( false );
+ }
+ }
+ else if( mImpl->mEventData->mSelectionEnabled &&
+ ( 2u == tapCount ) )
+ {
+ mImpl->ChangeState( EventData::SELECTING );
+ }
+ }
+
+ // Handles & cursors must be repositioned after Relayout() i.e. after the Model has been updated
if( mImpl->mEventData )
{
Event event( Event::TAP_EVENT );
mImpl->mEventData->mIsShowingPlaceholderText = true;
+ // Cancel previously queued inserts etc.
+ mImpl->mModifyEvents.clear();
+
// Disable handles when showing place-holder text
mImpl->mEventData->mDecorator->SetHandleActive( GRAB_HANDLE, false );
mImpl->mEventData->mDecorator->SetHandleActive( LEFT_SELECTION_HANDLE, false );