Fixed divider thickness issue in ColorPicker

and also submitted new Handler image from GUI 3.5
Signed-off-by: Syed Khaja Moinuddin <moinuddin.s@samsung.com>
Change-Id: I55f849ed00720ea693d58261d40b6ca6772b80a9
Signed-off-by: Syed Khaja Moinuddin <moinuddin.s@samsung.com>

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_color_picker_focus.png b/res/common/usr/share/osp/bitmaps/480x800/00_color_picker_handler.png
old mode 100755 (executable)
new mode 100644 (file)
similarity index 89%
rename from res/common/usr/share/osp/bitmaps/480x800/00_color_picker_focus.png
rename to res/common/usr/share/osp/bitmaps/480x800/00_color_picker_handler.png
index ee33aab..7d02fdf
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_color_picker_focus.png and b/res/common/usr/share/osp/bitmaps/480x800/00_color_picker_handler.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_color_picker_focus.png b/res/common/usr/share/osp/bitmaps/720x1280/00_color_picker_handler.png
old mode 100755 (executable)
new mode 100644 (file)
similarity index 91%
rename from res/common/usr/share/osp/bitmaps/720x1280/00_color_picker_focus.png
rename to res/common/usr/share/osp/bitmaps/720x1280/00_color_picker_handler.png
index 8e0ed9a..bbaa7e7
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_color_picker_focus.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_color_picker_handler.png differ

diff --git a/src/ui/controls/FUiCtrl_ColorPickerPresenter.cpp b/src/ui/controls/FUiCtrl_ColorPickerPresenter.cpp
index e1379aa..965b99e 100755 (executable)
--- a/src/ui/controls/FUiCtrl_ColorPickerPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_ColorPickerPresenter.cpp
@@ -380,7 +380,10 @@ _ColorPickerPresenter::LoadDrawingProperties(const FloatRectangle& controlBounds
        GET_SHAPE_CONFIG(COLORPICKER::DIVIDER_MARGIN, orientation, __dividerMargin);
        GET_SHAPE_CONFIG(COLORPICKER::DIVIDER_WIDTH, orientation, __dividerWidth);
 
-       __topMargin = (controlBounds.height - __blockHeight * _BLOCK_COUNT) / 2;
+       __blockMargin = Tizen::Graphics::CoordinateSystem::ConvertToLogicalY(__blockMargin);
+       __dividerMargin = Tizen::Graphics::CoordinateSystem::ConvertToLogicalY(__dividerMargin);
+
+       __topMargin = (controlBounds.height - __blockHeight * _BLOCK_COUNT) / 2.0f;
 
        if (__topMargin < 0)
        {
@@ -956,24 +959,32 @@ _ColorPickerPresenter::DrawLine(Canvas& canvas)
        SysTryReturn(NID_UI_CTRL, (r == E_SUCCESS), E_SYSTEM, E_SYSTEM, "[%s] Propagating.", GetErrorMessage(r));
 
        canvas.SetForegroundColor(dividerTopHalfColor);
-       canvas.SetLineWidth(__blockMargin);
+       canvas.SetLineStyle(LINE_STYLE_SOLID);
+
+       FloatPoint startPoint = Tizen::Graphics::CoordinateSystem::AlignToDevice(FloatPoint(__dividerMargin, __topMargin + __blockHeight - __blockMargin));
+       FloatPoint endPoint = Tizen::Graphics::CoordinateSystem::AlignToDevice(FloatPoint(__dividerMargin + __dividerWidth, __topMargin + __blockHeight - __blockMargin));
 
-       r = canvas.DrawLine(FloatPoint(__dividerMargin, __topMargin + __blockHeight - __blockMargin),
-                       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));
 
-       r = canvas.DrawLine(FloatPoint(__dividerMargin, __topMargin + __blockHeight * 2 - __blockMargin),
-                       FloatPoint(__dividerMargin + __dividerWidth, __topMargin + __blockHeight * 2 - __blockMargin));
+       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));
 
        canvas.SetForegroundColor(dividerBottomHalfColor);
 
-       r = canvas.DrawLine(FloatPoint(__dividerMargin, __topMargin + __blockHeight),
-                       FloatPoint(__dividerMargin + __dividerWidth, __topMargin + __blockHeight ));
+       startPoint = Tizen::Graphics::CoordinateSystem::AlignToDevice(FloatPoint(__dividerMargin, __topMargin + __blockHeight));
+       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));
 
-       r = canvas.DrawLine(FloatPoint(__dividerMargin, __topMargin + __blockHeight * 2 ),
-                       FloatPoint(__dividerMargin + __dividerWidth, __topMargin + __blockHeight * 2 ));
+       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));
 
        canvas.SetForegroundColor(foregroundColor);

diff --git a/src/ui/resource/FUi_ResourceColorPickerConfig.cpp b/src/ui/resource/FUi_ResourceColorPickerConfig.cpp
index 61c941c..7a1bc09 100755 (executable)
--- a/src/ui/resource/FUi_ResourceColorPickerConfig.cpp
+++ b/src/ui/resource/FUi_ResourceColorPickerConfig.cpp
@@ -48,7 +48,7 @@ START_UI_CONFIG(COLORPICKER);
        ADD_IMAGE_CONFIG(RIGHT_ARROW_BUTTON_NORMAL, #00_button_right.png);
        ADD_IMAGE_CONFIG(RIGHT_ARROW_BUTTON_PRESSED, #00_button_right.png);
        ADD_IMAGE_CONFIG(RIGHT_ARROW_BUTTON_DISABLED, #00_button_right.png);
-       ADD_IMAGE_CONFIG(HANDLER_NORMAL, #00_color_picker_focus.png);
+       ADD_IMAGE_CONFIG(HANDLER_NORMAL, #00_color_picker_handler.png);
        ADD_IMAGE_CONFIG(BAR_BG_PORTRAIT_NORMAL, #00_color_picker_custom_color.png);
        ADD_IMAGE_CONFIG(HUE_BAR_LANDSCAPE_NORMAL, #00_color_picker_color_h.png);
        ADD_IMAGE_CONFIG(LUMINANCE_BAR_LANDSCAPE_NORMAL, #00_color_picker_brightness_h.png);