Fix for PLM P130909-04734.
authorsriram.k <sriram.k@samsung.com>
Tue, 10 Sep 2013 07:04:19 +0000 (12:34 +0530)
committersriram.k <sriram.k@samsung.com>
Tue, 10 Sep 2013 07:04:19 +0000 (12:34 +0530)
Signed-off-by: sriram.k <sriram.k@samsung.com>
Change-Id: I74ca1c2020fac5db545eb6a38fbefaaad70be593

src/ui/controls/FUiCtrl_MessageBox.cpp

index d5d1e0c..cbdbde2 100644 (file)
@@ -326,30 +326,22 @@ float
 _MessageBox::GetTotalHeight(void) const
 {
        float titleHeight = 0.0f;
-       float btnHeight = 0.0f;
+       float bottomHeight = 0.0f;
 
        float textTopMargin = 0.0f;
        float textTopMarginNoButton = 0.0f;
 
-       float btnGap = 0.0f;
-       float btnTopMargin = 0.0f;
-       float btnBottomMargin = 0.0f;
-
        float transTopMargin = 0.0f;
        float transBottomMargin = 0.0f;
 
        _ControlOrientation orientation;
        orientation = GetOrientation();
        GET_SHAPE_CONFIG(MESSAGEBOX::TITLE_HEIGHT, orientation, titleHeight);
-       GET_SHAPE_CONFIG(MESSAGEBOX::BUTTON_HEIGHT, orientation, btnHeight);
+       GET_SHAPE_CONFIG(MESSAGEBOX::BOTTOM_HEIGHT, orientation, bottomHeight);
 
        GET_SHAPE_CONFIG(MESSAGEBOX::TEXT_TOP_MRAGIN, orientation, textTopMargin);
        GET_SHAPE_CONFIG(MESSAGEBOX::TEXT_TOP_MRAGIN_NO_BUTTON, orientation, textTopMarginNoButton);
 
-       GET_SHAPE_CONFIG(MESSAGEBOX::BUTTON_INTERNAL_GAP, orientation, btnGap);
-       GET_SHAPE_CONFIG(MESSAGEBOX::BUTTON_TOP_MARGIN, orientation, btnTopMargin);
-       GET_SHAPE_CONFIG(MESSAGEBOX::BUTTON_BOTTOM_MARGIN, orientation, btnBottomMargin);
-
        GET_SHAPE_CONFIG(MESSAGEBOX::BG_IMAGE_TRANSPARENT_TOP_MARGIN, orientation, transTopMargin);
        GET_SHAPE_CONFIG(MESSAGEBOX::BG_IMAGE_TRANSPARENT_BOTTOM_MARGIN, orientation, transBottomMargin);
 
@@ -385,9 +377,7 @@ _MessageBox::GetTotalHeight(void) const
                        // fall through
        case MSGBOX_STYLE_CANCELTRYCONTINUE:
                totalH += textTopMargin * 2.0f
-                               + btnHeight
-                               + btnTopMargin
-                               + btnBottomMargin;
+               + bottomHeight;
                break;
        }