Merging Winset 4.4 HD image changes for lists

Change-Id: Ie7c1d7e4b66543ab48ac1c823c1045e2618af3e0

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_list_group_press_bg.#.png b/res/common/usr/share/osp/bitmaps/720x1280/00_list_group_press_bg.#.png
index aa02025..7038e9e 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_list_group_press_bg.#.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_list_group_press_bg.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_list_group_press_bg_bottom.#.png b/res/common/usr/share/osp/bitmaps/720x1280/00_list_group_press_bg_bottom.#.png
index d2e4f9c..4404435 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_list_group_press_bg_bottom.#.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_list_group_press_bg_bottom.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_list_group_press_bg_center.#.png b/res/common/usr/share/osp/bitmaps/720x1280/00_list_group_press_bg_center.#.png
index f20a6f7..4de51f7 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_list_group_press_bg_center.#.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_list_group_press_bg_center.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_list_group_press_bg_top.#.png b/res/common/usr/share/osp/bitmaps/720x1280/00_list_group_press_bg_top.#.png
index f682e48..7e64557 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_list_group_press_bg_top.#.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_list_group_press_bg_top.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_list_group_bg_bottom_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_list_group_bg_bottom_ef.#.png
index 7ff73eb..2c920f6 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/black/00_list_group_bg_bottom_ef.#.png and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_list_group_bg_bottom_ef.#.png differ

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

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_list_group_bg_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_list_group_bg_ef.#.png
index ac7ecf4..9677a24 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/black/00_list_group_bg_ef.#.png and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_list_group_bg_ef.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_list_group_bg_top_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_list_group_bg_top_ef.#.png
index 813d2b1..9b6580f 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/black/00_list_group_bg_top_ef.#.png and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_list_group_bg_top_ef.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/default/00_list_group_bg_bottom_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/default/00_list_group_bg_bottom_ef.#.png
index 7ff73eb..2c920f6 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/default/00_list_group_bg_bottom_ef.#.png and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_list_group_bg_bottom_ef.#.png differ

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

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/default/00_list_group_bg_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/default/00_list_group_bg_ef.#.png
index ac7ecf4..9677a24 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/default/00_list_group_bg_ef.#.png and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_list_group_bg_ef.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/default/00_list_group_bg_top_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/default/00_list_group_bg_top_ef.#.png
index 813d2b1..9b6580f 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/default/00_list_group_bg_top_ef.#.png and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_list_group_bg_top_ef.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_list_group_bg_bottom_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_list_group_bg_bottom_ef.#.png
index 21c8016..2dddb07 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/white/00_list_group_bg_bottom_ef.#.png and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_list_group_bg_bottom_ef.#.png differ

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

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_list_group_bg_top_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_list_group_bg_top_ef.#.png
index 8d15a94..15d4091 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/white/00_list_group_bg_top_ef.#.png and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_list_group_bg_top_ef.#.png differ

diff --git a/src/ui/controls/FUiCtrl_TableViewItem.cpp b/src/ui/controls/FUiCtrl_TableViewItem.cpp
index 7c89342..8b6c2b0 100644 (file)
--- a/src/ui/controls/FUiCtrl_TableViewItem.cpp
+++ b/src/ui/controls/FUiCtrl_TableViewItem.cpp
@@ -3175,13 +3175,13 @@ _TableViewItem::DrawItemDivider(void)
                        }
 
                        GET_SHAPE_CONFIG(TABLEVIEW::GROUPITEM_INDEX_BAR_HEIGHT, _CONTROL_ORIENTATION_PORTRAIT, lineHeight);
-                       GET_SHAPE_CONFIG(TABLEVIEW::GROUPITEM_INDEX_BAR_LEFT_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, lineLeftMargin);
+                       GET_SHAPE_CONFIG(TABLEVIEW::ITEM_DIVIDER_LEFT_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, lineLeftMargin);
                        GET_SHAPE_CONFIG(TABLEVIEW::GROUPITEM_INDEX_BAR_BOTTOM_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, lineBottomMargin);
 
                        lineHeight = Tizen::Graphics::CoordinateSystem::ConvertToLogicalY(lineHeight);
                        lineBottomMargin = Tizen::Graphics::CoordinateSystem::ConvertToLogicalY(lineBottomMargin);
                        bottomPoint = Tizen::Graphics::CoordinateSystem::AlignToDevice(FloatPoint(lineLeftMargin, bounds.height));
-                       dividerBottomBounds = FloatRectangle(bottomPoint.x, bottomPoint.y - lineBottomMargin, bounds.width - lineLeftMargin * 2, lineHeight);
+                       dividerBottomBounds = FloatRectangle(bottomPoint.x, bottomPoint.y - lineBottomMargin, bounds.width - lineLeftMargin * 2.0f, lineHeight);
                }
        }
        else
