Removed the overlay positioning based on the slider position.

Change-Id: Ic3a242921bf714dae93c3490b08e721cfff4a4df
Signed-off-by: kishorekumar Dachinamoorthy <kishore.d@samsung.com>

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_slider_popup_bg.png b/res/common/usr/share/osp/bitmaps/480x800/00_slider_popup_bg.#.png
old mode 100755 (executable)
new mode 100644 (file)
similarity index 82%
rename from res/common/usr/share/osp/bitmaps/480x800/00_slider_popup_bg.png
rename to res/common/usr/share/osp/bitmaps/480x800/00_slider_popup_bg.#.png
index d540acd..4a28195
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_slider_popup_bg.png and b/res/common/usr/share/osp/bitmaps/480x800/00_slider_popup_bg.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_slider_popup_bg_ef.png b/res/common/usr/share/osp/bitmaps/480x800/00_slider_popup_bg_ef.png
deleted file mode 100755 (executable)
index bc34a80..0000000
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_slider_popup_bg_ef.png and /dev/null differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_slider_popup_bottom_bg.png b/res/common/usr/share/osp/bitmaps/480x800/00_slider_popup_bottom_bg.png
deleted file mode 100755 (executable)
index b67f692..0000000
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_slider_popup_bottom_bg.png and /dev/null differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_slider_popup_bottom_bg_ef.png b/res/common/usr/share/osp/bitmaps/480x800/00_slider_popup_bottom_bg_ef.png
deleted file mode 100755 (executable)
index 5074a98..0000000
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_slider_popup_bottom_bg_ef.png and /dev/null differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_slider_popup_bg_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_slider_popup_bg_ef.#.png
new file mode 100644 (file)
index 0000000..5f62d46
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_slider_popup_bg_ef.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_slider_popup_bg.png b/res/common/usr/share/osp/bitmaps/480x800/default/00_slider_popup_bg_ef.#.png
old mode 100755 (executable)
new mode 100644 (file)
similarity index 79%
rename from res/common/usr/share/osp/bitmaps/720x1280/00_slider_popup_bg.png
rename to res/common/usr/share/osp/bitmaps/480x800/default/00_slider_popup_bg_ef.#.png
index 4251cfe..b7f11a2
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_slider_popup_bg.png and b/res/common/usr/share/osp/bitmaps/480x800/default/00_slider_popup_bg_ef.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_slider_popup_bg_ef.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_slider_popup_bg_ef.#.png
old mode 100755 (executable)
new mode 100644 (file)
similarity index 79%
rename from res/common/usr/share/osp/bitmaps/720x1280/white/00_slider_popup_bg_ef.png
rename to res/common/usr/share/osp/bitmaps/480x800/white/00_slider_popup_bg_ef.#.png
index 6db6a8b..b7f11a2
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/white/00_slider_popup_bg_ef.png and b/res/common/usr/share/osp/bitmaps/480x800/white/00_slider_popup_bg_ef.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_slider_popup_bg.#.png b/res/common/usr/share/osp/bitmaps/720x1280/00_slider_popup_bg.#.png
new file mode 100644 (file)
index 0000000..9aec2de
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/00_slider_popup_bg.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_slider_popup_bottom_bg.png b/res/common/usr/share/osp/bitmaps/720x1280/00_slider_popup_bottom_bg.png
deleted file mode 100755 (executable)
index 3ebaff1..0000000
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_slider_popup_bottom_bg.png and /dev/null differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_slider_popup_bg_ef.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_slider_popup_bg_ef.#.png
similarity index 100%
rename from res/common/usr/share/osp/bitmaps/720x1280/black/00_slider_popup_bg_ef.png
rename to res/common/usr/share/osp/bitmaps/720x1280/black/00_slider_popup_bg_ef.#.png

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_slider_popup_bottom_bg_ef.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_slider_popup_bottom_bg_ef.png
deleted file mode 100644 (file)
index 65ff0b0..0000000
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/black/00_slider_popup_bottom_bg_ef.png and /dev/null differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/default/00_slider_popup_bg_ef.png b/res/common/usr/share/osp/bitmaps/720x1280/default/00_slider_popup_bg_ef.#.png
old mode 100755 (executable)
new mode 100644 (file)
similarity index 77%
rename from res/common/usr/share/osp/bitmaps/720x1280/default/00_slider_popup_bg_ef.png
rename to res/common/usr/share/osp/bitmaps/720x1280/default/00_slider_popup_bg_ef.#.png
index 6db6a8b..2bc1ad6
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/default/00_slider_popup_bg_ef.png and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_slider_popup_bg_ef.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/default/00_slider_popup_bottom_bg_ef.png b/res/common/usr/share/osp/bitmaps/720x1280/default/00_slider_popup_bottom_bg_ef.png
deleted file mode 100755 (executable)
index 6865154..0000000
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/default/00_slider_popup_bottom_bg_ef.png and /dev/null differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_slider_popup_bg_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_slider_popup_bg_ef.#.png
new file mode 100644 (file)
index 0000000..2bc1ad6
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_slider_popup_bg_ef.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_slider_popup_bottom_bg_ef.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_slider_popup_bottom_bg_ef.png
deleted file mode 100755 (executable)
index 6865154..0000000
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/white/00_slider_popup_bottom_bg_ef.png and /dev/null differ

