add patch

[framework/osp/uifw.git] / src / ui / controls / FUiCtrl_Button.cpp

diff --git a/src/ui/controls/FUiCtrl_Button.cpp b/src/ui/controls/FUiCtrl_Button.cpp
index 3b904a6..ce38af0 100644 (file)
--- a/src/ui/controls/FUiCtrl_Button.cpp
+++ b/src/ui/controls/FUiCtrl_Button.cpp
@@ -62,10 +62,6 @@ _Button::_Button()
        , __topMargin(0.0f)
        , __rightMargin(0.0f)
        , __bottomMargin(0.0f)
-       , __leftTouchMargin(0.0f)
-       , __topTouchMargin(0.0f)
-       , __rightTouchMargin(0.0f)
-       , __bottomTouchMargin(0.0f)
        , __userDefinedTextArea(0.0f, 0.0f, 0.0f, 0.0f)
        , __pTextElement(null)
 {
@@ -865,7 +861,7 @@ _Button::GetBitmapPosition(_ButtonStatus status) const
 FloatPoint
 _Button::GetBitmapPositionF(_ButtonStatus status) const
 {
-       return FloatPoint(__bitmapPosition[status].x + __leftTouchMargin, __bitmapPosition[status].y + __topTouchMargin);
+       return FloatPoint(__bitmapPosition[status].x, __bitmapPosition[status].y);
 }
 
 result
@@ -915,7 +911,7 @@ _Button::GetEffectBitmapPosition(_ButtonStatus status) const
 FloatPoint
 _Button::GetEffectBitmapPositionF(_ButtonStatus status) const
 {
-       return FloatPoint(__effectBitmapPosition[status].x + __leftTouchMargin, __effectBitmapPosition[status].y + __topTouchMargin);
+       return FloatPoint(__effectBitmapPosition[status].x, __effectBitmapPosition[status].y);
 }
 
 result
@@ -1296,7 +1292,14 @@ _Button::SetButtonStatus(_ButtonStatus buttonStatus, bool fire)
 _ButtonStatus
 _Button::GetButtonStatus(void) const
 {
-       return __buttonStatus;
+       if (IsEnabled())
+       {
+               return __buttonStatus;
+       }
+       else
+       {
+               return _BUTTON_STATUS_DISABLED;
+       }
 }
 
 result
@@ -1522,6 +1525,7 @@ _Button::GetContentSizeInternalF(bool horizontalMode, bool verticalMode) const
        Font* pFont = __pButtonPresenter->GetFont();
 
        FloatRectangle previousRect = pTextObject->GetBoundsF();
+       TextObjectActionType previousActionType = pTextObject->GetAction();
 
        dimension.width = GetBoundsF().width - __leftMargin * 2;
        dimension.height = GetBoundsF().height - __topMargin * 2;
@@ -1565,9 +1569,10 @@ _Button::GetContentSizeInternalF(bool horizontalMode, bool verticalMode) const
        }
 
        pTextObject->SetBounds(previousRect);
+       pTextObject->SetAction(previousActionType);
 
-       dimension.width += __leftMargin * 4 - __leftTouchMargin - __rightTouchMargin;
-       dimension.height += __topMargin * 4 - __topTouchMargin - __bottomTouchMargin;
+       dimension.width += __leftMargin * 4;
+       dimension.height += __topMargin * 4;
 
        for (int i = 0; i < NUMBER_OF_BUTTON_STATUS; i++)
        {
@@ -1615,76 +1620,6 @@ _Button::GetTextExtentSizeF(void) const
 }
 
 result
-_Button::SetTouchMargin(int leftTouchMargin, int topTouchMargin, int rightTouchMargin, int bottomTouchMargin)
-{
-       float floatLeftTouchMargin = _CoordinateSystemUtils::ConvertToFloat(leftTouchMargin);
-       float floatTopTouchMargin = _CoordinateSystemUtils::ConvertToFloat(topTouchMargin);
-       float floatRightTouchMargin = _CoordinateSystemUtils::ConvertToFloat(rightTouchMargin);
-       float floatBottomTouchMargin = _CoordinateSystemUtils::ConvertToFloat(bottomTouchMargin);
-
-       return SetTouchMargin(floatLeftTouchMargin, floatTopTouchMargin, floatRightTouchMargin, floatBottomTouchMargin);
-}
-
-result
-_Button::SetTouchMargin(float leftTouchMargin, float topTouchMargin, float rightTouchMargin, float bottomTouchMargin)
-{
-       __leftTouchMargin = leftTouchMargin;
-       __topTouchMargin = topTouchMargin;
-       __rightTouchMargin = rightTouchMargin;
-       __bottomTouchMargin = bottomTouchMargin;
-
-       return E_SUCCESS;
-}
-
-int
-_Button::GetLeftTouchMargin(void) const
-{
-       return _CoordinateSystemUtils::ConvertToInteger(GetLeftTouchMarginF());
-}
-
-float
-_Button::GetLeftTouchMarginF(void) const
-{
-       return __leftTouchMargin;
-}
-
-int
-_Button::GetTopTouchMargin(void) const
-{
-       return _CoordinateSystemUtils::ConvertToInteger(GetTopTouchMarginF());
-}
-
-float
-_Button::GetTopTouchMarginF(void) const
-{
-       return __topTouchMargin;
-}
-
-int
-_Button::GetRightTouchMargin(void) const
-{
-       return _CoordinateSystemUtils::ConvertToInteger(GetRightTouchMarginF());
-}
-
-float
-_Button::GetRightTouchMarginF(void) const
-{
-       return __rightTouchMargin;
-}
-
-int
-_Button::GetBottomTouchMargin(void) const
-{
-       return _CoordinateSystemUtils::ConvertToInteger(GetBottomTouchMarginF());
-}
-
-float
-_Button::GetBottomTouchMarginF(void) const
-{
-       return __bottomTouchMargin;
-}
-
-result
 _Button::SetMultilineTextSize(const Variant& textSize)
 {
        result r = E_SUCCESS;