Modified to display sliding text properly

Change-Id: I065fdee7d01e0f5565d938f175737748e533a07e

diff --git a/src/graphics/inc/FGrp_TextTextObject.h b/src/graphics/inc/FGrp_TextTextObject.h
index 2589792..0538808 100644 (file)
--- a/src/graphics/inc/FGrp_TextTextObject.h
+++ b/src/graphics/inc/FGrp_TextTextObject.h
@@ -252,8 +252,12 @@ public:
 
        result SetSlidingStep(int slidingStep);
 
+       result SetSlidingStep(float slidingStep);
+
        int GetSlidingStep(void) const;
 
+       float GetSlidingStepF(void) const;
+
        result SetAlternateLookEnabled(bool enable);
 
        bool IsAlternateLookEnabled(void) const;
@@ -414,8 +418,8 @@ private:
        Color __defaultForegroundColor;
        Color __defaultBackgroundColor;
        Color __defaultOutlineColor;
-       int __slidingStep;
-       int __slidingGap;
+       float __slidingStep;
+       float __slidingGap;
        TextObjectEllipsisType __textObjectEllipsisType;
        bool __isFirstDisplayPositionYChanged;
        bool __linkViewModeEnabled;

diff --git a/src/graphics/text/FGrp_TextTextColumn.cpp b/src/graphics/text/FGrp_TextTextColumn.cpp
index b0b2665..4c2a418 100644 (file)
--- a/src/graphics/text/FGrp_TextTextColumn.cpp
+++ b/src/graphics/text/FGrp_TextTextColumn.cpp
@@ -1661,56 +1661,56 @@ TextColumn::GetTextLineNode(int lineIndex) const
 result
 TextColumn::SetSlidingDimension(Dimension& slidingDimension)
 {
-       SysTryReturn(NID_GRP, slidingDimension.width >= 0 && slidingDimension.height >=0
-                       , E_INVALID_ARG, E_INVALID_ARG, "[E_INVALID_ARG] The argument is invalid.");
-
-       __slidingDimension = slidingDimension;
+       FloatDimension slidingDimensionF = _CoordinateSystemUtils::ConvertToFloat(slidingDimension);
 
-       return E_SUCCESS;
+       return SetSlidingDimension(slidingDimensionF);
 }
 
 result
 TextColumn::SetSlidingDimension(FloatDimension& slidingDimension)
 {
-       Dimension newSlidingDimension = _CoordinateSystemUtils::ConvertToInteger(slidingDimension);
+       SysTryReturn(NID_GRP, slidingDimension.width >= 0.0f && slidingDimension.height >= 0.0f
+                       , E_INVALID_ARG, E_INVALID_ARG, "[E_INVALID_ARG] The argument is invalid.");
+
+       __slidingDimension = slidingDimension;
 
-       return SetSlidingDimension(newSlidingDimension);
+       return E_SUCCESS;
 }
 
 Dimension
 TextColumn::GetSlidingDimension(void) const
 {
-       return __slidingDimension;
+       return _CoordinateSystemUtils::ConvertToInteger(__slidingDimension);
 }
 
 FloatDimension
 TextColumn::GetSlidingDimensionF(void) const
 {
-       return _CoordinateSystemUtils::ConvertToFloat(__slidingDimension);
+       return __slidingDimension;
 }
 
 void
 TextColumn::SetSlidingPosition(int slidingPosition)
 {
-       __slidingPosition = slidingPosition;
+       __slidingPosition = _CoordinateSystemUtils::ConvertToFloat(slidingPosition);
 }
 
 void
 TextColumn::SetSlidingPosition(float slidingPosition)
 {
-       __slidingPosition = _CoordinateSystemUtils::ConvertToInteger(slidingPosition);
+       __slidingPosition = slidingPosition;
 }
 
 int
 TextColumn::GetSlidingPosition(void) const
 {
-       return __slidingPosition;
+       return _CoordinateSystemUtils::ConvertToInteger(__slidingPosition);
 }
 
 float
 TextColumn::GetSlidingPositionF(void) const
 {
-       return _CoordinateSystemUtils::ConvertToFloat(__slidingPosition);
+       return __slidingPosition;
 }
 
 void

