}
}
- if( mEventData &&
+ if( ( NULL != mEventData ) &&
mEventData->mPreEditFlag &&
( 0u != mVisualModel->mCharactersToGlyph.Count() ) )
{
{
DALI_LOG_INFO( gLogFilter, Debug::General, "Controller::OnLongPressEvent\n" );
- if ( EventData::EDITING == mEventData->mState )
+ if( EventData::EDITING == mEventData->mState )
{
ChangeState ( EventData::EDITING_WITH_POPUP );
mEventData->mDecoratorUpdated = true;
mEventData->mUpdateCursorPosition = true;
mEventData->mUpdateInputStyle = true;
- if ( !IsClipboardEmpty() )
+ if( !IsClipboardEmpty() )
{
ChangeState( EventData::EDITING_WITH_PASTE_POPUP ); // Moving grabhandle will show Paste Popup
}
void Controller::Impl::ShowClipboard()
{
- if ( mClipboard )
+ if( mClipboard )
{
mClipboard.ShowClipboard();
}
void Controller::Impl::HideClipboard()
{
- if ( mClipboard )
+ if( mClipboard )
{
mClipboard.HideClipboard();
}
const Length numberOfGlyphs = mVisualModel->mGlyphs.Count();
const Length numberOfLines = mVisualModel->mLines.Count();
- if( 0 == numberOfGlyphs ||
- 0 == numberOfLines )
+ if( ( 0 == numberOfGlyphs ) ||
+ ( 0 == numberOfLines ) )
{
// Nothing to do if there is no text.
return;
{
buttonsToShow = TextSelectionPopup::Buttons( TextSelectionPopup::CUT | TextSelectionPopup::COPY );
- if ( !IsClipboardEmpty() )
+ if( !IsClipboardEmpty() )
{
buttonsToShow = TextSelectionPopup::Buttons ( ( buttonsToShow | TextSelectionPopup::PASTE ) );
buttonsToShow = TextSelectionPopup::Buttons ( ( buttonsToShow | TextSelectionPopup::CLIPBOARD ) );
}
- if ( !mEventData->mAllTextSelected )
+ if( !mEventData->mAllTextSelected )
{
buttonsToShow = TextSelectionPopup::Buttons ( ( buttonsToShow | TextSelectionPopup::SELECT_ALL ) );
}
}
- else if ( EventData::EDITING_WITH_POPUP == mEventData->mState )
+ else if( EventData::EDITING_WITH_POPUP == mEventData->mState )
{
- if ( mLogicalModel->mText.Count() && !IsShowingPlaceholderText())
+ if( mLogicalModel->mText.Count() && !IsShowingPlaceholderText() )
{
buttonsToShow = TextSelectionPopup::Buttons( TextSelectionPopup::SELECT | TextSelectionPopup::SELECT_ALL );
}
- if ( !IsClipboardEmpty() )
+ if( !IsClipboardEmpty() )
{
buttonsToShow = TextSelectionPopup::Buttons ( ( buttonsToShow | TextSelectionPopup::PASTE ) );
buttonsToShow = TextSelectionPopup::Buttons ( ( buttonsToShow | TextSelectionPopup::CLIPBOARD ) );
}
}
- else if ( EventData::EDITING_WITH_PASTE_POPUP == mEventData->mState )
+ else if( EventData::EDITING_WITH_PASTE_POPUP == mEventData->mState )
{
if ( !IsClipboardEmpty() )
{
mEventData->mDecoratorUpdated = true;
HideClipboard();
}
- else if ( EventData::INTERRUPTED == mEventData->mState)
+ else if( EventData::INTERRUPTED == mEventData->mState)
{
mEventData->mDecorator->SetHandleActive( GRAB_HANDLE, false );
mEventData->mDecorator->SetHandleActive( LEFT_SELECTION_HANDLE, false );
mEventData->mDecoratorUpdated = true;
HideClipboard();
}
- else if ( EventData::SELECTING == mEventData->mState )
+ else if( EventData::SELECTING == mEventData->mState )
{
mEventData->mDecorator->SetActiveCursor( ACTIVE_CURSOR_NONE );
mEventData->mDecorator->StopCursorBlink();
mEventData->mDecoratorUpdated = true;
HideClipboard();
}
- else if ( EventData::SELECTION_HANDLE_PANNING == mEventData->mState )
+ else if( EventData::SELECTION_HANDLE_PANNING == mEventData->mState )
{
mEventData->mDecorator->SetActiveCursor( ACTIVE_CURSOR_NONE );
mEventData->mDecorator->StopCursorBlink();
}
mEventData->mDecoratorUpdated = true;
}
- else if ( EventData::GRAB_HANDLE_PANNING == mEventData->mState )
+ else if( EventData::GRAB_HANDLE_PANNING == mEventData->mState )
{
DALI_LOG_INFO( gLogFilter, Debug::Verbose, "GRAB_HANDLE_PANNING \n", newState );
}
mEventData->mDecoratorUpdated = true;
}
- else if ( EventData::EDITING_WITH_PASTE_POPUP == mEventData->mState )
+ else if( EventData::EDITING_WITH_PASTE_POPUP == mEventData->mState )
{
DALI_LOG_INFO( gLogFilter, Debug::Verbose, "EDITING_WITH_PASTE_POPUP \n", newState );
CharacterIndex hitCharacter = GetClosestCursorIndex( visualX, visualY );
DALI_ASSERT_DEBUG( hitCharacter <= mLogicalModel->mText.Count() && "GetClosestCursorIndex returned out of bounds index" );
- if ( mLogicalModel->mText.Count() == 0 )
+ if( mLogicalModel->mText.Count() == 0 )
{
return; // if model empty
}
if( hitCharacter >= mLogicalModel->mText.Count() )
{
// Closest hit character is the last character.
- if ( hitCharacter == mLogicalModel->mText.Count() )
+ if( hitCharacter == mLogicalModel->mText.Count() )
{
hitCharacter--; //Hit character index set to last character in logical model
}
const Length numberOfGlyphs = mVisualModel->mGlyphs.Count();
const Length numberOfLines = mVisualModel->mLines.Count();
- if( 0 == numberOfGlyphs ||
- 0 == numberOfLines )
+ if( ( 0 == numberOfGlyphs ) ||
+ ( 0 == numberOfLines ) )
{
return logicalIndex;
}
void Controller::EnableTextInput( DecoratorPtr decorator )
{
- if( !mImpl->mEventData )
+ if( NULL == mImpl->mEventData )
{
mImpl->mEventData = new EventData( decorator );
}
CharacterIndex lastCursorIndex = 0u;
- if( mImpl->mEventData )
+ if( NULL != mImpl->mEventData )
{
// If popup shown then hide it by switching to Editing state
if( ( EventData::SELECTING == mImpl->mEventData->mState ) ||
mImpl->RequestRelayout();
- if( mImpl->mEventData )
+ if( NULL != mImpl->mEventData )
{
// Cancel previously queued events
mImpl->mEventData->mEventQueue.clear();
void Controller::GetText( std::string& text ) const
{
- if( ! mImpl->IsShowingPlaceholderText() )
+ if( !mImpl->IsShowingPlaceholderText() )
{
Vector<Character>& utf32Characters = mImpl->mLogicalModel->mText;
unsigned int Controller::GetLogicalCursorPosition() const
{
- if( mImpl->mEventData )
+ if( NULL != mImpl->mEventData )
{
return mImpl->mEventData->mPrimaryCursorPosition;
}
void Controller::SetPlaceholderText( PlaceholderType type, const std::string& text )
{
- if( mImpl->mEventData )
+ if( NULL != mImpl->mEventData )
{
if( PLACEHOLDER_TYPE_INACTIVE == type )
{
// Update placeholder if there is no text
if( mImpl->IsShowingPlaceholderText() ||
- 0u == mImpl->mLogicalModel->mText.Count() )
+ ( 0u == mImpl->mLogicalModel->mText.Count() ) )
{
ShowPlaceholderText();
}
void Controller::GetPlaceholderText( PlaceholderType type, std::string& text ) const
{
- if( mImpl->mEventData )
+ if( NULL != mImpl->mEventData )
{
if( PLACEHOLDER_TYPE_INACTIVE == type )
{
void Controller::SetMaximumNumberOfCharacters( int maxCharacters )
{
- if ( maxCharacters >= 0 )
+ if( maxCharacters >= 0 )
{
mImpl->mMaximumNumberOfCharacters = maxCharacters;
}
void Controller::SetDefaultFontFamily( const std::string& defaultFontFamily )
{
- if( !mImpl->mFontDefaults )
+ if( NULL == mImpl->mFontDefaults )
{
mImpl->mFontDefaults = new FontDefaults();
}
const std::string& Controller::GetDefaultFontFamily() const
{
- if( mImpl->mFontDefaults )
+ if( NULL != mImpl->mFontDefaults )
{
return mImpl->mFontDefaults->mFontDescription.family;
}
void Controller::SetDefaultFontStyle( const std::string& style )
{
- if( !mImpl->mFontDefaults )
+ if( NULL == mImpl->mFontDefaults )
{
mImpl->mFontDefaults = new FontDefaults();
}
const std::string& Controller::GetDefaultFontStyle() const
{
- if( mImpl->mFontDefaults )
+ if( NULL != mImpl->mFontDefaults )
{
return mImpl->mFontDefaults->mFontStyle;
}
void Controller::SetDefaultFontWidth( FontWidth width )
{
- if( !mImpl->mFontDefaults )
+ if( NULL == mImpl->mFontDefaults )
{
mImpl->mFontDefaults = new FontDefaults();
}
FontWidth Controller::GetDefaultFontWidth() const
{
- if( mImpl->mFontDefaults )
+ if( NULL != mImpl->mFontDefaults )
{
return mImpl->mFontDefaults->mFontDescription.width;
}
void Controller::SetDefaultFontWeight( FontWeight weight )
{
- if( !mImpl->mFontDefaults )
+ if( NULL == mImpl->mFontDefaults )
{
mImpl->mFontDefaults = new FontDefaults();
}
FontWeight Controller::GetDefaultFontWeight() const
{
- if( mImpl->mFontDefaults )
+ if( NULL != mImpl->mFontDefaults )
{
return mImpl->mFontDefaults->mFontDescription.weight;
}
void Controller::SetDefaultFontSlant( FontSlant slant )
{
- if( !mImpl->mFontDefaults )
+ if( NULL == mImpl->mFontDefaults )
{
mImpl->mFontDefaults = new FontDefaults();
}
FontSlant Controller::GetDefaultFontSlant() const
{
- if( mImpl->mFontDefaults )
+ if( NULL != mImpl->mFontDefaults )
{
return mImpl->mFontDefaults->mFontDescription.slant;
}
void Controller::SetDefaultPointSize( float pointSize )
{
- if( !mImpl->mFontDefaults )
+ if( NULL == mImpl->mFontDefaults )
{
mImpl->mFontDefaults = new FontDefaults();
}
float Controller::GetDefaultPointSize() const
{
- if( mImpl->mFontDefaults )
+ if( NULL != mImpl->mFontDefaults )
{
return mImpl->mFontDefaults->mDefaultPointSize;
}
{
DALI_LOG_INFO( gLogFilter, Debug::Concise, "Controller::UpdateAfterFontChange");
- if ( !mImpl->mUserDefinedFontFamily ) // If user defined font then should not update when system font changes
+ if( !mImpl->mUserDefinedFontFamily ) // If user defined font then should not update when system font changes
{
DALI_LOG_INFO( gLogFilter, Debug::Concise, "Controller::UpdateAfterFontChange newDefaultFont(%s)\n", newDefaultFont.c_str() );
ClearFontData();
bool Controller::RemoveText( int cursorOffset, int numberOfChars )
{
- bool removed( false );
+ bool removed = false;
+
+ if( NULL == mImpl->mEventData )
+ {
+ return removed;
+ }
DALI_LOG_INFO( gLogFilter, Debug::General, "Controller::RemoveText %p mText.Count() %d cursor %d cursorOffset %d numberOfChars %d\n",
this, mImpl->mLogicalModel->mText.Count(), mImpl->mEventData->mPrimaryCursorPosition, cursorOffset, numberOfChars );
if( ( cursorIndex + numberOfChars ) <= currentText.Count() )
{
// Update the input style and remove the text's style before removing the text.
- if( mImpl->mEventData )
- {
- // Set first the default input style.
- mImpl->RetrieveDefaultInputStyle( mImpl->mEventData->mInputStyle );
- // Update the input style.
- mImpl->mLogicalModel->RetrieveStyle( cursorIndex, mImpl->mEventData->mInputStyle );
+ // Set first the default input style.
+ mImpl->RetrieveDefaultInputStyle( mImpl->mEventData->mInputStyle );
- // Remove the text's style before removing the text.
- mImpl->mLogicalModel->UpdateTextStyleRuns( cursorIndex, -numberOfChars );
- }
+ // Update the input style.
+ mImpl->mLogicalModel->RetrieveStyle( cursorIndex, mImpl->mEventData->mInputStyle );
+
+ // Remove the text's style before removing the text.
+ mImpl->mLogicalModel->UpdateTextStyleRuns( cursorIndex, -numberOfChars );
// Remove the characters.
Vector<Character>::Iterator first = currentText.Begin() + cursorIndex;
void Controller::SetPlaceholderTextColor( const Vector4& textColor )
{
- if( mImpl->mEventData )
+ if( NULL != mImpl->mEventData )
{
mImpl->mEventData->mPlaceholderTextColor = textColor;
}
const Vector4& Controller::GetPlaceholderTextColor() const
{
- if( mImpl->mEventData )
+ if( NULL != mImpl->mEventData )
{
return mImpl->mEventData->mPlaceholderTextColor;
}
void Controller::SetInputColor( const Vector4& color )
{
- if( mImpl->mEventData )
+ if( NULL != mImpl->mEventData )
{
mImpl->mEventData->mInputStyle.textColor = color;
const Vector4& Controller::GetInputColor() const
{
- if( mImpl->mEventData )
+ if( NULL != mImpl->mEventData )
{
return mImpl->mEventData->mInputStyle.textColor;
}
{
DALI_ASSERT_DEBUG( NULL != mImpl->mEventData && "TextInput disabled" );
- if( mImpl->mEventData )
+ if( NULL != mImpl->mEventData )
{
mImpl->mEventData->mCursorBlinkEnabled = enable;
bool Controller::GetEnableCursorBlink() const
{
- if( mImpl->mEventData )
+ if( NULL != mImpl->mEventData )
{
return mImpl->mEventData->mCursorBlinkEnabled;
}
const Vector2& Controller::GetScrollPosition() const
{
- if( mImpl->mEventData )
+ if( NULL != mImpl->mEventData )
{
return mImpl->mEventData->mScrollPosition;
}
// Do not re-do any operation until something changes.
mImpl->mOperationsPending = NO_OPERATION;
+ // Whether the text control is editable
+ const bool isEditable = NULL != mImpl->mEventData;
+
// Keep the current offset and alignment as it will be used to update the decorator's positions (if the size changes).
Vector2 offset;
- if( newSize && mImpl->mEventData )
+ if( newSize && isEditable )
{
offset = mImpl->mAlignmentOffset + mImpl->mEventData->mScrollPosition;
}
// After doing the text layout, the alignment offset to place the actor in the desired position can be calculated.
CalculateTextAlignment( size );
- if( mImpl->mEventData )
+ if( isEditable )
{
if( newSize )
{
}
}
- if( mImpl->mEventData )
+ if( NULL != mImpl->mEventData )
{
// When the text is being modified, delay cursor blinking
mImpl->mEventData->mDecorator->DelayCursorBlink();
mImpl->mEventData->mPrimaryCursorPosition = cursorIndex;
// Update the cursor if it's in editing mode.
- if ( EventData::IsEditingState( mImpl->mEventData->mState ) )
+ if( EventData::IsEditingState( mImpl->mEventData->mState ) )
{
mImpl->mEventData->mUpdateCursorPosition = true;
}
{
DALI_ASSERT_DEBUG( NULL != mImpl->mEventData && "Unexpected TextInsertedEvent" );
+ if( NULL == mImpl->mEventData )
+ {
+ return;
+ }
+
// TODO - Optimize this
ClearModelData();
REORDER );
// Queue a cursor reposition event; this must wait until after DoRelayout()
- if ( EventData::IsEditingState( mImpl->mEventData->mState ) )
+ if( EventData::IsEditingState( mImpl->mEventData->mState ) )
{
mImpl->mEventData->mUpdateCursorPosition = true;
mImpl->mEventData->mScrollAfterUpdatePosition = true;
{
DALI_ASSERT_DEBUG( NULL != mImpl->mEventData && "Unexpected TextDeletedEvent" );
+ if( NULL == mImpl->mEventData )
+ {
+ return;
+ }
+
// TODO - Optimize this
ClearModelData();
{
DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected KeyboardFocusGainEvent" );
- if( mImpl->mEventData )
+ if( NULL != mImpl->mEventData )
{
if( ( EventData::INACTIVE == mImpl->mEventData->mState ) ||
( EventData::INTERRUPTED == mImpl->mEventData->mState ) )
{
DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected KeyboardFocusLostEvent" );
- if( mImpl->mEventData )
+ if( NULL != mImpl->mEventData )
{
- if ( EventData::INTERRUPTED != mImpl->mEventData->mState )
+ if( EventData::INTERRUPTED != mImpl->mEventData->mState )
{
mImpl->ChangeState( EventData::INACTIVE );
bool textChanged( false );
- if( mImpl->mEventData &&
- keyEvent.state == KeyEvent::Down )
+ if( ( NULL != mImpl->mEventData ) &&
+ ( keyEvent.state == KeyEvent::Down ) )
{
int keyCode = keyEvent.keyCode;
const std::string& keyString = keyEvent.keyPressed;
// Escape key is a special case which causes focus loss
KeyboardFocusLostEvent();
}
- else if( Dali::DALI_KEY_CURSOR_LEFT == keyCode ||
- Dali::DALI_KEY_CURSOR_RIGHT == keyCode ||
- Dali::DALI_KEY_CURSOR_UP == keyCode ||
- Dali::DALI_KEY_CURSOR_DOWN == keyCode )
+ else if( ( Dali::DALI_KEY_CURSOR_LEFT == keyCode ) ||
+ ( Dali::DALI_KEY_CURSOR_RIGHT == keyCode ) ||
+ ( Dali::DALI_KEY_CURSOR_UP == keyCode ) ||
+ ( Dali::DALI_KEY_CURSOR_DOWN == keyCode ) )
{
Event event( Event::CURSOR_KEY_EVENT );
event.p1.mInt = keyCode;
{
textChanged = BackspaceKeyEvent();
}
- else if ( IsKey( keyEvent, Dali::DALI_KEY_POWER ) )
+ else if( IsKey( keyEvent, Dali::DALI_KEY_POWER ) )
{
mImpl->ChangeState( EventData::INTERRUPTED ); // State is not INACTIVE as expect to return to edit mode.
// Avoids calling the InsertText() method which can delete selected text
}
- else if ( IsKey( keyEvent, Dali::DALI_KEY_MENU ) ||
- IsKey( keyEvent, Dali::DALI_KEY_HOME ) )
+ else if( IsKey( keyEvent, Dali::DALI_KEY_MENU ) ||
+ IsKey( keyEvent, Dali::DALI_KEY_HOME ) )
{
mImpl->ChangeState( EventData::INACTIVE );
// Menu/Home key behaviour does not allow edit mode to resume like Power key
textChanged = true;
}
- if ( ( mImpl->mEventData->mState != EventData::INTERRUPTED ) &&
- ( mImpl->mEventData->mState != EventData::INACTIVE ) )
+ if( ( mImpl->mEventData->mState != EventData::INTERRUPTED ) &&
+ ( mImpl->mEventData->mState != EventData::INACTIVE ) )
{
mImpl->ChangeState( EventData::EDITING );
}
bool maxLengthReached( false );
DALI_ASSERT_DEBUG( NULL != mImpl->mEventData && "Unexpected InsertText" )
+
+ if( NULL == mImpl->mEventData )
+ {
+ return;
+ }
+
DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::InsertText %p %s (%s) mPrimaryCursorPosition %d mPreEditFlag %d mPreEditStartPosition %d mPreEditLength %d\n",
this, text.c_str(), (COMMIT == type ? "COMMIT" : "PRE_EDIT"),
mImpl->mEventData->mPrimaryCursorPosition, mImpl->mEventData->mPreEditFlag, mImpl->mEventData->mPreEditStartPosition, mImpl->mEventData->mPreEditLength );
Length characterCount( 0u );
// Remove the previous IMF pre-edit (predicitive text)
- if( mImpl->mEventData &&
- mImpl->mEventData->mPreEditFlag &&
- 0 != mImpl->mEventData->mPreEditLength )
+ if( mImpl->mEventData->mPreEditFlag &&
+ ( 0 != mImpl->mEventData->mPreEditLength ) )
{
CharacterIndex offset = mImpl->mEventData->mPrimaryCursorPosition - mImpl->mEventData->mPreEditStartPosition;
mImpl->ChangeState( EventData::EDITING );
// Handle the IMF (predicitive text) state changes
- if( mImpl->mEventData )
+ if( COMMIT == type )
{
- if( COMMIT == type )
- {
- // IMF manager is no longer handling key-events
- mImpl->ClearPreEditFlag();
- }
- else // PRE_EDIT
+ // IMF manager is no longer handling key-events
+ mImpl->ClearPreEditFlag();
+ }
+ else // PRE_EDIT
+ {
+ if( !mImpl->mEventData->mPreEditFlag )
{
- if( !mImpl->mEventData->mPreEditFlag )
- {
- DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Entered PreEdit state" );
+ DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Entered PreEdit state" );
- // Record the start of the pre-edit text
- mImpl->mEventData->mPreEditStartPosition = mImpl->mEventData->mPrimaryCursorPosition;
- }
+ // Record the start of the pre-edit text
+ mImpl->mEventData->mPreEditStartPosition = mImpl->mEventData->mPrimaryCursorPosition;
+ }
- mImpl->mEventData->mPreEditLength = utf32Characters.Count();
- mImpl->mEventData->mPreEditFlag = true;
+ mImpl->mEventData->mPreEditLength = utf32Characters.Count();
+ mImpl->mEventData->mPreEditFlag = true;
- DALI_LOG_INFO( gLogFilter, Debug::Verbose, "mPreEditStartPosition %d mPreEditLength %d\n", mImpl->mEventData->mPreEditStartPosition, mImpl->mEventData->mPreEditLength );
- }
+ DALI_LOG_INFO( gLogFilter, Debug::Verbose, "mPreEditStartPosition %d mPreEditLength %d\n", mImpl->mEventData->mPreEditStartPosition, mImpl->mEventData->mPreEditLength );
}
const Length numberOfCharactersInModel = mImpl->mLogicalModel->mText.Count();
// The cursor position.
CharacterIndex& cursorIndex = mImpl->mEventData->mPrimaryCursorPosition;
- // Update the text's style.
- if( mImpl->mEventData )
- {
- // Updates the text style runs.
- mImpl->mLogicalModel->UpdateTextStyleRuns( cursorIndex, maxSizeOfNewText );
+ // Updates the text style runs.
+ mImpl->mLogicalModel->UpdateTextStyleRuns( cursorIndex, maxSizeOfNewText );
- // Get the character index from the cursor index.
- const CharacterIndex styleIndex = ( cursorIndex > 0u ) ? cursorIndex - 1u : 0u;
+ // Get the character index from the cursor index.
+ const CharacterIndex styleIndex = ( cursorIndex > 0u ) ? cursorIndex - 1u : 0u;
- // Retrieve the text's style for the given index.
- InputStyle style;
- mImpl->mLogicalModel->RetrieveStyle( styleIndex, style );
+ // Retrieve the text's style for the given index.
+ InputStyle style;
+ mImpl->mLogicalModel->RetrieveStyle( styleIndex, style );
- // Whether to add a new text color run.
- const bool addColorRun = style.textColor != mImpl->mEventData->mInputStyle.textColor;
+ // Whether to add a new text color run.
+ const bool addColorRun = style.textColor != mImpl->mEventData->mInputStyle.textColor;
- // Add style runs.
- if( addColorRun )
- {
- const VectorBase::SizeType numberOfRuns = mImpl->mLogicalModel->mColorRuns.Count();
- mImpl->mLogicalModel->mColorRuns.Resize( numberOfRuns + 1u );
+ // Add style runs.
+ if( addColorRun )
+ {
+ const VectorBase::SizeType numberOfRuns = mImpl->mLogicalModel->mColorRuns.Count();
+ mImpl->mLogicalModel->mColorRuns.Resize( numberOfRuns + 1u );
- ColorRun& colorRun = *( mImpl->mLogicalModel->mColorRuns.Begin() + numberOfRuns );
- colorRun.color = mImpl->mEventData->mInputStyle.textColor;
- colorRun.characterRun.characterIndex = cursorIndex;
- colorRun.characterRun.numberOfCharacters = maxSizeOfNewText;
- }
+ ColorRun& colorRun = *( mImpl->mLogicalModel->mColorRuns.Begin() + numberOfRuns );
+ colorRun.color = mImpl->mEventData->mInputStyle.textColor;
+ colorRun.characterRun.characterIndex = cursorIndex;
+ colorRun.characterRun.numberOfCharacters = maxSizeOfNewText;
}
// Insert at current cursor position.
DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Inserted %d characters, new size %d new cursor %d\n", maxSizeOfNewText, mImpl->mLogicalModel->mText.Count(), mImpl->mEventData->mPrimaryCursorPosition );
}
- if( 0u == mImpl->mLogicalModel->mText.Count() &&
+ if( ( 0u == mImpl->mLogicalModel->mText.Count() ) &&
mImpl->IsPlaceholderAvailable() )
{
// Show place-holder if empty after removing the pre-edit text
mImpl->ClearPreEditFlag();
}
else if( removedPrevious ||
- 0 != utf32Characters.Count() )
+ ( 0 != utf32Characters.Count() ) )
{
// Queue an inserted event
mImpl->QueueModifyEvent( ModifyEvent::TEXT_INSERTED );
// This is to avoid unnecessary relayouts when tapping an empty text-field
bool relayoutNeeded( false );
- if ( EventData::EDITING_WITH_PASTE_POPUP == mImpl->mEventData->mState || EventData::EDITING_WITH_PASTE_POPUP == mImpl->mEventData->mState )
+ if( ( EventData::EDITING_WITH_PASTE_POPUP == mImpl->mEventData->mState ) ||
+ ( EventData::EDITING_WITH_PASTE_POPUP == mImpl->mEventData->mState ) )
{
mImpl->ChangeState( EventData::EDITING_WITH_GRAB_HANDLE); // If Popup shown hide it here so can be shown again if required.
}
- if( mImpl->IsShowingRealText() && ( EventData::INACTIVE != mImpl->mEventData->mState ) )
+ if( mImpl->IsShowingRealText() && ( EventData::INACTIVE != mImpl->mEventData->mState ) )
{
// Already in an active state so show a popup
- if ( !mImpl->IsClipboardEmpty() )
+ if( !mImpl->IsClipboardEmpty() )
{
// Shows Paste popup but could show full popup with Selection options. ( EDITING_WITH_POPUP )
mImpl->ChangeState( EventData::EDITING_WITH_PASTE_POPUP );
}
else
{
- if( mImpl->IsShowingPlaceholderText() && !mImpl->IsFocusedPlaceholderAvailable() )
+ if( mImpl->IsShowingPlaceholderText() && !mImpl->IsFocusedPlaceholderAvailable() )
{
// Hide placeholder text
ResetText();
}
- if ( EventData::INACTIVE == mImpl->mEventData->mState )
+ if( EventData::INACTIVE == mImpl->mEventData->mState )
{
mImpl->ChangeState( EventData::EDITING );
}
- else if ( !mImpl->IsClipboardEmpty() )
+ else if( !mImpl->IsClipboardEmpty() )
{
mImpl->ChangeState( EventData::EDITING_WITH_POPUP );
}
{
DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected PanEvent" );
- if( mImpl->mEventData )
+ if( NULL != mImpl->mEventData )
{
Event event( Event::PAN_EVENT );
event.p1.mInt = state;
{
DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected LongPressEvent" );
- if( state == Gesture::Started &&
- mImpl->mEventData )
+ if( ( state == Gesture::Started ) &&
+ ( NULL != mImpl->mEventData ) )
{
- if( ! mImpl->IsShowingRealText() )
+ if( !mImpl->IsShowingRealText() )
{
Event event( Event::LONG_PRESS_EVENT );
event.p1.mInt = state;
{
DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::SelectEvent\n" );
- if( mImpl->mEventData )
+ if( NULL != mImpl->mEventData )
{
mImpl->ChangeState( EventData::SELECTING );
{
DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected DecorationEvent" );
- if( mImpl->mEventData )
+ if( NULL != mImpl->mEventData )
{
switch( handleType )
{
NotifyImfManager();
}
- if( 0u != mImpl->mLogicalModel->mText.Count() ||
+ if( ( 0u != mImpl->mLogicalModel->mText.Count() ) ||
!mImpl->IsPlaceholderAvailable() )
{
mImpl->QueueModifyEvent( ModifyEvent::TEXT_DELETED );
{
const Vector2& currentCursorPosition = mImpl->mEventData->mDecorator->GetPosition( PRIMARY_CURSOR );
- if( mImpl->mEventData->mSelectionEnabled )
+ if( mImpl->mEventData->mSelectionEnabled )
{
// Creates a SELECT event.
SelectEvent( currentCursorPosition.x, currentCursorPosition.y, false );
bool requestRelayout = false;
std::string text;
- unsigned int cursorPosition( 0 );
+ unsigned int cursorPosition = 0u;
- switch ( imfEvent.eventName )
+ switch( imfEvent.eventName )
{
case ImfManager::COMMIT:
{
InsertText( imfEvent.predictiveString, Text::Controller::COMMIT );
- update=true;
+ update = true;
requestRelayout = true;
break;
}
if( update )
{
- if( 0u != mImpl->mLogicalModel->mText.Count() ||
+ if( ( 0u != mImpl->mLogicalModel->mText.Count() ) ||
!mImpl->IsPlaceholderAvailable() )
{
mImpl->QueueModifyEvent( ModifyEvent::TEXT_DELETED );
{
DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::KeyEvent %p DALI_KEY_BACKSPACE\n", this );
+ bool removed = false;
+
+ if( NULL == mImpl->mEventData )
+ {
+ return removed;
+ }
+
// IMF manager is no longer handling key-events
mImpl->ClearPreEditFlag();
- bool removed( false );
-
if( EventData::SELECTING == mImpl->mEventData->mState )
{
removed = RemoveSelectedText();
// Automatic Upper-case and restarting prediction on an existing word require this.
NotifyImfManager();
- if( 0u != mImpl->mLogicalModel->mText.Count() ||
+ if( ( 0u != mImpl->mLogicalModel->mText.Count() ) ||
!mImpl->IsPlaceholderAvailable() )
{
mImpl->QueueModifyEvent( ModifyEvent::TEXT_DELETED );
void Controller::NotifyImfManager()
{
- if( mImpl->mEventData )
+ if( NULL != mImpl->mEventData )
{
if( mImpl->mEventData->mImfManager )
{
{
DALI_ASSERT_DEBUG( mImpl->mEventData && "No placeholder text available" );
+ if( NULL == mImpl->mEventData )
+ {
+ return;
+ }
+
mImpl->mEventData->mIsShowingPlaceholderText = true;
// Disable handles when showing place-holder text
size_t size( 0 );
// TODO - Switch placeholder text styles when changing state
- if( EventData::INACTIVE != mImpl->mEventData->mState &&
- 0u != mImpl->mEventData->mPlaceholderTextActive.c_str() )
+ if( ( EventData::INACTIVE != mImpl->mEventData->mState ) &&
+ ( 0u != mImpl->mEventData->mPlaceholderTextActive.c_str() ) )
{
text = mImpl->mEventData->mPlaceholderTextActive.c_str();
size = mImpl->mEventData->mPlaceholderTextActive.size();