Fixed the bg image issues in popup group of controls.

Signed-off-by: sriram.k <sriram.k@samsung.com>
Change-Id: If9e99370d406c37becbd55c709b80b32fad096cf

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_popup_bg.#.png b/res/common/usr/share/osp/bitmaps/480x800/00_popup_bg.#.png
index 207f968..a9edb49 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_popup_bg.#.png and b/res/common/usr/share/osp/bitmaps/480x800/00_popup_bg.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_popup_bottom_bg.#.png b/res/common/usr/share/osp/bitmaps/480x800/00_popup_bottom_bg.#.png
index 656891d..afb2eca 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_popup_bottom_bg.#.png and b/res/common/usr/share/osp/bitmaps/480x800/00_popup_bottom_bg.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_popup_title_bg.#.png b/res/common/usr/share/osp/bitmaps/480x800/00_popup_title_bg.#.png
index bedc765..bbcece2 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_popup_title_bg.#.png and b/res/common/usr/share/osp/bitmaps/480x800/00_popup_title_bg.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bg_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bg_ef.#.png
index f252a9d..7250b39 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bg_ef.#.png and b/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bg_ef.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bottom_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bottom_ef.#.png
index 2652a06..62801ba 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bottom_ef.#.png and b/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bottom_ef.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_title_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_title_ef.#.png
index 1ec81d5..1b82fef 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_title_ef.#.png and b/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_title_ef.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/default/00_popup_bg_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/default/00_popup_bg_ef.#.png
index f252a9d..7250b39 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/default/00_popup_bg_ef.#.png and b/res/common/usr/share/osp/bitmaps/480x800/default/00_popup_bg_ef.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/default/00_popup_bottom_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/default/00_popup_bottom_ef.#.png
index 2652a06..62801ba 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/default/00_popup_bottom_ef.#.png and b/res/common/usr/share/osp/bitmaps/480x800/default/00_popup_bottom_ef.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/default/00_popup_title_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/default/00_popup_title_ef.#.png
index 1ec81d5..1b82fef 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/default/00_popup_title_ef.#.png and b/res/common/usr/share/osp/bitmaps/480x800/default/00_popup_title_ef.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bg_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bg_ef.#.png
index d602077..5f23efa 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bg_ef.#.png and b/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bg_ef.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bottom_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bottom_ef.#.png
index ba92c63..a0bca42 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bottom_ef.#.png and b/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bottom_ef.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_title_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_title_ef.#.png
index 41ca8ff..ad4a435 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_title_ef.#.png and b/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_title_ef.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_popup_bg.#.png b/res/common/usr/share/osp/bitmaps/720x1280/00_popup_bg.#.png
index a84ae44..79ea0c3 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_popup_bg.#.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_popup_bg.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_popup_bottom_bg.#.png b/res/common/usr/share/osp/bitmaps/720x1280/00_popup_bottom_bg.#.png
index 395405e..cee257d 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_popup_bottom_bg.#.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_popup_bottom_bg.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_popup_title_bg.#.png b/res/common/usr/share/osp/bitmaps/720x1280/00_popup_title_bg.#.png
index 9759f8e..a9c9206 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_popup_title_bg.#.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_popup_title_bg.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_bg_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_bg_ef.#.png
index 0db8c5e..ed543f1 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_bg_ef.#.png and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_bg_ef.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_bottom_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_bottom_ef.#.png
index 607e0cc..d6d494d 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_bottom_ef.#.png and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_bottom_ef.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_title_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_title_ef.#.png
index 8324192..423231c 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_title_ef.#.png and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_title_ef.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/default/00_popup_bg_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/default/00_popup_bg_ef.#.png
index 0db8c5e..ed543f1 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/default/00_popup_bg_ef.#.png and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_popup_bg_ef.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/default/00_popup_bottom_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/default/00_popup_bottom_ef.#.png
index 607e0cc..d6d494d 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/default/00_popup_bottom_ef.#.png and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_popup_bottom_ef.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/default/00_popup_title_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/default/00_popup_title_ef.#.png
index 8324192..423231c 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/default/00_popup_title_ef.#.png and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_popup_title_ef.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_bg_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_bg_ef.#.png
index 6803486..0efc567 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_bg_ef.#.png and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_bg_ef.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_bottom_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_bottom_ef.#.png
index 7649449..0967918 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_bottom_ef.#.png and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_bottom_ef.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_title_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_title_ef.#.png
index e23d37a..76dbd3b 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_title_ef.#.png and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_title_ef.#.png differ

