Fixed black line highlighted issue in ColorPicker.

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

diff --git a/src/ui/controls/FUiCtrl_ColorPickerPresenter.cpp b/src/ui/controls/FUiCtrl_ColorPickerPresenter.cpp
index 965b99e..ef02d05 100755 (executable)
--- a/src/ui/controls/FUiCtrl_ColorPickerPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_ColorPickerPresenter.cpp
@@ -828,12 +828,12 @@ _ColorPickerPresenter::DrawHueSlider(Canvas& canvas)
        if (__pHueSliderBgBitmap != null && orientation == _CONTROL_ORIENTATION_PORTRAIT)
        {
                r = DrawResourceBitmap(canvas, __componentBounds[HUE_BAR], __pHueSliderBgBitmap);
-               SysTryReturn(NID_UI_CTRL, (r == E_SUCCESS), E_SYSTEM, E_SYSTEM, "[%s] Propagating.", GetErrorMessage(r));
+               SysTryReturn(NID_UI_CTRL, (r == E_SUCCESS), r, r, "[%s] Propagating.", GetErrorMessage(r));
        }
        else if (__pLandscapeHueSliderBgBitmap != null && orientation == _CONTROL_ORIENTATION_LANDSCAPE)
        {
                r = DrawResourceBitmap(canvas, __componentBounds[HUE_BAR], __pLandscapeHueSliderBgBitmap);
-               SysTryReturn(NID_UI_CTRL, (r == E_SUCCESS), E_SYSTEM, E_SYSTEM, "[%s] Propagating.", GetErrorMessage(r));
+               SysTryReturn(NID_UI_CTRL, (r == E_SUCCESS), r, r, "[%s] Propagating.", GetErrorMessage(r));
        }
 
        return r;
@@ -853,25 +853,25 @@ _ColorPickerPresenter::DrawLuminanceSlider(Canvas& canvas)
        {
                pColorReplacementBitmap = _BitmapImpl::GetColorReplacedBitmapN(*__pCustomBitmap, Color::GetColor(COLOR_ID_MAGENTA), __pColorPickerModel->GetSaturationColor());
                r = GetLastResult();
-               SysTryReturn(NID_UI_CTRL, pColorReplacementBitmap, E_SYSTEM, E_SYSTEM, "[%s] Propagating.", GetErrorMessage(r));
+               SysTryReturn(NID_UI_CTRL, pColorReplacementBitmap, E_SYSTEM, r, "[%s] Propagating.", GetErrorMessage(r));
 
                r = DrawResourceBitmap(canvas, __componentBounds[LUM_BAR], pColorReplacementBitmap);
-               SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , E_SYSTEM, "[%s] Propagating.", GetErrorMessage(r));
+               SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
 
                r = DrawResourceBitmap(canvas, __componentBounds[LUM_BAR], __pLuminanceSliderBgBitmap);
-               SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , E_SYSTEM, "[%s] Propagating.", GetErrorMessage(r));
+               SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
        }
        else if (__pLandscapeCustomBitmap != null && __pLandscapeLuminanceSliderBgBitmap != null && orientation == _CONTROL_ORIENTATION_LANDSCAPE)
        {
                pColorReplacementBitmap = _BitmapImpl::GetColorReplacedBitmapN(*__pLandscapeCustomBitmap, Color::GetColor(COLOR_ID_MAGENTA), __pColorPickerModel->GetSaturationColor());
                r = GetLastResult();
-               SysTryReturn(NID_UI_CTRL, pColorReplacementBitmap, E_SYSTEM, E_SYSTEM, "[%s] Propagating.", GetErrorMessage(r));
+               SysTryReturn(NID_UI_CTRL, pColorReplacementBitmap, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
                r = DrawResourceBitmap(canvas, __componentBounds[LUM_BAR], pColorReplacementBitmap);
-               SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , E_SYSTEM, "[%s] Propagating.", GetErrorMessage(r));
+               SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
 
                r = DrawResourceBitmap(canvas, __componentBounds[LUM_BAR], __pLandscapeLuminanceSliderBgBitmap);
-               SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , E_SYSTEM, "[%s] Propagating.", GetErrorMessage(r));
+               SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
        }
 
        __saturationColor = __pColorPickerModel->GetSaturationColor();
@@ -903,25 +903,25 @@ _ColorPickerPresenter::DrawSaturationSlider(Canvas& canvas)
        {
                pColorReplacementBitmap = _BitmapImpl::GetColorReplacedBitmapN(*__pCustomBitmap, Color::GetColor(COLOR_ID_MAGENTA), __pColorPickerModel->GetHueColor());
                r = GetLastResult();
-               SysTryReturn(NID_UI_CTRL, pColorReplacementBitmap, E_SYSTEM, E_SYSTEM, "[%s] Propagating.", GetErrorMessage(r));
+               SysTryReturn(NID_UI_CTRL, pColorReplacementBitmap, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
                r = DrawResourceBitmap(canvas, __componentBounds[SAT_BAR], pColorReplacementBitmap);
-               SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , E_SYSTEM, "[%s] Propagating.", GetErrorMessage(r));
+               SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
 
                r = DrawResourceBitmap(canvas, __componentBounds[SAT_BAR], __pSaturationSliderBgBitmap);
-               SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , E_SYSTEM, "[%s] Propagating.", GetErrorMessage(r));
+               SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
        }
        else if (__pLandscapeCustomBitmap != null && __pLandscapeSaturationSliderBgBitmap != null && orientation == _CONTROL_ORIENTATION_LANDSCAPE)
        {
                pColorReplacementBitmap = _BitmapImpl::GetColorReplacedBitmapN(*__pLandscapeCustomBitmap, Color::GetColor(COLOR_ID_MAGENTA), __pColorPickerModel->GetHueColor());
                r = GetLastResult();
-               SysTryReturn(NID_UI_CTRL, pColorReplacementBitmap, E_SYSTEM, E_SYSTEM, "[%s] Propagating.", GetErrorMessage(r));
+               SysTryReturn(NID_UI_CTRL, pColorReplacementBitmap, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
                r = DrawResourceBitmap(canvas, __componentBounds[SAT_BAR], pColorReplacementBitmap);
-               SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , E_SYSTEM, "[%s] Propagating.", GetErrorMessage(r));
+               SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
 
                r = DrawResourceBitmap(canvas, __componentBounds[SAT_BAR], __pLandscapeSaturationSliderBgBitmap);
-               SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , E_SYSTEM, "[%s] Propagating.", GetErrorMessage(r));
+               SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
        }
 
        __hueColor = __pColorPickerModel->GetHueColor();