diff --git a/src/ui/controls/FUiCtrl_SliderOverlay.cpp b/src/ui/controls/FUiCtrl_SliderOverlay.cpp
index 3d2026b..10ef0ff 100755 (executable)
--- a/src/ui/controls/FUiCtrl_SliderOverlay.cpp
+++ b/src/ui/controls/FUiCtrl_SliderOverlay.cpp
@@ -35,8 +35,6 @@ namespace Tizen { namespace Ui { namespace Controls
 _SliderOverlay::_SliderOverlay(void)
        : __pOverlayBgBitmap(null)
        , __pOverlayBgEffectBitmap(null)
-       , __pOverlayBottomBgBitmap(null)
-       , __pOverlayBottomBgEffectBitmap(null)
        , __overlayBgColor(0)
        , __overlayTextColor(0)
        , __pFont(null)
@@ -57,12 +55,6 @@ _SliderOverlay::~_SliderOverlay(void)
        delete __pOverlayBgEffectBitmap;
        __pOverlayBgEffectBitmap = null;
 
-       delete __pOverlayBottomBgBitmap;
-       __pOverlayBgBitmap = null;
-
-       delete __pOverlayBottomBgEffectBitmap;
-       __pOverlayBgEffectBitmap = null;
-
 }
 
 
@@ -135,32 +127,12 @@ _SliderOverlay::LoadBitmaps(FloatDimension& dim)
        delete pBitmap;
        pBitmap = null;
 
-       r = GET_BITMAP_CONFIG_N(SLIDER::DOWNWARD_OVERLAY_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pBitmap);
-       SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.");
-
-       pReplacementBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pBitmap, Color::GetColor(COLOR_ID_MAGENTA), __overlayBgColor);
-       r = GetLastResult();
-       SysTryCatch(NID_UI_CTRL, pReplacementBitmap != null, , r, "[%s] Propagating.", GetErrorMessage(r));
-
-       delete __pOverlayBottomBgBitmap;
-       __pOverlayBottomBgBitmap = pReplacementBitmap;
-
-       delete pBitmap;
-       pBitmap = null;
-
-
        r = GET_BITMAP_CONFIG_N(SLIDER::UPWARD_OVERLAY_BG_EFFECT, BITMAP_PIXEL_FORMAT_ARGB8888, pBitmap);
        SysTryReturnResult(NID_UI_CTRL, (r == E_SUCCESS), r, "Propagating.");
 
        delete __pOverlayBgEffectBitmap;
        __pOverlayBgEffectBitmap = pBitmap;
 
-       r = GET_BITMAP_CONFIG_N(SLIDER::DOWNWARD_OVERLAY_BG_EFFECT, BITMAP_PIXEL_FORMAT_ARGB8888, pBitmap);
-       SysTryReturnResult(NID_UI_CTRL, (r == E_SUCCESS), r, "Propagating.");
-
-       delete __pOverlayBottomBgEffectBitmap;
-       __pOverlayBottomBgEffectBitmap = pBitmap;
-
        return r;
 
 CATCH:
@@ -181,7 +153,6 @@ _SliderOverlay::DrawSliderOverlay(int positionX, int handleWidth, int value)
        int overlayTextSize = 0;
        float overlayBodyHeight = 0.0f;
        float overlayY = 0.0f;
-       float overlayOffset = 0.0f;
        Point textPoint(0, 0);
        bool isCustomBitmap = false;
 
@@ -230,23 +201,6 @@ _SliderOverlay::DrawSliderOverlay(int positionX, int handleWidth, int value)
                                                                        __sliderRect.y + overlayY - (overlayHeight + overlayBottomMargin),
                                                                        overlayWidth, overlayHeight);
 
