modify title position on ProgressPopup and button gap on MessageBox

Change-Id: I4db9cd0789dcf87590d8472b324b8cc01e29bc7d
Signed-off-by: DongJinJeon <dongjin2193.jeon@samsung.com>

diff --git a/src/ui/controls/FUiCtrl_ProgressPopupPresenter.cpp b/src/ui/controls/FUiCtrl_ProgressPopupPresenter.cpp
index d2bcd49..2d84b8a 100755 (executable)
--- a/src/ui/controls/FUiCtrl_ProgressPopupPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_ProgressPopupPresenter.cpp
@@ -116,6 +116,7 @@ _ProgressPopupPresenter::SetTitleTextObject(void)
        float titleLeftMargin = 0.0f;
        float titleRightMargin = 0.0f;
 
+       float transTopMargin = 0.0f;
        float transLeftMargin = 0.0f;
        float transRightMargin = 0.0f;
 
@@ -130,6 +131,7 @@ _ProgressPopupPresenter::SetTitleTextObject(void)
        GET_SHAPE_CONFIG(POPUP::TITLE_TEXT_LEFT_MARGIN, orientation, titleLeftMargin);
        GET_SHAPE_CONFIG(POPUP::TITLE_TEXT_RIGHT_MARGIN, orientation, titleRightMargin);
 
+       GET_SHAPE_CONFIG(POPUP::BG_IMAGE_TRANSPARENT_TOP_MARGIN, orientation, transTopMargin);
        GET_SHAPE_CONFIG(POPUP::BG_IMAGE_TRANSPARENT_LEFT_MARGIN, orientation, transLeftMargin);
        GET_SHAPE_CONFIG(POPUP::BG_IMAGE_TRANSPARENT_RIGHT_MARGIN, orientation, transRightMargin);
 
@@ -161,13 +163,13 @@ _ProgressPopupPresenter::SetTitleTextObject(void)
                        __pTitleTextObject->SetAlignment(TEXT_OBJECT_ALIGNMENT_LEFT);
                }
                __pTitleTextObject->SetBounds(FloatRectangle(titleLeftMargin + transLeftMargin,
-                                                                                       titleTopMargin,
+                                                                                       titleTopMargin + transTopMargin,
                                                                                        defaultWidth - (titleLeftMargin + titleRightMargin + transLeftMargin + transRightMargin),
                                                                                        titleHeight - titleTopMargin));
                __pTitleTextObject->Compose();
 
                __titleBounds = FloatRectangle(titleLeftMargin + transLeftMargin,
-                                                               titleTopMargin,
+                                                               titleTopMargin + transTopMargin,
                                                                defaultWidth - (titleLeftMargin + titleRightMargin + transLeftMargin + transRightMargin),
                                                                titleHeight - titleTopMargin);
        }
@@ -262,7 +264,7 @@ _ProgressPopupPresenter::SetTextObject(void)
                }
 
                __pBodyTextObject->SetBounds(FloatRectangle(textLeftMargin + transLeftMargin,
-                                                                                               titleHeight + animationWidth + noTitleHeight,
+                                                                                               titleHeight + textTopMargin + transTopMargin + animationWidth + noTitleHeight,
                                                                                                defaultWidth - (textLeftMargin + textRightMargin + transLeftMargin + transRightMargin),
                                                                                                maxHeight - titleHeight - bottomHeight - animationWidth));
                __pBodyTextObject->Compose();

diff --git a/src/ui/resource/FUi_ResourceMessageBoxConfig.cpp b/src/ui/resource/FUi_ResourceMessageBoxConfig.cpp
index 254b54c..2e3edd7 100755 (executable)
--- a/src/ui/resource/FUi_ResourceMessageBoxConfig.cpp
+++ b/src/ui/resource/FUi_ResourceMessageBoxConfig.cpp
@@ -68,7 +68,7 @@ START_UI_CONFIG(MESSAGEBOX);
                ADD_SHAPE_CONFIG(BG_IMAGE_TRANSPARENT_RIGHT_MARGIN, 16);
 
                ADD_SHAPE_CONFIG(BUTTON_HEIGHT, 74);                    // 20121113
-               ADD_SHAPE_CONFIG(BUTTON_INTERNAL_GAP, 20);          // 20121113
+               ADD_SHAPE_CONFIG(BUTTON_INTERNAL_GAP, 16);          // 20130404
 
                ADD_SHAPE_CONFIG(BUTTON_TOP_MARGIN, 20);                        // 20121113
                ADD_SHAPE_CONFIG(BUTTON_BOTTOM_MARGIN, 24);             // 20130403