Fixed button issue in ColorPicker

Signed-off-by: Syed Khaja Moinuddin <moinuddin.s@samsung.com>
Change-Id: I6ec52060d3866eef4bf27545ac45b4df8e01483e

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_color_picker_brightness.png b/res/common/usr/share/osp/bitmaps/480x800/00_color_picker_brightness.png
index aa51c52..9b12ba3 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_color_picker_brightness.png and b/res/common/usr/share/osp/bitmaps/480x800/00_color_picker_brightness.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_color_picker_brightness_h.png b/res/common/usr/share/osp/bitmaps/480x800/00_color_picker_brightness_h.png
index 580124f..d1c90b0 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_color_picker_brightness_h.png and b/res/common/usr/share/osp/bitmaps/480x800/00_color_picker_brightness_h.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_color_picker_color.png b/res/common/usr/share/osp/bitmaps/480x800/00_color_picker_color.png
index 9f555ee..43d8ec9 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_color_picker_color.png and b/res/common/usr/share/osp/bitmaps/480x800/00_color_picker_color.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_color_picker_color_h.png b/res/common/usr/share/osp/bitmaps/480x800/00_color_picker_color_h.png
index 93d82ea..76c1bcc 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_color_picker_color_h.png and b/res/common/usr/share/osp/bitmaps/480x800/00_color_picker_color_h.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_color_picker_custom_color.png b/res/common/usr/share/osp/bitmaps/480x800/00_color_picker_custom_color.png
index 49d9f5a..f4ce8de 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_color_picker_custom_color.png and b/res/common/usr/share/osp/bitmaps/480x800/00_color_picker_custom_color.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_color_picker_custom_color_h.png b/res/common/usr/share/osp/bitmaps/480x800/00_color_picker_custom_color_h.png
index efc8c68..495ed65 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_color_picker_custom_color_h.png and b/res/common/usr/share/osp/bitmaps/480x800/00_color_picker_custom_color_h.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_color_picker_saturation.png b/res/common/usr/share/osp/bitmaps/480x800/00_color_picker_saturation.png
index 7cfea3b..ee10671 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_color_picker_saturation.png and b/res/common/usr/share/osp/bitmaps/480x800/00_color_picker_saturation.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_color_picker_saturation_h.png b/res/common/usr/share/osp/bitmaps/480x800/00_color_picker_saturation_h.png
index 1a94c64..6d7876c 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_color_picker_saturation_h.png and b/res/common/usr/share/osp/bitmaps/480x800/00_color_picker_saturation_h.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_color_picker_brightness.png b/res/common/usr/share/osp/bitmaps/720x1280/00_color_picker_brightness.png
index fd8e44d..507c217 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_color_picker_brightness.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_color_picker_brightness.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_color_picker_brightness_h.png b/res/common/usr/share/osp/bitmaps/720x1280/00_color_picker_brightness_h.png
index a163521..bd2c5e4 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_color_picker_brightness_h.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_color_picker_brightness_h.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_color_picker_color.png b/res/common/usr/share/osp/bitmaps/720x1280/00_color_picker_color.png
index 1e8702b..b14670b 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_color_picker_color.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_color_picker_color.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_color_picker_color_h.png b/res/common/usr/share/osp/bitmaps/720x1280/00_color_picker_color_h.png
index 7348715..e860aa1 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_color_picker_color_h.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_color_picker_color_h.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_color_picker_custom_color.png b/res/common/usr/share/osp/bitmaps/720x1280/00_color_picker_custom_color.png
index 76db50a..1eccb41 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_color_picker_custom_color.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_color_picker_custom_color.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_color_picker_custom_color_h.png b/res/common/usr/share/osp/bitmaps/720x1280/00_color_picker_custom_color_h.png
index 20a43d0..1612417 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_color_picker_custom_color_h.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_color_picker_custom_color_h.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_color_picker_saturation.png b/res/common/usr/share/osp/bitmaps/720x1280/00_color_picker_saturation.png
index 8edd433..505ab1e 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_color_picker_saturation.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_color_picker_saturation.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_color_picker_saturation_h.png b/res/common/usr/share/osp/bitmaps/720x1280/00_color_picker_saturation_h.png
index f466e7b..87a8a72 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_color_picker_saturation_h.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_color_picker_saturation_h.png differ

diff --git a/src/ui/controls/FUiCtrl_ColorPickerPresenter.cpp b/src/ui/controls/FUiCtrl_ColorPickerPresenter.cpp
index f5d0ef9..6402525 100644 (file)
--- a/src/ui/controls/FUiCtrl_ColorPickerPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_ColorPickerPresenter.cpp
@@ -1013,15 +1013,15 @@ _ColorPickerPresenter::DrawArrowButton(Canvas& canvas, const FloatRectangle& rcB
        {
                isCustomBitmap = IS_CUSTOM_BITMAP(COLORPICKER::ARROW_BUTTON_BG_DISABLED);
 
+               r = DrawResourceBitmap(canvas, rcButton, __pColorDisabledReplacementBgBitmap);
+               SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+
                if (isCustomBitmap == false)
                {
                        r = DrawResourceBitmap(canvas, rcButton, __pDisabledEffectBgBitmap);
                        SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
                }
 
-               r = DrawResourceBitmap(canvas, rcButton, __pColorDisabledReplacementBgBitmap);
-               SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
-
                if (drawLeftButton)
                {
                        r = DrawResourceBitmap(canvas, rightLeftArrowIconBounds, __pLeftArrowDisabledBitmap);
@@ -1037,15 +1037,15 @@ _ColorPickerPresenter::DrawArrowButton(Canvas& canvas, const FloatRectangle& rcB
        {
                isCustomBitmap = IS_CUSTOM_BITMAP(COLORPICKER::ARROW_BUTTON_BG_PRESSED);
 
+               r = DrawResourceBitmap(canvas, rcButton, __pColorPressedReplacementBgBitmap);
+               SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+
                if (isCustomBitmap == false)
                {
                        r = DrawResourceBitmap(canvas, rcButton, __pPressedEffectBgBitmap);
                        SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
                }
 
-               r = DrawResourceBitmap(canvas, rcButton, __pColorPressedReplacementBgBitmap);
-               SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
-
                if (drawLeftButton)
                {
                        r = DrawResourceBitmap(canvas, rightLeftArrowIconBounds, __pLeftArrowPressedBitmap);
@@ -1061,15 +1061,15 @@ _ColorPickerPresenter::DrawArrowButton(Canvas& canvas, const FloatRectangle& rcB
        {
                isCustomBitmap = IS_CUSTOM_BITMAP(COLORPICKER::ARROW_BUTTON_BG_NORMAL);
 
+               r = DrawResourceBitmap(canvas, rcButton, __pColorNormalReplacementBgBitmap);
+               SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+
                if (isCustomBitmap == false)
                {
                        r = DrawResourceBitmap(canvas, rcButton, __pNormalEffectBgBitmap);
                        SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
                }
 
-               r = DrawResourceBitmap(canvas, rcButton, __pColorNormalReplacementBgBitmap);
-               SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
-
                if (drawLeftButton)
                {
                        r = DrawResourceBitmap(canvas, rightLeftArrowIconBounds, __pLeftArrowNormalBitmap);