apply tizen_2.2 gui

[platform/framework/native/uifw.git] / src / ui / controls / FUiCtrl_ButtonPresenter.cpp

diff --git a/src/ui/controls/FUiCtrl_ButtonPresenter.cpp b/src/ui/controls/FUiCtrl_ButtonPresenter.cpp
index 1a8e673..15456c0 100644 (file)
--- a/src/ui/controls/FUiCtrl_ButtonPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_ButtonPresenter.cpp
@@ -845,7 +845,6 @@ _ButtonPresenter::DrawUnderlineBitmap(void)
        float segmentedHeight = 0.0f;
 
        float leftTouchMargin = __pButton->GetLeftTouchMarginF();
-       float topTouchMargin = __pButton->GetTopTouchMarginF();
        float rightTouchMargin = __pButton->GetRightTouchMarginF();
        float bottomTouchMargin = __pButton->GetBottomTouchMarginF();
 
@@ -855,8 +854,6 @@ _ButtonPresenter::DrawUnderlineBitmap(void)
 
        Bitmap* pUnderlineBitmap = __pButton->GetUnderlineBitmap();
 
-       bool isDrawInner = __pButton->IsDrawInner();
-
        if (pUnderlineBitmap)
        {
                Canvas* pCanvas = __pButton->GetCanvasN();
@@ -868,14 +865,9 @@ _ButtonPresenter::DrawUnderlineBitmap(void)
                }
 
                FloatRectangle bounds(selectedBitmapMargin + leftTouchMargin,
-                               __pButton->GetBoundsF().height - (topTouchMargin + bottomTouchMargin) - (__pButton->GetBoundsF().height - (topTouchMargin + bottomTouchMargin) - segmentedHeight) / 2,
+                               __pButton->GetBoundsF().height -  bottomTouchMargin - selectedBitmapHeight,
                                __pButton->GetBoundsF().width - selectedBitmapMargin * 2 - (leftTouchMargin + rightTouchMargin), selectedBitmapHeight);
 
-               if (isDrawInner)
-               {
-                       bounds.y -= (selectedBitmapHeight - bottomTouchMargin);
-               }
-
                if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pUnderlineBitmap))
                {
                        pCanvas->DrawNinePatchedBitmap(bounds, *pUnderlineBitmap);