diff --git a/src/ui/controls/FUiCtrl_MessageBoxPresenter.cpp b/src/ui/controls/FUiCtrl_MessageBoxPresenter.cpp
index 834de96..f79c10e 100644 (file)
--- a/src/ui/controls/FUiCtrl_MessageBoxPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_MessageBoxPresenter.cpp
@@ -67,7 +67,6 @@ _MessageBoxPresenter::_MessageBoxPresenter(void)
        , __buttonNum(0)
        , __prevPositionY(-1.0f)
        , __textObjHeight(0.0f)
-       , __bgImageMargin(0.0f)
        , __touchPressFlag(false)
        , __scrollStart(false)
        , __btnClickFlag(false)
@@ -263,8 +262,6 @@ _MessageBoxPresenter::Initialize(_MessageBox& msgbox)
        GET_SHAPE_CONFIG(MESSAGEBOX::BG_IMAGE_TRANSPARENT_BOTTOM_MARGIN, orientation, transBottomMargin);
        GET_SHAPE_CONFIG(MESSAGEBOX::BG_IMAGE_TRANSPARENT_LEFT_MARGIN, orientation, transLeftMargin);
        GET_SHAPE_CONFIG(MESSAGEBOX::BG_IMAGE_TRANSPARENT_RIGHT_MARGIN, orientation, transRightMargin);
-       GET_FIXED_VALUE_CONFIG(MESSAGEBOX::BG_IMAGE_MARGIN, orientation, __bgImageMargin);
-
 
        __titleBgBounds= FloatRectangle(transLeftMargin, transTopMargin, _CoordinateSystemUtils::ConvertToFloat(defaultWidth) - (2 * transLeftMargin), titleHeight);
 
@@ -355,7 +352,7 @@ _MessageBoxPresenter::Initialize(_MessageBox& msgbox)
        __pScrollPanel->SetFocusable(false);
        __pMessageBox->AttachChild(*__pScrollPanel);
 
-       __buttonBgBounds = FloatRectangle(transLeftMargin + __bgImageMargin, __pMessageBox->GetTotalHeight() - bottomHeight - transBottomMargin, _CoordinateSystemUtils::ConvertToFloat(defaultWidth)- (transLeftMargin + transRightMargin) - (2 * __bgImageMargin), bottomHeight - __bgImageMargin);
+       __buttonBgBounds = FloatRectangle(transLeftMargin, __pMessageBox->GetTotalHeight() - bottomHeight - transBottomMargin, _CoordinateSystemUtils::ConvertToFloat(defaultWidth)- (transLeftMargin + transRightMargin), bottomHeight);
 
        r = CreateButtons();
        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));

diff --git a/src/ui/controls/FUiCtrl_ProgressPopupPresenter.cpp b/src/ui/controls/FUiCtrl_ProgressPopupPresenter.cpp
index 58c6af7..568aa6f 100644 (file)
--- a/src/ui/controls/FUiCtrl_ProgressPopupPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_ProgressPopupPresenter.cpp
@@ -61,7 +61,6 @@ _ProgressPopupPresenter::_ProgressPopupPresenter(void)
        , __pAnimation(null)
        , __pAnimationFrameList(null)
        , __textObjectHeight(0.0f)
-       , __bgImageMargin(0.0f)
        , __currentIndex(0)
        , __buttonPressState(false)
        , __cancelButton(false)
@@ -689,7 +688,6 @@ _ProgressPopupPresenter::GetButtonBounds(void)
        GET_SHAPE_CONFIG(MESSAGEBOX::BUTTON_HEIGHT, orientation, btnHeight);
        GET_SHAPE_CONFIG(MESSAGEBOX::BUTTON_SIDE_MARGIN_01, orientation, btnSideMargin1);
        GET_SHAPE_CONFIG(MESSAGEBOX::BOTTOM_HEIGHT, orientation, buttonBgHeight);
