Remove alignment from text controller.

Change-Id: Id5adba2797c32b2613cb5c809f97d7c201e236db
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>

diff --git a/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
index 57a66ca..aad20f9 100644 (file)
--- a/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
@@ -883,11 +883,9 @@ void TextEditor::RenderText()
 
   if( mRenderableActor )
   {
 
   if( mRenderableActor )
   {

-    // TODO: Scroll and alignment needs to be refactored.
-    const Vector2& alignmentOffset = mController->GetAlignmentOffset();

     const Vector2& scrollOffset = mController->GetScrollPosition();
 
     const Vector2& scrollOffset = mController->GetScrollPosition();
 

-    mRenderableActor.SetPosition( scrollOffset.x, alignmentOffset.y + scrollOffset.y );
+    mRenderableActor.SetPosition( scrollOffset.x, scrollOffset.y );

 
     Actor clipRootActor;
     if( mClipper )
 
     Actor clipRootActor;
     if( mClipper )

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 f88dcb7..48ae1fe 100644 (file)
--- a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
@@ -1105,11 +1105,9 @@ void TextField::RenderText()
 
   if( mRenderableActor )
   {
 
   if( mRenderableActor )
   {

-    // TODO: Scroll and alignment needs to be refactored.
-    const Vector2& alignmentOffset = mController->GetAlignmentOffset();

     const Vector2& scrollOffset = mController->GetScrollPosition();
 
     const Vector2& scrollOffset = mController->GetScrollPosition();
 

-    mRenderableActor.SetPosition( scrollOffset.x, alignmentOffset.y + scrollOffset.y );
+    mRenderableActor.SetPosition( scrollOffset.x, scrollOffset.y );

 
     Actor clipRootActor;
     if( mClipper )
 
     Actor clipRootActor;
     if( mClipper )

diff --git a/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
index cefe7ad..9580518 100644 (file)
--- a/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
@@ -664,9 +664,8 @@ void TextLabel::RenderText()
 
     if( renderableActor )
     {
 
     if( renderableActor )
     {

-      // TODO: Scroll and alignment needs to be refactored.
-      const Vector2& alignmentOffset = mController->GetAlignmentOffset();
-      renderableActor.SetPosition( 0.f, alignmentOffset.y );
+      const Vector2& scrollOffset = mController->GetScrollPosition();
+      renderableActor.SetPosition( scrollOffset.x, scrollOffset.y );

 
       self.Add( renderableActor );
     }
 
       self.Add( renderableActor );
     }


@@ -683,15 +682,15 @@ void TextLabel::SetUpAutoScrolling()
 {
   const Size& controlSize = mController->GetView().GetControlSize();
   const Size offScreenSize = GetNaturalSize().GetVectorXY(); // As relayout of text may not be done at this point natural size is used to get size. Single line scrolling only.
 {
   const Size& controlSize = mController->GetView().GetControlSize();
   const Size offScreenSize = GetNaturalSize().GetVectorXY(); // As relayout of text may not be done at this point natural size is used to get size. Single line scrolling only.

-  const Vector2& alignmentOffset = mController->GetAlignmentOffset();
+  const float alignmentOffset = mController->GetAutoScrollLineAlignment();

   const Text::CharacterDirection direction = mController->GetAutoScrollDirection();
 
   const Text::CharacterDirection direction = mController->GetAutoScrollDirection();
 

-  DALI_LOG_INFO( gLogFilter, Debug::General, "TextLabel::SetUpAutoScrolling alignmentOffset[%f,%f] offScreenSize[%f,%f] controlSize[%f,%f]\n",
-                 alignmentOffset.x, alignmentOffset.y, offScreenSize.x,offScreenSize.y , controlSize.x,controlSize.y);
+  DALI_LOG_INFO( gLogFilter, Debug::General, "TextLabel::SetUpAutoScrolling alignmentOffset[%f] offScreenSize[%f,%f] controlSize[%f,%f]\n",
+                 alignmentOffset, offScreenSize.x,offScreenSize.y , controlSize.x,controlSize.y );

 
   if ( !mTextScroller )
   {
 
   if ( !mTextScroller )
   {

-    DALI_LOG_INFO( gLogFilter, Debug::General, "TextLabel::SetUpAutoScrolling Creating default TextScoller\n");
+    DALI_LOG_INFO( gLogFilter, Debug::General, "TextLabel::SetUpAutoScrolling Creating default TextScoller\n" );

 
     // If speed, loopCount or gap not set via property system then will need to create a TextScroller with defaults
     mTextScroller = Text::TextScroller::New( *this );
 
     // If speed, loopCount or gap not set via property system then will need to create a TextScroller with defaults
     mTextScroller = Text::TextScroller::New( *this );

diff --git a/dali-toolkit/internal/text/cursor-helper-functions.cpp b/dali-toolkit/internal/text/cursor-helper-functions.cpp
index 1bce75a..030effc 100644 (file)
--- a/dali-toolkit/internal/text/cursor-helper-functions.cpp
+++ b/dali-toolkit/internal/text/cursor-helper-functions.cpp
@@ -55,6 +55,7 @@ LineIndex GetClosestLine( VisualModelPtr visualModel,
   {
     const LineRun& lineRun = lines[lineIndex];
     totalHeight += lineRun.ascender + -lineRun.descender;
   {
     const LineRun& lineRun = lines[lineIndex];
     totalHeight += lineRun.ascender + -lineRun.descender;

+

     if( visualY < totalHeight )
     {
       return lineIndex;
     if( visualY < totalHeight )
     {
       return lineIndex;


@@ -90,7 +91,10 @@ CharacterIndex GetClosestCursorIndex( VisualModelPtr visualModel,
   // Find which line is closest.
   const LineIndex lineIndex = Text::GetClosestLine( visualModel,
                                                     visualY );
   // Find which line is closest.
   const LineIndex lineIndex = Text::GetClosestLine( visualModel,
                                                     visualY );

-  const LineRun& line = visualModel->mLines[lineIndex];
+
+  // Convert from text's coords to line's coords.
+  const LineRun& line = *( visualModel->mLines.Begin() + lineIndex );
+  visualX -= line.alignmentOffset;

 
   // Get the positions of the glyphs.
   const Vector<Vector2>& positions = visualModel->mGlyphPositions;
 
   // Get the positions of the glyphs.
   const Vector<Vector2>& positions = visualModel->mGlyphPositions;


@@ -343,7 +347,7 @@ void GetCursorPosition( VisualModelPtr visualModel,
     glyphAdvance = static_cast<float>( numberOfGlyphAdvance ) * glyphMetrics.advance / static_cast<float>( primaryNumberOfCharacters );
   }
 
     glyphAdvance = static_cast<float>( numberOfGlyphAdvance ) * glyphMetrics.advance / static_cast<float>( primaryNumberOfCharacters );
   }
 

-  // Get the glyph position and x bearing.
+  // Get the glyph position and x bearing (in the line's coords).

   const Vector2& primaryPosition = *( glyphPositionsBuffer + primaryGlyphIndex );
 
   // Set the primary cursor's height.
   const Vector2& primaryPosition = *( glyphPositionsBuffer + primaryGlyphIndex );
 
   // Set the primary cursor's height.


@@ -353,6 +357,9 @@ void GetCursorPosition( VisualModelPtr visualModel,
   cursorInfo.primaryPosition.x = -glyphMetrics.xBearing + primaryPosition.x + glyphAdvance;
   cursorInfo.primaryPosition.y = line.ascender - glyphMetrics.ascender;
 
   cursorInfo.primaryPosition.x = -glyphMetrics.xBearing + primaryPosition.x + glyphAdvance;
   cursorInfo.primaryPosition.y = line.ascender - glyphMetrics.ascender;
 

+  // Transform the cursor info from line's coords to text's coords.
+  cursorInfo.primaryPosition.x += line.alignmentOffset;
+

   // Calculate the secondary cursor.
 
   if( cursorInfo.isSecondaryCursor )
   // Calculate the secondary cursor.
 
   if( cursorInfo.isSecondaryCursor )


@@ -380,6 +387,9 @@ void GetCursorPosition( VisualModelPtr visualModel,
     // Set the secondary cursor's position.
     cursorInfo.secondaryPosition.x = -glyphMetrics.xBearing + secondaryPosition.x + ( isCurrentRightToLeft ? 0.f : glyphMetrics.advance );
     cursorInfo.secondaryPosition.y = cursorInfo.lineHeight - cursorInfo.secondaryCursorHeight - line.descender - ( glyphMetrics.fontHeight - glyphMetrics.ascender );
     // Set the secondary cursor's position.
     cursorInfo.secondaryPosition.x = -glyphMetrics.xBearing + secondaryPosition.x + ( isCurrentRightToLeft ? 0.f : glyphMetrics.advance );
     cursorInfo.secondaryPosition.y = cursorInfo.lineHeight - cursorInfo.secondaryCursorHeight - line.descender - ( glyphMetrics.fontHeight - glyphMetrics.ascender );

+
+    // Transform the cursor info from line's coords to text's coords.
+    cursorInfo.secondaryPosition.x += line.alignmentOffset;

   }
 }
 
   }
 }
 

diff --git a/dali-toolkit/internal/text/cursor-helper-functions.h b/dali-toolkit/internal/text/cursor-helper-functions.h
index 7ce02bf..08c21a3 100644 (file)
--- a/dali-toolkit/internal/text/cursor-helper-functions.h
+++ b/dali-toolkit/internal/text/cursor-helper-functions.h
@@ -47,8 +47,8 @@ struct CursorInfo
   ~CursorInfo()
   {}
 
   ~CursorInfo()
   {}
 

-  Vector2 primaryPosition;       ///< The primary cursor's position.
-  Vector2 secondaryPosition;     ///< The secondary cursor's position.
+  Vector2 primaryPosition;       ///< The primary cursor's position (in text's coords).
+  Vector2 secondaryPosition;     ///< The secondary cursor's position (in text's coords).

   float   lineOffset;            ///< The vertical offset where the line containing the cursor starts.
   float   lineHeight;            ///< The height of the line where the cursor is placed.
   float   primaryCursorHeight;   ///< The primary cursor's height.
   float   lineOffset;            ///< The vertical offset where the line containing the cursor starts.
   float   lineHeight;            ///< The height of the line where the cursor is placed.
   float   primaryCursorHeight;   ///< The primary cursor's height.


@@ -61,6 +61,9 @@ struct CursorInfo
  *
  * It returns the first line if the touch point is above the text and the last line if the touch point is below.
  *
  *
  * It returns the first line if the touch point is above the text and the last line if the touch point is below.
  *

+ * @param[in] visualModel The visual model.
+ * @param[in] visualY The touch point 'y' in text's coords.
+ *

  * @return A line index.
  */
 LineIndex GetClosestLine( VisualModelPtr visualModel,
  * @return A line index.
  */
 LineIndex GetClosestLine( VisualModelPtr visualModel,


@@ -72,8 +75,8 @@ LineIndex GetClosestLine( VisualModelPtr visualModel,
  * @param[in] visualModel The visual model.
  * @param[in] logicalModel The logical model.
  * @param[in] metrics A wrapper around FontClient used to get metrics.
  * @param[in] visualModel The visual model.
  * @param[in] logicalModel The logical model.
  * @param[in] metrics A wrapper around FontClient used to get metrics.

- * @param[in] visualX The touch point x.
- * @param[in] visualY The touch point y.
+ * @param[in] visualX The touch point 'x' in text's coords.
+ * @param[in] visualY The touch point 'y' in text's coords.

  *
  * @return The logical cursor position (in characters). 0 is just before the first character, a value equal to the number of characters is just after the last character.
  */
  *
  * @return The logical cursor position (in characters). 0 is just before the first character, a value equal to the number of characters is just after the last character.
  */


@@ -90,6 +93,9 @@ CharacterIndex GetClosestCursorIndex( VisualModelPtr visualModel,
  * It retrieves as well the line's height and the cursor's height and
  * if there is a valid alternative cursor, its position and height.
  *
  * It retrieves as well the line's height and the cursor's height and
  * if there is a valid alternative cursor, its position and height.
  *

+ * @param[in] visualModel The visual model.
+ * @param[in] logicalModel The logical model.
+ * @param[in] metrics A wrapper around FontClient used to get metrics.

  * @param[in] logical The logical cursor position (in characters). 0 is just before the first character, a value equal to the number of characters is just after the last character.
  * @param[out] cursorInfo The line's height, the cursor's height, the cursor's position and whether there is an alternative cursor.
  */
  * @param[in] logical The logical cursor position (in characters). 0 is just before the first character, a value equal to the number of characters is just after the last character.
  * @param[out] cursorInfo The line's height, the cursor's height, the cursor's position and whether there is an alternative cursor.
  */


@@ -100,7 +106,15 @@ void GetCursorPosition( VisualModelPtr visualModel,
                         CursorInfo& cursorInfo );
 
 /**
                         CursorInfo& cursorInfo );
 
 /**

+ * @brief Find the indices to the first and last characters of a word for the given touch point.

  *
  *

+ * @param[in] visualModel The visual model.
+ * @param[in] logicalModel The logical model.
+ * @param[in] metrics A wrapper around FontClient used to get metrics.
+ * @param[in] visualX The touch point 'x' in text's coords.
+ * @param[in] visualY The touch point 'y' in text's coords.
+ * @param[out] startIndex Index to the first character of the selected word.
+ * @param[out] endIndex Index to the last character of the selected word.

  */
 void FindSelectionIndices( VisualModelPtr visualModel,
                            LogicalModelPtr logicalModel,
  */
 void FindSelectionIndices( VisualModelPtr visualModel,
                            LogicalModelPtr logicalModel,

diff --git a/dali-toolkit/internal/text/text-controller-impl.cpp b/dali-toolkit/internal/text/text-controller-impl.cpp
index 7bbf04d..187c3f7 100644 (file)
--- a/dali-toolkit/internal/text/text-controller-impl.cpp
+++ b/dali-toolkit/internal/text/text-controller-impl.cpp
@@ -57,7 +57,6 @@ EventData::EventData( DecoratorPtr decorator )
   mPlaceholderTextInactive(),
   mPlaceholderTextColor( 0.8f, 0.8f, 0.8f, 0.8f ),
   mEventQueue(),
   mPlaceholderTextInactive(),
   mPlaceholderTextColor( 0.8f, 0.8f, 0.8f, 0.8f ),
   mEventQueue(),

-  mScrollPosition(),

   mState( INACTIVE ),
   mPrimaryCursorPosition( 0u ),
   mLeftSelectionPosition( 0u ),
   mState( INACTIVE ),
   mPrimaryCursorPosition( 0u ),
   mLeftSelectionPosition( 0u ),


@@ -1001,8 +1000,9 @@ void Controller::Impl::OnTapEvent( const Event& event )
     {
       if( IsShowingRealText() )
       {
     {
       if( IsShowingRealText() )
       {

-        const float xPosition = event.p2.mFloat - mEventData->mScrollPosition.x - mAlignmentOffset.x;
-        const float yPosition = event.p3.mFloat - mEventData->mScrollPosition.y - mAlignmentOffset.y;
+        // Convert from control's coords to text's coords.
+        const float xPosition = event.p2.mFloat - mScrollPosition.x;
+        const float yPosition = event.p3.mFloat - mScrollPosition.y;

 
         mEventData->mPrimaryCursorPosition = Text::GetClosestCursorIndex( mVisualModel,
                                                                           mLogicalModel,
 
         mEventData->mPrimaryCursorPosition = Text::GetClosestCursorIndex( mVisualModel,
                                                                           mLogicalModel,


@@ -1042,16 +1042,16 @@ void Controller::Impl::OnPanEvent( const Event& event )
 
   int state = event.p1.mInt;
 
 
   int state = event.p1.mInt;
 

-  if( Gesture::Started    == state ||
-      Gesture::Continuing == state )
+  if( ( Gesture::Started == state ) ||
+      ( Gesture::Continuing == state ) )

   {
     const Vector2& actualSize = mVisualModel->GetLayoutSize();
   {
     const Vector2& actualSize = mVisualModel->GetLayoutSize();

-    const Vector2 currentScroll = mEventData->mScrollPosition;
+    const Vector2 currentScroll = mScrollPosition;

 
     if( mEventData->mHorizontalScrollingEnabled )
     {
       const float displacementX = event.p2.mFloat;
 
     if( mEventData->mHorizontalScrollingEnabled )
     {
       const float displacementX = event.p2.mFloat;

-      mEventData->mScrollPosition.x += displacementX;
+      mScrollPosition.x += displacementX;

 
       ClampHorizontalScroll( actualSize );
     }
 
       ClampHorizontalScroll( actualSize );
     }


@@ -1059,14 +1059,14 @@ void Controller::Impl::OnPanEvent( const Event& event )
     if( mEventData->mVerticalScrollingEnabled )
     {
       const float displacementY = event.p3.mFloat;
     if( mEventData->mVerticalScrollingEnabled )
     {
       const float displacementY = event.p3.mFloat;

-      mEventData->mScrollPosition.y += displacementY;
+      mScrollPosition.y += displacementY;

 
       ClampVerticalScroll( actualSize );
     }
 
     if( mEventData->mDecorator )
     {
 
       ClampVerticalScroll( actualSize );
     }
 
     if( mEventData->mDecorator )
     {

-      mEventData->mDecorator->UpdatePositions( mEventData->mScrollPosition - currentScroll );
+      mEventData->mDecorator->UpdatePositions( mScrollPosition - currentScroll );

     }
   }
 }
     }
   }
 }


@@ -1095,9 +1095,9 @@ void Controller::Impl::OnHandleEvent( const Event& event )
 
   if( HANDLE_PRESSED == state )
   {
 
   if( HANDLE_PRESSED == state )
   {

-    // The event.p2 and event.p3 are in decorator coords. Need to transforms to text coords.
-    const float xPosition = event.p2.mFloat - mEventData->mScrollPosition.x - mAlignmentOffset.x;
-    const float yPosition = event.p3.mFloat - mEventData->mScrollPosition.y - mAlignmentOffset.y;
+    // Convert from decorator's coords to text's coords.
+    const float xPosition = event.p2.mFloat - mScrollPosition.x;
+    const float yPosition = event.p3.mFloat - mScrollPosition.y;

 
     const CharacterIndex handleNewPosition = Text::GetClosestCursorIndex( mVisualModel,
                                                                           mLogicalModel,
 
     const CharacterIndex handleNewPosition = Text::GetClosestCursorIndex( mVisualModel,
                                                                           mLogicalModel,


@@ -1146,9 +1146,9 @@ void Controller::Impl::OnHandleEvent( const Event& event )
     CharacterIndex handlePosition = 0u;
     if( handleStopScrolling )
     {
     CharacterIndex handlePosition = 0u;
     if( handleStopScrolling )
     {

-      // The event.p2 and event.p3 are in decorator coords. Need to transforms to text coords.
-      const float xPosition = event.p2.mFloat - mEventData->mScrollPosition.x - mAlignmentOffset.x;
-      const float yPosition = event.p3.mFloat - mEventData->mScrollPosition.y - mAlignmentOffset.y;
+      // Convert from decorator's coords to text's coords.
+      const float xPosition = event.p2.mFloat - mScrollPosition.x;
+      const float yPosition = event.p3.mFloat - mScrollPosition.y;

 
       handlePosition = Text::GetClosestCursorIndex( mVisualModel,
                                                     mLogicalModel,
 
       handlePosition = Text::GetClosestCursorIndex( mVisualModel,
                                                     mLogicalModel,


@@ -1209,14 +1209,14 @@ void Controller::Impl::OnHandleEvent( const Event& event )
   {
     const float xSpeed = event.p2.mFloat;
     const Vector2& actualSize = mVisualModel->GetLayoutSize();
   {
     const float xSpeed = event.p2.mFloat;
     const Vector2& actualSize = mVisualModel->GetLayoutSize();

-    const Vector2 currentScrollPosition = mEventData->mScrollPosition;
+    const Vector2 currentScrollPosition = mScrollPosition;

 
 

-    mEventData->mScrollPosition.x += xSpeed;
+    mScrollPosition.x += xSpeed;

 
     ClampHorizontalScroll( actualSize );
 
     bool endOfScroll = false;
 
     ClampHorizontalScroll( actualSize );
 
     bool endOfScroll = false;

-    if( Vector2::ZERO == ( currentScrollPosition - mEventData->mScrollPosition ) )
+    if( Vector2::ZERO == ( currentScrollPosition - mScrollPosition ) )

     {
       // Notify the decorator there is no more text to scroll.
       // The decorator won't send more scroll events.
     {
       // Notify the decorator there is no more text to scroll.
       // The decorator won't send more scroll events.


@@ -1240,12 +1240,12 @@ void Controller::Impl::OnHandleEvent( const Event& event )
       position.x = scrollRightDirection ? 0.f : mVisualModel->mControlSize.width;
 
       // Get the new handle position.
       position.x = scrollRightDirection ? 0.f : mVisualModel->mControlSize.width;
 
       // Get the new handle position.

-      // The grab handle's position is in decorator coords. Need to transforms to text coords.
+      // The grab handle's position is in decorator's coords. Need to transforms to text's coords.

       const CharacterIndex handlePosition = Text::GetClosestCursorIndex( mVisualModel,
                                                                          mLogicalModel,
                                                                          mMetrics,
       const CharacterIndex handlePosition = Text::GetClosestCursorIndex( mVisualModel,
                                                                          mLogicalModel,
                                                                          mMetrics,

-                                                                         position.x - mEventData->mScrollPosition.x - mAlignmentOffset.x,
-                                                                         position.y - mEventData->mScrollPosition.y - mAlignmentOffset.y );
+                                                                         position.x - mScrollPosition.x,
+                                                                         position.y - mScrollPosition.y );

 
       mEventData->mUpdateCursorPosition = mEventData->mPrimaryCursorPosition != handlePosition;
       mEventData->mScrollAfterUpdatePosition = mEventData->mUpdateCursorPosition;
 
       mEventData->mUpdateCursorPosition = mEventData->mPrimaryCursorPosition != handlePosition;
       mEventData->mScrollAfterUpdatePosition = mEventData->mUpdateCursorPosition;


@@ -1265,12 +1265,12 @@ void Controller::Impl::OnHandleEvent( const Event& event )
       position.x = scrollRightDirection ? 0.f : mVisualModel->mControlSize.width;
 
       // Get the new handle position.
       position.x = scrollRightDirection ? 0.f : mVisualModel->mControlSize.width;
 
       // Get the new handle position.

-      // The selection handle's position is in decorator coords. Need to transforms to text coords.
+      // The selection handle's position is in decorator's coords. Need to transform to text's coords.

       const CharacterIndex handlePosition = Text::GetClosestCursorIndex( mVisualModel,
                                                                          mLogicalModel,
                                                                          mMetrics,
       const CharacterIndex handlePosition = Text::GetClosestCursorIndex( mVisualModel,
                                                                          mLogicalModel,
                                                                          mMetrics,

-                                                                         position.x - mEventData->mScrollPosition.x - mAlignmentOffset.x,
-                                                                         position.y - mEventData->mScrollPosition.y - mAlignmentOffset.y );
+                                                                         position.x - mScrollPosition.x,
+                                                                         position.y - mScrollPosition.y );

 
       if( leftSelectionHandleEvent )
       {
 
       if( leftSelectionHandleEvent )
       {


@@ -1312,9 +1312,9 @@ void Controller::Impl::OnSelectEvent( const Event& event )
 
   if( mEventData->mSelectionEnabled )
   {
 
   if( mEventData->mSelectionEnabled )
   {

-    // The event.p2 and event.p3 are in decorator coords. Need to transforms to text coords.
-    const float xPosition = event.p2.mFloat - mEventData->mScrollPosition.x - mAlignmentOffset.x;
-    const float yPosition = event.p3.mFloat - mEventData->mScrollPosition.y - mAlignmentOffset.y;
+    // Convert from control's coords to text's coords.
+    const float xPosition = event.p2.mFloat - mScrollPosition.x;
+    const float yPosition = event.p3.mFloat - mScrollPosition.y;

 
     // Calculates the logical position from the x,y coords.
     RepositionSelectionHandles( xPosition,
 
     // Calculates the logical position from the x,y coords.
     RepositionSelectionHandles( xPosition,


@@ -1497,8 +1497,6 @@ void Controller::Impl::RepositionSelectionHandles()
   const Length numberOfCharactersEnd = *( charactersPerGlyphBuffer + glyphEnd );
   bool splitEndGlyph = ( glyphStart != glyphEnd ) && ( numberOfCharactersEnd > 1u ) && HasLigatureMustBreak( mLogicalModel->GetScript( selectionEndMinusOne ) );
 
   const Length numberOfCharactersEnd = *( charactersPerGlyphBuffer + glyphEnd );
   bool splitEndGlyph = ( glyphStart != glyphEnd ) && ( numberOfCharactersEnd > 1u ) && HasLigatureMustBreak( mLogicalModel->GetScript( selectionEndMinusOne ) );
 

-  const Vector2 offset = mEventData->mScrollPosition + mAlignmentOffset;
-

   // Traverse the glyphs.
   for( GlyphIndex index = glyphStart; index <= glyphEnd; ++index )
   {
   // Traverse the glyphs.
   for( GlyphIndex index = glyphStart; index <= glyphEnd; ++index )
   {


@@ -1522,12 +1520,12 @@ void Controller::Impl::RepositionSelectionHandles()
       // Calculate the number of characters selected.
       const Length numberOfCharacters = ( glyphStart == glyphEnd ) ? ( selectionEnd - selectionStart ) : ( numberOfCharactersStart - interGlyphIndex );
 
       // Calculate the number of characters selected.
       const Length numberOfCharacters = ( glyphStart == glyphEnd ) ? ( selectionEnd - selectionStart ) : ( numberOfCharactersStart - interGlyphIndex );
 

-      const float xPosition = position.x - glyph.xBearing + offset.x + glyphAdvance * static_cast<float>( isCurrentRightToLeft ? ( numberOfCharactersStart - interGlyphIndex - numberOfCharacters ) : interGlyphIndex );
+      const float xPosition = firstLine.alignmentOffset + position.x - glyph.xBearing + mScrollPosition.x + glyphAdvance * static_cast<float>( isCurrentRightToLeft ? ( numberOfCharactersStart - interGlyphIndex - numberOfCharacters ) : interGlyphIndex );

 
       mEventData->mDecorator->AddHighlight( xPosition,
 
       mEventData->mDecorator->AddHighlight( xPosition,

-                                            offset.y,
+                                            mScrollPosition.y,

                                             xPosition + static_cast<float>( numberOfCharacters ) * glyphAdvance,
                                             xPosition + static_cast<float>( numberOfCharacters ) * glyphAdvance,

-                                            offset.y + height );
+                                            mScrollPosition.y + height );

 
       splitStartGlyph = false;
       continue;
 
       splitStartGlyph = false;
       continue;


@@ -1548,21 +1546,21 @@ void Controller::Impl::RepositionSelectionHandles()
 
       const Length numberOfCharacters = numberOfCharactersEnd - interGlyphIndex;
 
 
       const Length numberOfCharacters = numberOfCharactersEnd - interGlyphIndex;
 

-      const float xPosition = position.x - glyph.xBearing + offset.x + ( isCurrentRightToLeft ? ( glyphAdvance * static_cast<float>( numberOfCharacters ) ) : 0.f );
+      const float xPosition = firstLine.alignmentOffset + position.x - glyph.xBearing + mScrollPosition.x + ( isCurrentRightToLeft ? ( glyphAdvance * static_cast<float>( numberOfCharacters ) ) : 0.f );

       mEventData->mDecorator->AddHighlight( xPosition,
       mEventData->mDecorator->AddHighlight( xPosition,

-                                            offset.y,
+                                            mScrollPosition.y,

                                             xPosition + static_cast<float>( interGlyphIndex ) * glyphAdvance,
                                             xPosition + static_cast<float>( interGlyphIndex ) * glyphAdvance,

-                                            offset.y + height );
+                                            mScrollPosition.y + height );

 
       splitEndGlyph = false;
       continue;
     }
 
 
       splitEndGlyph = false;
       continue;
     }
 

-    const float xPosition = position.x - glyph.xBearing + offset.x;
+    const float xPosition = firstLine.alignmentOffset + position.x - glyph.xBearing + mScrollPosition.x;

     mEventData->mDecorator->AddHighlight( xPosition,
     mEventData->mDecorator->AddHighlight( xPosition,

-                                          offset.y,
+                                          mScrollPosition.y,

                                           xPosition + glyph.advance,
                                           xPosition + glyph.advance,

-                                          offset.y + height );
+                                          mScrollPosition.y + height );

   }
 
   CursorInfo primaryCursorInfo;
   }
 
   CursorInfo primaryCursorInfo;


@@ -1573,17 +1571,17 @@ void Controller::Impl::RepositionSelectionHandles()
   GetCursorPosition( mEventData->mRightSelectionPosition,
                      secondaryCursorInfo );
 
   GetCursorPosition( mEventData->mRightSelectionPosition,
                      secondaryCursorInfo );
 

-  const Vector2 primaryPosition = primaryCursorInfo.primaryPosition + offset;
-  const Vector2 secondaryPosition = secondaryCursorInfo.primaryPosition + offset;
+  const Vector2 primaryPosition = primaryCursorInfo.primaryPosition + mScrollPosition;
+  const Vector2 secondaryPosition = secondaryCursorInfo.primaryPosition + mScrollPosition;

 
   mEventData->mDecorator->SetPosition( LEFT_SELECTION_HANDLE,
                                        primaryPosition.x,
 
   mEventData->mDecorator->SetPosition( LEFT_SELECTION_HANDLE,
                                        primaryPosition.x,

-                                       primaryCursorInfo.lineOffset + offset.y,
+                                       primaryCursorInfo.lineOffset + mScrollPosition.y,

                                        primaryCursorInfo.lineHeight );
 
   mEventData->mDecorator->SetPosition( RIGHT_SELECTION_HANDLE,
                                        secondaryPosition.x,
                                        primaryCursorInfo.lineHeight );
 
   mEventData->mDecorator->SetPosition( RIGHT_SELECTION_HANDLE,
                                        secondaryPosition.x,

-                                       secondaryCursorInfo.lineOffset + offset.y,
+                                       secondaryCursorInfo.lineOffset + mScrollPosition.y,

                                        secondaryCursorInfo.lineHeight );
 
   // Cursor to be positioned at end of selection so if selection interrupted and edit mode restarted the cursor will be at end of selection
                                        secondaryCursorInfo.lineHeight );
 
   // Cursor to be positioned at end of selection so if selection interrupted and edit mode restarted the cursor will be at end of selection


@@ -1893,25 +1891,6 @@ void Controller::Impl::GetCursorPosition( CharacterIndex logical,
       }
     }
 
       }
     }
 

-    switch( mLayoutEngine.GetVerticalAlignment() )
-    {
-      case LayoutEngine::VERTICAL_ALIGN_TOP:
-      {
-        cursorInfo.primaryPosition.y = 0.f;
-        break;
-      }
-      case LayoutEngine::VERTICAL_ALIGN_CENTER:
-      {
-        cursorInfo.primaryPosition.y = floorf( 0.5f * ( mVisualModel->mControlSize.height - cursorInfo.lineHeight ) );
-        break;
-      }
-      case LayoutEngine::VERTICAL_ALIGN_BOTTOM:
-      {
-        cursorInfo.primaryPosition.y = mVisualModel->mControlSize.height - cursorInfo.lineHeight;
-        break;
-      }
-    }
-

     // Nothing else to do.
     return;
   }
     // Nothing else to do.
     return;
   }


@@ -1998,8 +1977,7 @@ void Controller::Impl::UpdateCursorPosition( const CursorInfo& cursorInfo )
     return;
   }
 
     return;
   }
 

-  const Vector2 offset = mEventData->mScrollPosition + ( IsShowingRealText() ? mAlignmentOffset : Vector2::ZERO );
-  const Vector2 cursorPosition = cursorInfo.primaryPosition + offset;
+  const Vector2 cursorPosition = cursorInfo.primaryPosition + mScrollPosition;

 
   // Sets the cursor position.
   mEventData->mDecorator->SetPosition( PRIMARY_CURSOR,
 
   // Sets the cursor position.
   mEventData->mDecorator->SetPosition( PRIMARY_CURSOR,


@@ -2012,17 +1990,17 @@ void Controller::Impl::UpdateCursorPosition( const CursorInfo& cursorInfo )
   // Sets the grab handle position.
   mEventData->mDecorator->SetPosition( GRAB_HANDLE,
                                        cursorPosition.x,
   // Sets the grab handle position.
   mEventData->mDecorator->SetPosition( GRAB_HANDLE,
                                        cursorPosition.x,

-                                       cursorInfo.lineOffset + offset.y,
+                                       cursorInfo.lineOffset + mScrollPosition.y,

                                        cursorInfo.lineHeight );
 
   if( cursorInfo.isSecondaryCursor )
   {
     mEventData->mDecorator->SetPosition( SECONDARY_CURSOR,
                                        cursorInfo.lineHeight );
 
   if( cursorInfo.isSecondaryCursor )
   {
     mEventData->mDecorator->SetPosition( SECONDARY_CURSOR,

-                                         cursorInfo.secondaryPosition.x + offset.x,
-                                         cursorInfo.secondaryPosition.y + offset.y,
+                                         cursorInfo.secondaryPosition.x + mScrollPosition.x,
+                                         cursorInfo.secondaryPosition.y + mScrollPosition.y,

                                          cursorInfo.secondaryCursorHeight,
                                          cursorInfo.lineHeight );
                                          cursorInfo.secondaryCursorHeight,
                                          cursorInfo.lineHeight );

-    DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Secondary cursor position: %f,%f\n", cursorInfo.secondaryPosition.x + offset.x, cursorInfo.secondaryPosition.y + offset.y );
+    DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Secondary cursor position: %f,%f\n", cursorInfo.secondaryPosition.x + mScrollPosition.x, cursorInfo.secondaryPosition.y + mScrollPosition.y );

   }
 
   // Set which cursors are active according the state.
   }
 
   // Set which cursors are active according the state.


@@ -2054,13 +2032,12 @@ void Controller::Impl::UpdateSelectionHandle( HandleType handleType,
     return;
   }
 
     return;
   }
 

-  const Vector2 offset = mEventData->mScrollPosition + mAlignmentOffset;
-  const Vector2 cursorPosition = cursorInfo.primaryPosition + offset;
+  const Vector2 cursorPosition = cursorInfo.primaryPosition + mScrollPosition;

 
   // Sets the handle's position.
   mEventData->mDecorator->SetPosition( handleType,
                                        cursorPosition.x,
 
   // Sets the handle's position.
   mEventData->mDecorator->SetPosition( handleType,
                                        cursorPosition.x,

-                                       cursorInfo.lineOffset + offset.y,
+                                       cursorInfo.lineOffset + mScrollPosition.y,

                                        cursorInfo.lineHeight );
 
   // If selection handle at start of the text and other at end of the text then all text is selected.
                                        cursorInfo.lineHeight );
 
   // If selection handle at start of the text and other at end of the text then all text is selected.


@@ -2071,36 +2048,36 @@ void Controller::Impl::UpdateSelectionHandle( HandleType handleType,
 
 void Controller::Impl::ClampHorizontalScroll( const Vector2& actualSize )
 {
 
 void Controller::Impl::ClampHorizontalScroll( const Vector2& actualSize )
 {

-  // Clamp between -space & 0 (and the text alignment).
+  // Clamp between -space & 0.

 
   if( actualSize.width > mVisualModel->mControlSize.width )
   {
 
   if( actualSize.width > mVisualModel->mControlSize.width )
   {

-    const float space = ( actualSize.width - mVisualModel->mControlSize.width ) + mAlignmentOffset.x;
-    mEventData->mScrollPosition.x = ( mEventData->mScrollPosition.x < -space ) ? -space : mEventData->mScrollPosition.x;
-    mEventData->mScrollPosition.x = ( mEventData->mScrollPosition.x > -mAlignmentOffset.x ) ? -mAlignmentOffset.x : mEventData->mScrollPosition.x;
+    const float space = ( actualSize.width - mVisualModel->mControlSize.width );
+    mScrollPosition.x = ( mScrollPosition.x < -space ) ? -space : mScrollPosition.x;
+    mScrollPosition.x = ( mScrollPosition.x > 0.f ) ? 0.f : mScrollPosition.x;

 
     mEventData->mDecoratorUpdated = true;
   }
   else
   {
 
     mEventData->mDecoratorUpdated = true;
   }
   else
   {

-    mEventData->mScrollPosition.x = 0.f;
+    mScrollPosition.x = 0.f;

   }
 }
 
 void Controller::Impl::ClampVerticalScroll( const Vector2& actualSize )
 {
   }
 }
 
 void Controller::Impl::ClampVerticalScroll( const Vector2& actualSize )
 {

-  // Clamp between -space & 0 (and the text alignment).
+  // Clamp between -space & 0.

   if( actualSize.height > mVisualModel->mControlSize.height )
   {
   if( actualSize.height > mVisualModel->mControlSize.height )
   {

-    const float space = ( actualSize.height - mVisualModel->mControlSize.height ) + mAlignmentOffset.y;
-    mEventData->mScrollPosition.y = ( mEventData->mScrollPosition.y < -space ) ? -space : mEventData->mScrollPosition.y;
-    mEventData->mScrollPosition.y = ( mEventData->mScrollPosition.y > -mAlignmentOffset.y ) ? -mAlignmentOffset.y : mEventData->mScrollPosition.y;
+    const float space = ( actualSize.height - mVisualModel->mControlSize.height );
+    mScrollPosition.y = ( mScrollPosition.y < -space ) ? -space : mScrollPosition.y;
+    mScrollPosition.y = ( mScrollPosition.y > 0.f ) ? 0.f : mScrollPosition.y;

 
     mEventData->mDecoratorUpdated = true;
   }
   else
   {
 
     mEventData->mDecoratorUpdated = true;
   }
   else
   {

-    mEventData->mScrollPosition.y = 0.f;
+    mScrollPosition.y = 0.f;

   }
 }
 
   }
 }
 


@@ -2112,18 +2089,16 @@ void Controller::Impl::ScrollToMakePositionVisible( const Vector2& position )
   const float positionEnd = position.x + cursorWidth;
 
   // Transform the position to decorator coords.
   const float positionEnd = position.x + cursorWidth;
 
   // Transform the position to decorator coords.

-  const float alignment = IsShowingRealText() ? mAlignmentOffset.x : 0.f;
-  const float offset = mEventData->mScrollPosition.x + alignment;
-  const float decoratorPositionBegin = position.x + offset;
-  const float decoratorPositionEnd = positionEnd + offset;
+  const float decoratorPositionBegin = position.x + mScrollPosition.x;
+  const float decoratorPositionEnd = positionEnd + mScrollPosition.x;

 
   if( decoratorPositionBegin < 0.f )
   {
 
   if( decoratorPositionBegin < 0.f )
   {

-    mEventData->mScrollPosition.x = -position.x - alignment;
+    mScrollPosition.x = -position.x;

   }
   else if( decoratorPositionEnd > mVisualModel->mControlSize.width )
   {
   }
   else if( decoratorPositionEnd > mVisualModel->mControlSize.width )
   {

-    mEventData->mScrollPosition.x = mVisualModel->mControlSize.width - positionEnd - alignment;
+    mScrollPosition.x = mVisualModel->mControlSize.width - positionEnd;

   }
 }
 
   }
 }
 


@@ -2133,7 +2108,7 @@ void Controller::Impl::ScrollTextToMatchCursor( const CursorInfo& cursorInfo )
   const Vector2& currentCursorPosition = mEventData->mDecorator->GetPosition( PRIMARY_CURSOR );
 
   // Calculate the offset to match the cursor position before the character was deleted.
   const Vector2& currentCursorPosition = mEventData->mDecorator->GetPosition( PRIMARY_CURSOR );
 
   // Calculate the offset to match the cursor position before the character was deleted.

-  mEventData->mScrollPosition.x = currentCursorPosition.x - cursorInfo.primaryPosition.x - mAlignmentOffset.x;
+  mScrollPosition.x = currentCursorPosition.x - cursorInfo.primaryPosition.x;

 
   ClampHorizontalScroll( mVisualModel->GetLayoutSize() );
 
 
   ClampHorizontalScroll( mVisualModel->GetLayoutSize() );
 

diff --git a/dali-toolkit/internal/text/text-controller-impl.h b/dali-toolkit/internal/text/text-controller-impl.h
index 2031ab5..78133ea 100644 (file)
--- a/dali-toolkit/internal/text/text-controller-impl.h
+++ b/dali-toolkit/internal/text/text-controller-impl.h
@@ -117,12 +117,6 @@ struct EventData
 
   InputStyle         mInputStyle;              ///< The style to be set to the new inputed text.
 
 
   InputStyle         mInputStyle;              ///< The style to be set to the new inputed text.
 

-  /**
-   * 0,0 means that the top-left corner of the layout matches the top-left corner of the UI control.
-   * Typically this will have a negative value with scrolling occurs.
-   */
-  Vector2            mScrollPosition;          ///< The text is offset by this position when scrolling.
-

   State              mState;                   ///< Selection mode, edit mode etc.
 
   CharacterIndex     mPrimaryCursorPosition;   ///< Index into logical model for primary cursor.
   State              mState;                   ///< Selection mode, edit mode etc.
 
   CharacterIndex     mPrimaryCursorPosition;   ///< Index into logical model for primary cursor.


@@ -274,7 +268,6 @@ struct Controller::Impl
     mLayoutEngine(),
     mModifyEvents(),
     mTextColor( Color::BLACK ),
     mLayoutEngine(),
     mModifyEvents(),
     mTextColor( Color::BLACK ),

-    mAlignmentOffset(),

     mTextUpdateInfo(),
     mOperationsPending( NO_OPERATION ),
     mMaximumNumberOfCharacters( 50u ),
     mTextUpdateInfo(),
     mOperationsPending( NO_OPERATION ),
     mMaximumNumberOfCharacters( 50u ),


@@ -624,7 +617,11 @@ public:
   LayoutEngine mLayoutEngine;              ///< The layout engine.
   Vector<ModifyEvent> mModifyEvents;       ///< Temporary stores the text set until the next relayout.
   Vector4 mTextColor;                      ///< The regular text color
   LayoutEngine mLayoutEngine;              ///< The layout engine.
   Vector<ModifyEvent> mModifyEvents;       ///< Temporary stores the text set until the next relayout.
   Vector4 mTextColor;                      ///< The regular text color

-  Vector2 mAlignmentOffset;                ///< Vertical and horizontal offset of the whole text inside the control due to alignment.
+  /**
+   * 0,0 means that the top-left corner of the layout matches the top-left corner of the UI control.
+   * Typically this will have a negative value with scrolling occurs.
+   */
+  Vector2 mScrollPosition;                 ///< The text is offset by this position when scrolling.

   TextUpdateInfo mTextUpdateInfo;          ///< Info of the characters updated.
   OperationsMask mOperationsPending;       ///< Operations pending to be done to layout the text.
   Length mMaximumNumberOfCharacters;       ///< Maximum number of characters that can be inserted.
   TextUpdateInfo mTextUpdateInfo;          ///< Info of the characters updated.
   OperationsMask mOperationsPending;       ///< Operations pending to be done to layout the text.
   Length mMaximumNumberOfCharacters;       ///< Maximum number of characters that can be inserted.

diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp
index 09a4441..c41b78c 100644 (file)
--- a/dali-toolkit/internal/text/text-controller.cpp
+++ b/dali-toolkit/internal/text/text-controller.cpp
@@ -181,6 +181,19 @@ CharacterDirection Controller::GetAutoScrollDirection() const
   return mImpl->mAutoScrollDirectionRTL;
 }
 
   return mImpl->mAutoScrollDirectionRTL;
 }
 

+float Controller::GetAutoScrollLineAlignment() const
+{
+  float offset = 0.f;
+
+  if( mImpl->mVisualModel &&
+      ( 0u != mImpl->mVisualModel->mLines.Count() ) )
+  {
+    offset = ( *mImpl->mVisualModel->mLines.Begin() ).alignmentOffset;
+  }
+
+  return offset;
+}
+

 void Controller::SetText( const std::string& text )
 {
   DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::SetText\n" );
 void Controller::SetText( const std::string& text )
 {
   DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::SetText\n" );


@@ -1072,17 +1085,7 @@ bool Controller::GetEnableCursorBlink() const
 
 const Vector2& Controller::GetScrollPosition() const
 {
 
 const Vector2& Controller::GetScrollPosition() const
 {

-  if( NULL != mImpl->mEventData )
-  {
-    return mImpl->mEventData->mScrollPosition;
-  }
-
-  return Vector2::ZERO;
-}
-
-const Vector2& Controller::GetAlignmentOffset() const
-{
-  return mImpl->mAlignmentOffset;
+  return mImpl->mScrollPosition;

 }
 
 Vector3 Controller::GetNaturalSize()
 }
 
 Vector3 Controller::GetNaturalSize()


@@ -1286,15 +1289,18 @@ bool Controller::Relayout( const Size& size )
   // Whether the text control is editable
   const bool isEditable = NULL != mImpl->mEventData;
 
   // 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).
+  // Keep the current offset as it will be used to update the decorator's positions (if the size changes).

   Vector2 offset;
   if( newSize && isEditable )
   {
   Vector2 offset;
   if( newSize && isEditable )
   {

-    offset = mImpl->mAlignmentOffset + mImpl->mEventData->mScrollPosition;
+    offset = mImpl->mScrollPosition;

   }
 
   }
 

-  // After doing the text layout, the alignment offset to place the actor in the desired position can be calculated.
-  CalculateTextAlignment( size );
+  if( !isEditable || !IsMultiLineEnabled() )
+  {
+    // After doing the text layout, the vertical offset to place the actor in the desired position can be calculated.
+    CalculateVerticalOffset( size );
+  }

 
   if( isEditable )
   {
 
   if( isEditable )
   {


@@ -1304,7 +1310,7 @@ bool Controller::Relayout( const Size& size )
       mImpl->ClampHorizontalScroll( layoutSize );
 
       // Update the decorator's positions is needed if there is a new size.
       mImpl->ClampHorizontalScroll( layoutSize );
 
       // Update the decorator's positions is needed if there is a new size.

-      mImpl->mEventData->mDecorator->UpdatePositions( mImpl->mAlignmentOffset + mImpl->mEventData->mScrollPosition - offset );
+      mImpl->mEventData->mDecorator->UpdatePositions( mImpl->mScrollPosition - offset );

     }
 
     // Move the cursor, grab handle etc.
     }
 
     // Move the cursor, grab handle etc.


@@ -1408,7 +1414,7 @@ void Controller::ResetScrollPosition()
   if( NULL != mImpl->mEventData )
   {
     // Reset the scroll position.
   if( NULL != mImpl->mEventData )
   {
     // Reset the scroll position.

-    mImpl->mEventData->mScrollPosition = Vector2::ZERO;
+    mImpl->mScrollPosition = Vector2::ZERO;

     mImpl->mEventData->mScrollAfterUpdatePosition = true;
   }
 }
     mImpl->mEventData->mScrollAfterUpdatePosition = true;
   }
 }


@@ -1687,7 +1693,7 @@ LayoutEngine::VerticalAlignment Controller::GetVerticalAlignment() const
   return mImpl->mLayoutEngine.GetVerticalAlignment();
 }
 
   return mImpl->mLayoutEngine.GetVerticalAlignment();
 }
 

-void Controller::CalculateTextAlignment( const Size& controlSize )
+void Controller::CalculateVerticalOffset( const Size& controlSize )

 {
   Size layoutSize = mImpl->mVisualModel->GetLayoutSize();
 
 {
   Size layoutSize = mImpl->mVisualModel->GetLayoutSize();
 


@@ -1697,71 +1703,21 @@ void Controller::CalculateTextAlignment( const Size& controlSize )
     layoutSize.height = mImpl->GetDefaultFontLineHeight();
   }
 
     layoutSize.height = mImpl->GetDefaultFontLineHeight();
   }
 

-  if( LayoutEngine::SINGLE_LINE_BOX == mImpl->mLayoutEngine.GetLayout() )
-  {
-    // Get the direction of the first character.
-    const CharacterDirection firstParagraphDirection = mImpl->mLogicalModel->GetCharacterDirection( 0u );
-
-    // If the first paragraph is right to left swap ALIGN_BEGIN and ALIGN_END;
-    LayoutEngine::HorizontalAlignment horizontalAlignment = mImpl->mLayoutEngine.GetHorizontalAlignment();
-    if( firstParagraphDirection )
-    {
-      switch( horizontalAlignment )
-      {
-        case LayoutEngine::HORIZONTAL_ALIGN_BEGIN:
-        {
-          horizontalAlignment = LayoutEngine::HORIZONTAL_ALIGN_END;
-          break;
-        }
-        case LayoutEngine::HORIZONTAL_ALIGN_CENTER:
-        {
-          // Nothing to do.
-          break;
-        }
-        case LayoutEngine::HORIZONTAL_ALIGN_END:
-        {
-          horizontalAlignment = LayoutEngine::HORIZONTAL_ALIGN_BEGIN;
-          break;
-        }
-      }
-    }
-
-    switch( horizontalAlignment )
-    {
-      case LayoutEngine::HORIZONTAL_ALIGN_BEGIN:
-      {
-        mImpl->mAlignmentOffset.x = 0.f;
-        break;
-      }
-      case LayoutEngine::HORIZONTAL_ALIGN_CENTER:
-      {
-        mImpl->mAlignmentOffset.x = floorf( 0.5f * ( controlSize.width - layoutSize.width ) ); // try to avoid pixel alignment.
-        break;
-      }
-      case LayoutEngine::HORIZONTAL_ALIGN_END:
-      {
-        mImpl->mAlignmentOffset.x = controlSize.width - layoutSize.width;
-        break;
-      }
-    }
-  }
-
-  const LayoutEngine::VerticalAlignment verticalAlignment = mImpl->mLayoutEngine.GetVerticalAlignment();
-  switch( verticalAlignment )
+  switch( mImpl->mLayoutEngine.GetVerticalAlignment() )

   {
     case LayoutEngine::VERTICAL_ALIGN_TOP:
     {
   {
     case LayoutEngine::VERTICAL_ALIGN_TOP:
     {

-      mImpl->mAlignmentOffset.y = 0.f;
+      mImpl->mScrollPosition.y = 0.f;

       break;
     }
     case LayoutEngine::VERTICAL_ALIGN_CENTER:
     {
       break;
     }
     case LayoutEngine::VERTICAL_ALIGN_CENTER:
     {

-      mImpl->mAlignmentOffset.y = floorf( 0.5f * ( controlSize.height - layoutSize.height ) ); // try to avoid pixel alignment.
+      mImpl->mScrollPosition.y = floorf( 0.5f * ( controlSize.height - layoutSize.height ) ); // try to avoid pixel alignment.

       break;
     }
     case LayoutEngine::VERTICAL_ALIGN_BOTTOM:
     {
       break;
     }
     case LayoutEngine::VERTICAL_ALIGN_BOTTOM:
     {

-      mImpl->mAlignmentOffset.y = controlSize.height - layoutSize.height;
+      mImpl->mScrollPosition.y = controlSize.height - layoutSize.height;

       break;
     }
   }
       break;
     }
   }

diff --git a/dali-toolkit/internal/text/text-controller.h b/dali-toolkit/internal/text/text-controller.h
index 5a96349..53a5991 100644 (file)
--- a/dali-toolkit/internal/text/text-controller.h
+++ b/dali-toolkit/internal/text/text-controller.h
@@ -174,6 +174,13 @@ public:
   CharacterDirection GetAutoScrollDirection() const;
 
   /**
   CharacterDirection GetAutoScrollDirection() const;
 
   /**

+   * @brief Get the alignment offset of the first line of text.
+   *
+   * @return The alignment offset.
+   */
+  float GetAutoScrollLineAlignment() const;
+
+  /**

    * @brief Replaces any text previously set.
    *
    * @note This will be converted into UTF-32 when stored in the text model.
    * @brief Replaces any text previously set.
    *
    * @note This will be converted into UTF-32 when stored in the text model.


@@ -552,13 +559,6 @@ public:
   const Vector2& GetScrollPosition() const;
 
   /**
   const Vector2& GetScrollPosition() const;
 
   /**

-   * @brief Query the alignment offset.
-   *
-   * @return The alignmnet offset.
-   */
-  const Vector2& GetAlignmentOffset() const;
-
-  /**

    * @copydoc Control::GetNaturalSize()
    */
   Vector3 GetNaturalSize();
    * @copydoc Control::GetNaturalSize()
    */
   Vector3 GetNaturalSize();


@@ -660,11 +660,11 @@ public:
   LayoutEngine::VerticalAlignment GetVerticalAlignment() const;
 
   /**
   LayoutEngine::VerticalAlignment GetVerticalAlignment() const;
 
   /**

-   * @brief Calulates the alignment of the whole text inside the bounding box.
+   * @brief Calulates the vertical offset to align the text inside the bounding box.

    *
    * @param[in] size The size of the bounding box.
    */
    *
    * @param[in] size The size of the bounding box.
    */

-  void CalculateTextAlignment( const Size& size );
+  void CalculateVerticalOffset( const Size& size );

 
   /**
    * @brief Return the layout engine.
 
   /**
    * @brief Return the layout engine.

diff --git a/dali-toolkit/internal/text/text-scroller.cpp b/dali-toolkit/internal/text/text-scroller.cpp
index a8180fc..1201619 100644 (file)
--- a/dali-toolkit/internal/text/text-scroller.cpp
+++ b/dali-toolkit/internal/text/text-scroller.cpp
@@ -262,10 +262,10 @@ TextScroller::~TextScroller()
   CleanUp();
 }
 
   CleanUp();
 }
 

-void TextScroller::SetParameters( Actor sourceActor, const Size& controlSize, const Size& offScreenSize, CharacterDirection direction, const Vector2 alignmentOffset )
+void TextScroller::SetParameters( Actor sourceActor, const Size& controlSize, const Size& offScreenSize, CharacterDirection direction, float alignmentOffset )

 {
 {

-  DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextScroller::SetParameters controlSize[%f,%f] offscreenSize[%f,%f] direction[%d] alignmentOffset[%f,%f]\n",
-                 controlSize.x, controlSize.y, offScreenSize.x, offScreenSize.y, direction, alignmentOffset.x, alignmentOffset.y );
+  DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextScroller::SetParameters controlSize[%f,%f] offscreenSize[%f,%f] direction[%d] alignmentOffset[%f]\n",
+                 controlSize.x, controlSize.y, offScreenSize.x, offScreenSize.y, direction, alignmentOffset );

 
   FrameBufferImage offscreenRenderTargetForText = FrameBufferImage::New( offScreenSize.width, offScreenSize.height, Pixel::RGBA8888, Dali::Image::UNUSED );
   Renderer renderer;
 
   FrameBufferImage offscreenRenderTargetForText = FrameBufferImage::New( offScreenSize.width, offScreenSize.height, Pixel::RGBA8888, Dali::Image::UNUSED );
   Renderer renderer;


@@ -277,7 +277,7 @@ void TextScroller::SetParameters( Actor sourceActor, const Size& controlSize, co
   // Reposition camera to match alignment of target, RTL text has direction=true
   if ( direction )
   {
   // Reposition camera to match alignment of target, RTL text has direction=true
   if ( direction )
   {

-    mOffscreenCameraActor.SetX( alignmentOffset.x + offScreenSize.width*0.5f );
+    mOffscreenCameraActor.SetX( alignmentOffset + offScreenSize.width*0.5f );

   }
   else
   {
   }
   else
   {

diff --git a/dali-toolkit/internal/text/text-scroller.h b/dali-toolkit/internal/text/text-scroller.h
index d4f92b9..ef50b77 100644 (file)
--- a/dali-toolkit/internal/text/text-scroller.h
+++ b/dali-toolkit/internal/text/text-scroller.h
@@ -65,7 +65,7 @@ public:
    * @param[in] alignmentOffset alignment of source text
    *
    */
    * @param[in] alignmentOffset alignment of source text
    *
    */

-  void SetParameters( Actor sourceActor, const Size& controlSize, const Size& offScreenSize, CharacterDirection direction, const Vector2 alignmentOffset );
+  void SetParameters( Actor sourceActor, const Size& controlSize, const Size& offScreenSize, CharacterDirection direction, float alignmentOffset );

 
   /**
    * @brief Set the gap distance to elapse before the text wraps around
 
   /**
    * @brief Set the gap distance to elapse before the text wraps around