@@ -3211,14 +3211,14 @@ _TableViewItem::DrawItemDivider(void)
                customDividerColor = __pDrawingProperty->dividerColor;
                GET_COLOR_CONFIG(TABLEVIEW::ITEM_DIVIDER_TOP_BG_NORMAL, topLineColor);
                GET_COLOR_CONFIG(TABLEVIEW::ITEM_DIVIDER_BOTTOM_BG_NORMAL, bottomLineColor);
-               GET_SHAPE_CONFIG(TABLEVIEW::GROUPITEM_INDEX_BAR_LEFT_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, lineLeftMargin);
+               GET_SHAPE_CONFIG(TABLEVIEW::ITEM_DIVIDER_LEFT_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, lineLeftMargin);
                GET_FIXED_VALUE_CONFIG(TABLEVIEW::ITEM_DIVIDER_HEIGHT, _CONTROL_ORIENTATION_PORTRAIT, lineHeight);
 
                lineHeight = Tizen::Graphics::CoordinateSystem::ConvertToLogicalY(lineHeight);
                bottomPoint = Tizen::Graphics::CoordinateSystem::AlignToDevice(FloatPoint(lineLeftMargin, (bounds.height)));
 
-               dividerTopBounds.SetBounds(bottomPoint.x, 0.0f, bounds.width - lineLeftMargin * 2, lineHeight);
-               dividerBottomBounds.SetBounds(bottomPoint.x, bottomPoint.y - lineHeight, bounds.width - lineLeftMargin * 2, lineHeight);
+               dividerTopBounds.SetBounds(bottomPoint.x, 0.0f, bounds.width - lineLeftMargin * 2.0f, lineHeight);
+               dividerBottomBounds.SetBounds(bottomPoint.x, bottomPoint.y - lineHeight, bounds.width - lineLeftMargin * 2.0f, lineHeight);
        }
 
        if(__pItemDivider->GetVisibleState())

diff --git a/src/ui/inc/FUi_ResourceTableViewConfig.h b/src/ui/inc/FUi_ResourceTableViewConfig.h
index 791d558..c706955 100644 (file)
--- a/src/ui/inc/FUi_ResourceTableViewConfig.h
+++ b/src/ui/inc/FUi_ResourceTableViewConfig.h
@@ -150,6 +150,7 @@ DECLARE_UI_CONFIG(TABLEVIEW);
        DECLARE_SHAPE_CONFIG(GROUPITEM_INDEX_BAR_LEFT_MARGIN, 19);
        DECLARE_SHAPE_CONFIG(GROUPITEM_INDEX_BAR_BOTTOM_MARGIN, 20);
        DECLARE_SHAPE_CONFIG(FASTSCROLL_INDEX_WIDTH, 21);
+       DECLARE_SHAPE_CONFIG(ITEM_DIVIDER_LEFT_MARGIN,22);
        DECLARE_FIXED_VALUE_CONFIG(ITEM_DIVIDER_HEIGHT, 1);
        DECLARE_FIXED_VALUE_CONFIG(SECTIONITEM_TOP_MARGIN, 2);
        DECLARE_FIXED_VALUE_CONFIG(ITEM_ANNEX_DIVIDER_WIDTH, 3);

diff --git a/src/ui/resource/FUi_ResourceTableViewConfig.cpp b/src/ui/resource/FUi_ResourceTableViewConfig.cpp
index ba45c58..00e8f9d 100644 (file)
--- a/src/ui/resource/FUi_ResourceTableViewConfig.cpp
+++ b/src/ui/resource/FUi_ResourceTableViewConfig.cpp
@@ -143,6 +143,7 @@ START_UI_CONFIG(TABLEVIEW);
                ADD_SHAPE_CONFIG(GROUPITEM_INDEX_BAR_LEFT_MARGIN, 26);
                ADD_SHAPE_CONFIG(GROUPITEM_INDEX_BAR_BOTTOM_MARGIN, 14);
                ADD_SHAPE_CONFIG(FASTSCROLL_INDEX_WIDTH, 51);
+               ADD_SHAPE_CONFIG(ITEM_DIVIDER_LEFT_MARGIN, 4);
                ADD_FIXED_VALUE_CONFIG(ITEM_DIVIDER_HEIGHT, 1);
                ADD_FIXED_VALUE_CONFIG(SECTIONITEM_TOP_MARGIN, 0);
                ADD_FIXED_VALUE_CONFIG(ITEM_ANNEX_DIVIDER_WIDTH, 1);