-       GET_FIXED_VALUE_CONFIG(MESSAGEBOX::BG_IMAGE_MARGIN, orientation, __bgImageMargin);
 
        if (!__pProgressPopup->HasButton())
        {
@@ -724,7 +722,7 @@ _ProgressPopupPresenter::GetButtonBounds(void)
                + textBottomMargin
                + GetBodyTextObjHeight();
 
-       __buttonBgBounds.SetBounds(transLeftMargin + __bgImageMargin,  y , (defaultWidth - (transLeftMargin + transRightMargin) - (2 * __bgImageMargin)) , (buttonBgHeight - __bgImageMargin));
+       __buttonBgBounds.SetBounds(transLeftMargin,  y , (defaultWidth - (transLeftMargin + transRightMargin)) , (buttonBgHeight));
 
        return FloatRectangle(x, y + ((buttonBgHeight - height) / 2), width, height);
 }

diff --git a/src/ui/inc/FUiCtrl_MessageBoxPresenter.h b/src/ui/inc/FUiCtrl_MessageBoxPresenter.h
index b609192..c4ac883 100644 (file)
--- a/src/ui/inc/FUiCtrl_MessageBoxPresenter.h
+++ b/src/ui/inc/FUiCtrl_MessageBoxPresenter.h
@@ -193,7 +193,6 @@ private:
        int __buttonNum;
        float __prevPositionY;
        float __textObjHeight;
-       float __bgImageMargin;
 
        bool __touchPressFlag;
        bool __scrollStart;

diff --git a/src/ui/inc/FUiCtrl_ProgressPopupPresenter.h b/src/ui/inc/FUiCtrl_ProgressPopupPresenter.h
index 97a809f..3fe2fc8 100644 (file)
--- a/src/ui/inc/FUiCtrl_ProgressPopupPresenter.h
+++ b/src/ui/inc/FUiCtrl_ProgressPopupPresenter.h
@@ -111,7 +111,6 @@ private:
        Tizen::Base::Collection::ArrayList* __pAnimationFrameList;
 
        float __textObjectHeight;
-       float __bgImageMargin;
        int __currentIndex;
 
        bool __buttonPressState;

diff --git a/src/ui/inc/FUi_ResourceMessageBoxConfig.h b/src/ui/inc/FUi_ResourceMessageBoxConfig.h
index b00880d..a6a9989 100644 (file)
--- a/src/ui/inc/FUi_ResourceMessageBoxConfig.h
+++ b/src/ui/inc/FUi_ResourceMessageBoxConfig.h
@@ -53,7 +53,6 @@ DECLARE_UI_CONFIG(MESSAGEBOX);
        DECLARE_IMAGE_CONFIG(BOTTOM_BUTTON_DISABLED_EFFECT, 13);
 
        DECLARE_FIXED_VALUE_CONFIG(TEXT_MAX_LENGTH, 1);
-       DECLARE_FIXED_VALUE_CONFIG(BG_IMAGE_MARGIN, 2);
        DECLARE_SHAPE_CONFIG(MIN_WIDTH, 1);
        DECLARE_SHAPE_CONFIG(MIN_HEIGHT, 2);
        DECLARE_SHAPE_CONFIG(DEFAULT_WIDTH, 3);

diff --git a/src/ui/resource/FUi_ResourceMessageBoxConfig.cpp b/src/ui/resource/FUi_ResourceMessageBoxConfig.cpp
index 83ffa18..9b43607 100644 (file)
--- a/src/ui/resource/FUi_ResourceMessageBoxConfig.cpp
+++ b/src/ui/resource/FUi_ResourceMessageBoxConfig.cpp
@@ -61,7 +61,6 @@ START_UI_CONFIG(MESSAGEBOX);
        START_UI_CONFIG_MODE(720x1280);
        {
                ADD_FIXED_VALUE_CONFIG(TEXT_MAX_LENGTH, 399);
-               ADD_FIXED_VALUE_CONFIG(BG_IMAGE_MARGIN, 1);
 
                ADD_SHAPE_CONFIG(MIN_WIDTH, 510);                                   // 20120504
                ADD_SHAPE_CONFIG(MIN_HEIGHT, 122);                                  // 20120803