-       if (__sliderOverlayRect.y <= 0)
-       {
-               if (__sliderRect.height < (__sliderTouchRect.y + __sliderTouchRect.height))
-               {
-                       overlayOffset = __sliderRect.height;
-               }
-               else
-               {
-                       overlayOffset = __sliderTouchRect.y + __sliderTouchRect.height;
-               }
-               __sliderOverlayRect.y = __sliderRect.y + overlayOffset + overlayBottomMargin;
-               pBgBitmap = __pOverlayBottomBgBitmap;
-               pEffectBgBitmap = __pOverlayBottomBgEffectBitmap;
-               textPoint.y = overlayHeight - overlayBodyHeight;
-               isCustomBitmap = IS_CUSTOM_BITMAP(SLIDER::DOWNWARD_OVERLAY_BG_NORMAL);
-       }
-
        // Check SliderOverlay Position
        if (__sliderOverlayRect.x < __sliderRect.x)
        {

diff --git a/src/ui/inc/FUiCtrl_SliderOverlay.h b/src/ui/inc/FUiCtrl_SliderOverlay.h
index ef21e51..b348963 100644 (file)
--- a/src/ui/inc/FUiCtrl_SliderOverlay.h
+++ b/src/ui/inc/FUiCtrl_SliderOverlay.h
@@ -64,8 +64,6 @@ private:
        Tizen::Graphics::FloatRectangle __sliderOverlayRect;
        Tizen::Graphics::Bitmap* __pOverlayBgBitmap;
        Tizen::Graphics::Bitmap* __pOverlayBgEffectBitmap;
-       Tizen::Graphics::Bitmap* __pOverlayBottomBgBitmap;
-       Tizen::Graphics::Bitmap* __pOverlayBottomBgEffectBitmap;
        Tizen::Graphics::Color __overlayBgColor;
        Tizen::Graphics::Color __overlayTextColor;
 

diff --git a/src/ui/inc/FUi_ResourceSliderConfig.h b/src/ui/inc/FUi_ResourceSliderConfig.h
index 9a8dab5..8004462 100755 (executable)
--- a/src/ui/inc/FUi_ResourceSliderConfig.h
+++ b/src/ui/inc/FUi_ResourceSliderConfig.h
@@ -51,8 +51,6 @@ DECLARE_UI_CONFIG(SLIDER);
        DECLARE_IMAGE_CONFIG(HANDLE_BG_EFFECT_HIGHLIGHTED, 12);
        DECLARE_IMAGE_CONFIG(UPWARD_OVERLAY_BG_NORMAL, 13);
        DECLARE_IMAGE_CONFIG(UPWARD_OVERLAY_BG_EFFECT, 14);
-       DECLARE_IMAGE_CONFIG(DOWNWARD_OVERLAY_BG_NORMAL, 15);
-       DECLARE_IMAGE_CONFIG(DOWNWARD_OVERLAY_BG_EFFECT, 16);
        DECLARE_SHAPE_CONFIG(HANDLE_WIDTH, 1);
        DECLARE_SHAPE_CONFIG(HANDLE_HEIGHT, 2);
        DECLARE_SHAPE_CONFIG(HANDLE_OFFSET, 3);

diff --git a/src/ui/resource/FUi_ResourceConfigParser.cpp b/src/ui/resource/FUi_ResourceConfigParser.cpp
index 5404e61..52b8b32 100755 (executable)
--- a/src/ui/resource/FUi_ResourceConfigParser.cpp
+++ b/src/ui/resource/FUi_ResourceConfigParser.cpp
@@ -1498,10 +1498,6 @@ ConfigParser::GetImageKeyTable(void)
                        __pImageKeyTable->Add(ResourceKey(key), _SLIDER::HANDLE_BG_HIGHLIGHTED_IMAGE);
                }
                {
-                       const char* key ="SLIDER::DOWNWARD_OVERLAY_BG_NORMAL";
-                       __pImageKeyTable->Add(ResourceKey(key), _SLIDER::DOWNWARD_OVERLAY_BG_NORMAL_IMAGE);
-               }
-               {
                        const char* key ="SLIDER::UPWARD_OVERLAY_BG_NORMAL";
                        __pImageKeyTable->Add(ResourceKey(key), _SLIDER::UPWARD_OVERLAY_BG_NORMAL_IMAGE);
                }

diff --git a/src/ui/resource/FUi_ResourceSliderConfig.cpp b/src/ui/resource/FUi_ResourceSliderConfig.cpp
index a0ec7f8..4db776a 100755 (executable)
--- a/src/ui/resource/FUi_ResourceSliderConfig.cpp
+++ b/src/ui/resource/FUi_ResourceSliderConfig.cpp
@@ -57,10 +57,8 @@ START_UI_CONFIG(SLIDER);
        ADD_IMAGE_CONFIG(HANDLE_BG_EFFECT_DISABLED, #00_slider_handle_ef_dim.png);
        ADD_IMAGE_CONFIG(HANDLE_BG_EFFECT_HIGHLIGHTED, #00_slider_handle_ef.png);
 
-       ADD_IMAGE_CONFIG(UPWARD_OVERLAY_BG_NORMAL, #00_slider_popup_bg.png);
-       ADD_IMAGE_CONFIG(UPWARD_OVERLAY_BG_EFFECT, #00_slider_popup_bg_ef.png);
-       ADD_IMAGE_CONFIG(DOWNWARD_OVERLAY_BG_NORMAL, #00_slider_popup_bottom_bg.png);
-       ADD_IMAGE_CONFIG(DOWNWARD_OVERLAY_BG_EFFECT, #00_slider_popup_bottom_bg_ef.png);
+       ADD_IMAGE_CONFIG(UPWARD_OVERLAY_BG_NORMAL, #00_slider_popup_bg.#.png);
+       ADD_IMAGE_CONFIG(UPWARD_OVERLAY_BG_EFFECT, #00_slider_popup_bg_ef.#.png);
 
        START_UI_CONFIG_MODE(720x1280);
        {