@@ -953,10 +953,10 @@ _ColorPickerPresenter::DrawLine(Canvas& canvas)
        Color dividerBottomHalfColor;
 
        r = GET_COLOR_CONFIG(COLORPICKER::DIVIDER_TOP_HALF, dividerTopHalfColor);
-       SysTryReturn(NID_UI_CTRL, (r == E_SUCCESS), E_SYSTEM, E_SYSTEM, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturn(NID_UI_CTRL, (r == E_SUCCESS), r, r, "[%s] Propagating.", GetErrorMessage(r));
 
        r = GET_COLOR_CONFIG(COLORPICKER::DIVIDER_BOTTOM_HALF, dividerBottomHalfColor);
-       SysTryReturn(NID_UI_CTRL, (r == E_SUCCESS), E_SYSTEM, E_SYSTEM, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturn(NID_UI_CTRL, (r == E_SUCCESS), r, r, "[%s] Propagating.", GetErrorMessage(r));
 
        canvas.SetForegroundColor(dividerTopHalfColor);
        canvas.SetLineStyle(LINE_STYLE_SOLID);
@@ -965,13 +965,13 @@ _ColorPickerPresenter::DrawLine(Canvas& canvas)
        FloatPoint endPoint = Tizen::Graphics::CoordinateSystem::AlignToDevice(FloatPoint(__dividerMargin + __dividerWidth, __topMargin + __blockHeight - __blockMargin));
 
        r = canvas.DrawLine(startPoint, endPoint);
-       SysTryReturn(NID_UI_CTRL, (r == E_SUCCESS), E_SYSTEM, E_SYSTEM, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturn(NID_UI_CTRL, (r == E_SUCCESS), r, r, "[%s] Propagating.", GetErrorMessage(r));
 
        startPoint = Tizen::Graphics::CoordinateSystem::AlignToDevice(FloatPoint(__dividerMargin, __topMargin + (__blockHeight * 2.0f) - __blockMargin));
        endPoint = Tizen::Graphics::CoordinateSystem::AlignToDevice(FloatPoint(__dividerMargin + __dividerWidth, __topMargin + (__blockHeight * 2.0f) - __blockMargin));
 
        r = canvas.DrawLine(startPoint, endPoint);
-       SysTryReturn(NID_UI_CTRL, (r == E_SUCCESS), E_SYSTEM, E_SYSTEM, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturn(NID_UI_CTRL, (r == E_SUCCESS), r, r, "[%s] Propagating.", GetErrorMessage(r));
 
        canvas.SetForegroundColor(dividerBottomHalfColor);
 
@@ -979,13 +979,13 @@ _ColorPickerPresenter::DrawLine(Canvas& canvas)
        endPoint = Tizen::Graphics::CoordinateSystem::AlignToDevice(FloatPoint(__dividerMargin + __dividerWidth, __topMargin + __blockHeight));
 
        r = canvas.DrawLine(startPoint, endPoint);
-       SysTryReturn(NID_UI_CTRL, (r == E_SUCCESS), E_SYSTEM, E_SYSTEM, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturn(NID_UI_CTRL, (r == E_SUCCESS), r, r, "[%s] Propagating.", GetErrorMessage(r));
 
        startPoint = Tizen::Graphics::CoordinateSystem::AlignToDevice(FloatPoint(__dividerMargin, __topMargin + (__blockHeight * 2.0f)));
        endPoint = Tizen::Graphics::CoordinateSystem::AlignToDevice(FloatPoint(__dividerMargin + __dividerWidth, __topMargin + (__blockHeight * 2.0f)));
 
        r = canvas.DrawLine(startPoint, endPoint);
-       SysTryReturn(NID_UI_CTRL, (r == E_SUCCESS), E_SYSTEM, E_SYSTEM, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturn(NID_UI_CTRL, (r == E_SUCCESS), r, r, "[%s] Propagating.", GetErrorMessage(r));
 
        canvas.SetForegroundColor(foregroundColor);
 
@@ -1393,12 +1393,12 @@ _ColorPickerPresenter::DrawResourceBitmap(Canvas& canvas, const FloatRectangle&
 
        if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pBitmap))
        {
-               r = canvas.DrawNinePatchedBitmap(bounds, *pBitmap);
+               r = canvas.DrawNinePatchedBitmap(CoordinateSystem::AlignToDevice(bounds), *pBitmap);
                SysTryReturn(NID_UI_CTRL, (r == E_SUCCESS), r, r, "[%s] Propagating.", GetErrorMessage(r));
        }
        else
        {
-               r = canvas.DrawBitmap(bounds, *pBitmap);
+               r = canvas.DrawBitmap(CoordinateSystem::AlignToDevice(bounds), *pBitmap);
                SysTryReturn(NID_UI_CTRL, (r == E_SUCCESS), r, r, "[%s] Propagating.", GetErrorMessage(r));
        }
        return r;