diff --git a/src/graphics/text/FGrp_TextTextColumn.h b/src/graphics/text/FGrp_TextTextColumn.h
index b9ac6af..c254d85 100644 (file)
--- a/src/graphics/text/FGrp_TextTextColumn.h
+++ b/src/graphics/text/FGrp_TextTextColumn.h
@@ -242,8 +242,8 @@ private:
        float __firstDisplayPositionY;
        int __displayLineCount;
        float __displayHeight;
-       Tizen::Graphics::Dimension __slidingDimension;
-       int __slidingPosition;
+       Tizen::Graphics::FloatDimension __slidingDimension;
+       float __slidingPosition;
        bool __setChangeAction;
        ChangeAction __textChangeAction;
        int __chagedStartTextIndex;

diff --git a/src/graphics/text/FGrp_TextTextObject.cpp b/src/graphics/text/FGrp_TextTextObject.cpp
index 9eb8861..b25815b 100644 (file)
--- a/src/graphics/text/FGrp_TextTextObject.cpp
+++ b/src/graphics/text/FGrp_TextTextObject.cpp
@@ -23,6 +23,7 @@
 #include <new>
 #include <FGrpBitmap.h>
 #include <FBaseSysLog.h>
+#include "FGrpCoordinateSystem.h"
 #include "FGrp_FontImpl.h"
 #include "FGrp_CanvasImpl.h"
 #include "../FGrp_ResUtil.h"
@@ -84,8 +85,8 @@ TextObject::TextObject(void)
        __rect.y = 0;
        __rect.width = 0;
        __rect.height = 0;
-       __slidingGap = 30;
-       __slidingStep = 2;
+       __slidingGap = 30.0f;
+       __slidingStep = CoordinateSystem::ConvertToLogicalX(2.0f);
        __linkViewModeEnabled = false;
        __isUrlLinkColorDefined = false;
        __isEmailLinkColorDefined = false;
@@ -130,7 +131,6 @@ TextObject::Construct(void)
        __defaultForegroundColor = Color::GetColor(COLOR_ID_BLACK);
        __defaultBackgroundColor = Color::GetColor(COLOR_ID_WHITE);
        __defaultOutlineColor = Color::GetColor(COLOR_ID_WHITE);
-       __slidingStep = 2;
        __isAlternateLookEnabled = false;
        __linkViewModeEnabled = false;
 
@@ -172,7 +172,6 @@ TextObject::Construct(const Rectangle& rect)
        __defaultForegroundColor = Color::GetColor(COLOR_ID_BLACK);
        __defaultBackgroundColor = Color::GetColor(COLOR_ID_WHITE);
        __defaultOutlineColor = Color::GetColor(COLOR_ID_WHITE);
-       __slidingStep = 2;
        __isAlternateLookEnabled = false;
        __linkViewModeEnabled = false;
        __rect = _CoordinateSystemUtils::ConvertToFloat(rect);
@@ -215,7 +214,6 @@ TextObject::Construct(const FloatRectangle& rect)
        __defaultForegroundColor = Color::GetColor(COLOR_ID_BLACK);
        __defaultBackgroundColor = Color::GetColor(COLOR_ID_WHITE);
        __defaultOutlineColor = Color::GetColor(COLOR_ID_WHITE);
-       __slidingStep = 2;
        __isAlternateLookEnabled = false;
        __linkViewModeEnabled = false;
        __rect = rect;
@@ -3474,14 +3472,27 @@ TextObject::HideRearSpace(TextObjectSpaceHideType mode)
 int
 TextObject::GetSlidingStep(void) const
 {
-       IF_NOT_CONSTRUCTED(return -1);
+       return _CoordinateSystemUtils::ConvertToInteger(GetSlidingStepF());
+}
+
+float
+TextObject::GetSlidingStepF(void) const
+{
+       IF_NOT_CONSTRUCTED(return -1.0f);
 
        return __slidingStep;
 }
 
+
 result
 TextObject::SetSlidingStep(int slidingStep)
 {
+       return SetSlidingStep(_CoordinateSystemUtils::ConvertToFloat(slidingStep));
+}
+
+result
+TextObject::SetSlidingStep(float slidingStep)
+{
        IF_NOT_CONSTRUCTED(return E_INVALID_STATE);
 
        __slidingStep = slidingStep;