Applied the contents of GUI(v3.3) and fixed prevent issue

Change-Id: I3ff59cf92b477170847fdb5123b65954b94b0c98
Signed-off-by: youseong.ji <youseong.ji@samsung.com>

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_button_radio_Activated.png b/res/common/usr/share/osp/bitmaps/720x1280/00_button_radio_Activated.png
index 65501c6..e76b7a7 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_button_radio_Activated.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_button_radio_Activated.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_button_radio_Disabled.png b/res/common/usr/share/osp/bitmaps/720x1280/00_button_radio_Disabled.png
index 026a1a0..44f1df1 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_button_radio_Disabled.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_button_radio_Disabled.png differ

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

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_button_radio_dim.png b/res/common/usr/share/osp/bitmaps/720x1280/00_button_radio_dim.png
old mode 100755 (executable)
new mode 100644 (file)
index 4e5c72f..c6109ce
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_button_radio_dim.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_button_radio_dim.png differ

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

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

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_button_radio_press.png b/res/common/usr/share/osp/bitmaps/720x1280/00_button_radio_press.png
index 5ce7984..462d83e 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_button_radio_press.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_button_radio_press.png differ

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

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_check_Activated.png b/res/common/usr/share/osp/bitmaps/720x1280/00_check_Activated.png
index 8179a10..b20372e 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_check_Activated.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_check_Activated.png differ

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

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_check_bg.png b/res/common/usr/share/osp/bitmaps/720x1280/00_check_bg.png
old mode 100755 (executable)
new mode 100644 (file)
index 80398ed..bb08643
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_check_bg.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_check_bg.png differ

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

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

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

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

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

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_check_bg.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_check_bg.png
old mode 100755 (executable)
new mode 100644 (file)
index 65946b9..bb08643
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/white/00_check_bg.png and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_check_bg.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_check_dim.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_check_dim.png
index da56616..0854732 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/white/00_check_dim.png and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_check_dim.png differ

diff --git a/src/ui/controls/FUiCtrl_TableViewImpl.cpp b/src/ui/controls/FUiCtrl_TableViewImpl.cpp
index 153f72b..e030c60 100644 (file)
--- a/src/ui/controls/FUiCtrl_TableViewImpl.cpp
+++ b/src/ui/controls/FUiCtrl_TableViewImpl.cpp
@@ -890,7 +890,7 @@ _TableViewImpl::OnScrollEndReached(_Control& source, ScrollEndEvent type)
        {
                _ScrollEventArg* pEventArg = _ScrollEventArg::GetScrollEventArgN(GetPublic(), type);
                result r = GetLastResult();
-               SysTryReturnVoidResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
+               SysTryReturnVoidResult(NID_UI_CTRL, pEventArg != null, r, "[%s] Propagating.", GetErrorMessage(r));
 
                __pScrollEvent->Fire(*pEventArg);
        }
@@ -903,7 +903,7 @@ _TableViewImpl::OnScrollPositionChanged(_Control& source, float scrollPosition)
        {
                _ScrollEventArg* pEventArg = _ScrollEventArg::GetScrollEventArgN(GetPublic(), scrollPosition);
                result r = GetLastResult();
-               SysTryReturnVoidResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
+               SysTryReturnVoidResult(NID_UI_CTRL, pEventArg != null, r, "[%s] Propagating.", GetErrorMessage(r));
 
                __pScrollEvent->Fire(*pEventArg);
        }
@@ -916,7 +916,7 @@ _TableViewImpl::OnScrollStopped(_Control& source)
        {
                _ScrollEventArg* pEventArg = _ScrollEventArg::GetScrollEventArgN(GetPublic());
                result r = GetLastResult();
-               SysTryReturnVoidResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
+               SysTryReturnVoidResult(NID_UI_CTRL, pEventArg != null, r, "[%s] Propagating.", GetErrorMessage(r));
 
                __pScrollEvent->Fire(*pEventArg);
        }

diff --git a/src/ui/controls/FUiCtrl_TableViewItem.cpp b/src/ui/controls/FUiCtrl_TableViewItem.cpp
index e429119..39e524f 100644 (file)
--- a/src/ui/controls/FUiCtrl_TableViewItem.cpp
+++ b/src/ui/controls/FUiCtrl_TableViewItem.cpp
@@ -378,7 +378,6 @@ _TableViewItem::~_TableViewItem()
                {
                        pContainer->RemoveAllElement();
                }
-               __pAccessibilityElement->Activate(false);
                __pAccessibilityElement = null;
        }
 }
@@ -1241,13 +1240,9 @@ _TableViewItem::OnTouchPressed(const _Control& source, const _TouchInfo& touchin
        {
                StopTouchReleasedTimer();
 
-               if (!IsIndividualSelectionEnabled(source))
-               {
-                       __itemSelected = true;
-                       FireItemTouchPressed();
-               }
-
                FireItemTouchReleased();
+               __itemSelected = true;
+               return true;
        }
        else
        {
@@ -2070,7 +2065,6 @@ _TableViewItem::DrawItemBackground(void)
        return;
 
 CATCH:
-       delete pCanvas;
 
        if (__pBitmapVisualElement != null)
        {
@@ -2180,26 +2174,29 @@ _TableViewItem::DrawSectionStyleBackground(void)
        if (__drawingStatus != TABLE_VIEW_ITEM_DRAWING_STATUS_NORMAL)
        {
                Color pressColor;
+               GET_COLOR_CONFIG(TABLEVIEW::ITEM_BG_PRESSED, pressColor);
 
                if (__itemType == TABLE_VIEW_ITEM_TYPE_ONE)
                {
                        r = GET_BITMAP_CONFIG_N(TABLEVIEW::SECTIONITEM_SINGLE_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pSectionPressedBg);
+                       SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , E_SYSTEM, "[E_SYSTEM] SectionStyle image load failed");
                }
                else if (__itemType == TABLE_VIEW_ITEM_TYPE_TOP)
                {
                        r = GET_BITMAP_CONFIG_N(TABLEVIEW::SECTIONITEM_TOP_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pSectionPressedBg);
+                       SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , E_SYSTEM, "[E_SYSTEM] SectionStyle image load failed");
                }
                else if (__itemType == TABLE_VIEW_ITEM_TYPE_MIDDLE)
                {
                        r = GET_BITMAP_CONFIG_N(TABLEVIEW::SECTIONITEM_CENTER_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pSectionPressedBg);
+                       SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , E_SYSTEM, "[E_SYSTEM] SectionStyle image load failed");
                }
                else if (__itemType == TABLE_VIEW_ITEM_TYPE_BOTTOM)
                {
                        r = GET_BITMAP_CONFIG_N(TABLEVIEW::SECTIONITEM_BOTTOM_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pSectionPressedBg);
+                       SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , E_SYSTEM, "[E_SYSTEM] SectionStyle image load failed");
                }
-               SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , E_SYSTEM, "[E_SYSTEM] SectionStyle image load failed");
 
-               GET_COLOR_CONFIG(TABLEVIEW::ITEM_BG_PRESSED, pressColor);
                pSectionPressedBg = Tizen::Graphics::_BitmapImpl::GetColorReplacedBitmapN(*pSectionBg, Color::GetColor(COLOR_ID_MAGENTA), pressColor);
                GET_FIXED_VALUE_CONFIG(TABLEVIEW::ITEM_DIVIDER_HEIGHT, _CONTROL_ORIENTATION_PORTRAIT, dividerHeight);
 
@@ -2272,6 +2269,7 @@ _TableViewItem::DrawSectionStyleBackgroundCover(void)
                                _TableView* pParent = dynamic_cast<_TableView*>(GetParent());
                                if (pParent == null)
                                {
+                                       delete pSectionBgCover;
                                        return;
                                }
                                pReplacementSectionBg = Tizen::Graphics::_BitmapImpl::GetColorReplacedBitmapN(*pSectionBgCover, Color::GetColor(COLOR_ID_MAGENTA), pParent->GetBackgroundColor());
@@ -2367,15 +2365,19 @@ _TableViewItem::DrawCheckBox(void)
                if (__drawingStatus == TABLE_VIEW_ITEM_DRAWING_STATUS_NORMAL)
                {
                        r = GET_BITMAP_CONFIG_N(TABLEVIEW::CHECKBOX_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pCheckBoxBg);
+                       SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS) && (pCheckBoxBg != null), , E_SYSTEM, "[%s] Propagating.", GetErrorMessage(r));
+
+                       r = GET_BITMAP_CONFIG_N(TABLEVIEW::CHECKBOX_CHECK_MARK_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pCheckBox);
+                       SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS) && (pCheckBox != null), , E_SYSTEM, "[%s] Propagating.", GetErrorMessage(r));
                }
                else if ((__drawingStatus == TABLE_VIEW_ITEM_DRAWING_STATUS_PRESSED) || (__drawingStatus == TABLE_VIEW_ITEM_DRAWING_STATUS_HIGHLIGHTED))
                {
                        r = GET_BITMAP_CONFIG_N(TABLEVIEW::CHECKBOX_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pCheckBoxBg);
-               }
-               SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS) && (pCheckBoxBg != null), , E_SYSTEM, "[%s] Propagating.", GetErrorMessage(r));
+                       SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS) && (pCheckBoxBg != null), , E_SYSTEM, "[%s] Propagating.", GetErrorMessage(r));
 
-               r = GET_BITMAP_CONFIG_N(TABLEVIEW::CHECKBOX_CHECK_MARK_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pCheckBox);
-               SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS) && (pCheckBox != null), , E_SYSTEM, "[%s] Propagating.", GetErrorMessage(r));
+                       r = GET_BITMAP_CONFIG_N(TABLEVIEW::CHECKBOX_CHECK_MARK_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pCheckBox);
+                       SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS) && (pCheckBox != null), , E_SYSTEM, "[%s] Propagating.", GetErrorMessage(r));
+               }
 
        }
        else
@@ -2404,18 +2406,15 @@ _TableViewItem::DrawCheckBox(void)
 
                DrawBitmap(*pCanvas, CalculateAnnexBitmapBounds(annexWidth, annexHeight, *pCheckBoxBg), *pCheckBoxBg);
 
-               if (IsChecked() == true)
+               if (__isCheckedAnimationEnabled == true)
                {
-                       if (__isCheckedAnimationEnabled == true)
-                       {
-                               StartCheckBoxAnimation();
-                       }
-                       else
+                       StartCheckBoxAnimation();
+               }
+               else
+               {
+                       if (IsChecked() == true && pCheckBox != null)
                        {
-                               if (pCheckBox != null)
-                               {
-                                       DrawBitmap(*pCanvas, CalculateAnnexBitmapBounds(annexWidth, annexHeight, *pCheckBox), *pCheckBox);
-                               }
+                               DrawBitmap(*pCanvas, CalculateAnnexBitmapBounds(annexWidth, annexHeight, *pCheckBox), *pCheckBox);
                        }
                }
        }
@@ -2459,22 +2458,26 @@ _TableViewItem::DrawRadioBox(void)
                if (__drawingStatus == TABLE_VIEW_ITEM_DRAWING_STATUS_NORMAL)
                {
                        r = GET_BITMAP_CONFIG_N(TABLEVIEW::RADIOBUTTON_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pRadioButtonBg);
+                       SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS) && (pRadioButtonBg != null), , E_SYSTEM, "[E_SYSTEM] RadioButtonBg image load failed");
+
+                       r = GET_BITMAP_CONFIG_N(TABLEVIEW::RADIOBUTTON_BUTTON_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pRadioButton);
+                       SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS) && (pRadioButton != null), , E_SYSTEM, "[E_SYSTEM] CheckBox image load failed");
                }
                else if ((__drawingStatus == TABLE_VIEW_ITEM_DRAWING_STATUS_PRESSED) || (__drawingStatus == TABLE_VIEW_ITEM_DRAWING_STATUS_HIGHLIGHTED))
                {
                        r = GET_BITMAP_CONFIG_N(TABLEVIEW::RADIOBUTTON_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pRadioButtonBg);
-               }
-               SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS) && (pRadioButtonBg != null), , E_SYSTEM, "[E_SYSTEM] RadioButtonBg image load failed");
+                       SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS) && (pRadioButtonBg != null), , E_SYSTEM, "[E_SYSTEM] RadioButtonBg image load failed");
 
-               r = GET_BITMAP_CONFIG_N(TABLEVIEW::RADIOBUTTON_SELECTED, BITMAP_PIXEL_FORMAT_ARGB8888, pRadioButton);
-               SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS) && (pRadioButton != null), , E_SYSTEM, "[E_SYSTEM] CheckBox image load failed");
+                       r = GET_BITMAP_CONFIG_N(TABLEVIEW::RADIOBUTTON_BUTTON_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pRadioButton);
+                       SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS) && (pRadioButton != null), , E_SYSTEM, "[E_SYSTEM] CheckBox image load failed");
+               }
        }
        else
        {
                r = GET_BITMAP_CONFIG_N(TABLEVIEW::RADIOBUTTON_NORMAL_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, pRadioButtonBg);
                SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS) && (pRadioButtonBg != null), , E_SYSTEM, "[E_SYSTEM] RadioButtonBg image load failed");
 
-               r = GET_BITMAP_CONFIG_N(TABLEVIEW::RADIOBUTTON_SELECTED_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, pRadioButton);
+               r = GET_BITMAP_CONFIG_N(TABLEVIEW::RADIOBUTTON_BUTTON_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, pRadioButton);
                SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS) && (pRadioButton != null), , E_SYSTEM, "[E_SYSTEM] CheckBox image load failed");
        }
 
@@ -2494,7 +2497,7 @@ _TableViewItem::DrawRadioBox(void)
 
                DrawBitmap(*pCanvas, CalculateAnnexBitmapBounds(annexWidth, annexHeight, *pRadioButtonBg), *pRadioButtonBg);
 
-               if (IsChecked() == true)
+               if (pRadioButton != null && IsChecked() == true)
                {
                        DrawBitmap(*pCanvas, CalculateAnnexBitmapBounds(annexWidth, annexHeight, *pRadioButton), *pRadioButton);
                }
@@ -2537,9 +2540,6 @@ _TableViewItem::DrawOnOffButton(void)
        float annexMargin = 0.0f;
        Color canvasBackgroundColor;
 
-       r = GET_BITMAP_CONFIG_N(TABLEVIEW::ONOFFBUTTON_HANDLER, BITMAP_PIXEL_FORMAT_ARGB8888, pOnOffButtonHandler);
-       SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS) && (pOnOffButtonHandler != null), , E_SYSTEM, "[E_SYSTEM] OnOffHandlerButton button image load failed");
-
        if (IsChecked() == true)
        {
                if(__enabledState)
@@ -2564,6 +2564,16 @@ _TableViewItem::DrawOnOffButton(void)
        }
        SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS) && (pOnOffButton != null), , E_SYSTEM, "[E_SYSTEM] OnOffButton_On image load failed");
 
+       if(__enabledState)
+       {
+               r = GET_BITMAP_CONFIG_N(TABLEVIEW::ONOFFBUTTON_HANDLER, BITMAP_PIXEL_FORMAT_ARGB8888, pOnOffButtonHandler);
+       }
+       else
+       {
+               r = GET_BITMAP_CONFIG_N(TABLEVIEW::ONOFFBUTTON_HANDLER_DIM, BITMAP_PIXEL_FORMAT_ARGB8888, pOnOffButtonHandler);
+       }
+       SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS) && (pOnOffButtonHandler != null), , E_SYSTEM, "[E_SYSTEM] OnOffHandlerButton button image load failed");
+
        GET_SHAPE_CONFIG(TABLEVIEW::ITEM_ANNEX_ONOFF_WIDTH, _CONTROL_ORIENTATION_PORTRAIT, annexWidth);
        GET_SHAPE_CONFIG(TABLEVIEW::ITEM_ANNEX_ONOFF_HEIGHT, _CONTROL_ORIENTATION_PORTRAIT, annexHeight);
        bounds.SetBounds(0, 0, annexWidth, annexHeight);

diff --git a/src/ui/controls/FUiCtrl_TableViewPresenter.cpp b/src/ui/controls/FUiCtrl_TableViewPresenter.cpp
index 1b856cb..1930de0 100644 (file)
--- a/src/ui/controls/FUiCtrl_TableViewPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_TableViewPresenter.cpp
@@ -2975,7 +2975,6 @@ _TableViewPresenter::LoadItemWithScrollPosition(float previousScrollPosition, fl
        if (currentScrollPos < previousScrollPosition && firstLoadedItemPos.groupIndex != -1)
        {
                _TableViewItem* pFirstItem = FindItem(firstLoadedItemPos);
-               _TableViewItem* pPrevItem = null;
                if (pFirstItem == null)
                {
                        return;
@@ -2983,7 +2982,7 @@ _TableViewPresenter::LoadItemWithScrollPosition(float previousScrollPosition, fl
 
                float scrollOffsetFromBottom = GetScrollAreaBounds().height - currentScrollPos;
 
-               while (1)
+               while (pFirstItem)
                {
                        FloatRectangle scrollAreaBounds = GetScrollAreaBounds();
                        float itemOffsetFromBottom = scrollAreaBounds.height - (pFirstItem->GetBoundsF().y + pFirstItem->GetBoundsF().height);
@@ -2998,7 +2997,7 @@ _TableViewPresenter::LoadItemWithScrollPosition(float previousScrollPosition, fl
                        {
                                if (prevItemPos.itemIndex == -1)
                                {
-                                       pPrevItem = LoadItem(prevItemPos.groupIndex, prevItemPos.itemIndex);
+                                       LoadItem(prevItemPos.groupIndex, prevItemPos.itemIndex);
 
                                        if (!GetPreviousItemPosition(prevItemPos, prevItemPos))
                                        {
@@ -3008,7 +3007,7 @@ _TableViewPresenter::LoadItemWithScrollPosition(float previousScrollPosition, fl
 
                                if (prevItemPos.groupIndex != -1)
                                {
-                                       pPrevItem = LoadItem(prevItemPos.groupIndex, prevItemPos.itemIndex);
+                                       LoadItem(prevItemPos.groupIndex, prevItemPos.itemIndex);
                                }
                        }
                        else
@@ -4547,7 +4546,6 @@ _TableViewPresenter::ShowTableViewCapturedItem(int groupIndex, int itemIndex, fl
        return;
 
 CATCH:
-       delete pCanvas;
        delete pBitmap;
 
        __pCapturedItemVisualElement->Destroy();

diff --git a/src/ui/inc/FUi_ResourceTableViewConfig.h b/src/ui/inc/FUi_ResourceTableViewConfig.h
index 05850ed..29c591e 100755 (executable)
--- a/src/ui/inc/FUi_ResourceTableViewConfig.h
+++ b/src/ui/inc/FUi_ResourceTableViewConfig.h
@@ -84,7 +84,7 @@ DECLARE_UI_CONFIG(TABLEVIEW);
        DECLARE_IMAGE_CONFIG(CHECKBOX_CHECK_MARK_NORMAL, 22);
        DECLARE_IMAGE_CONFIG(RADIOBUTTON_NORMAL, 23);
        DECLARE_IMAGE_CONFIG(RADIOBUTTON_PRESSED, 24);
-       DECLARE_IMAGE_CONFIG(RADIOBUTTON_SELECTED, 25);
+       DECLARE_IMAGE_CONFIG(RADIOBUTTON_NORMAL_DISABLED, 25);
        DECLARE_IMAGE_CONFIG(ONOFFBUTTON_ON, 26);
        DECLARE_IMAGE_CONFIG(ONOFFBUTTON_OFF, 27);
        DECLARE_IMAGE_CONFIG(ONOFFBUTTON_HANDLER, 28);
@@ -98,12 +98,19 @@ DECLARE_UI_CONFIG(TABLEVIEW);
        DECLARE_IMAGE_CONFIG(BUTTON_EXPAND_OPENED_EFFECT, 36);
        DECLARE_IMAGE_CONFIG(CHECKBOX_BG_DISABLED, 37);
        DECLARE_IMAGE_CONFIG(CHECKBOX_CHECK_MARK_DISABLED, 38);
-       DECLARE_IMAGE_CONFIG(RADIOBUTTON_NORMAL_DISABLED, 39);
-       DECLARE_IMAGE_CONFIG(RADIOBUTTON_SELECTED_DISABLED, 40);
-       DECLARE_IMAGE_CONFIG(ONOFFBUTTON_ON_DISABLED, 41);
-       DECLARE_IMAGE_CONFIG(ONOFFBUTTON_OFF_DISABLED, 42);
-       DECLARE_IMAGE_CONFIG(ONOFFBUTTON_HANDLER_DISABLED, 43);
-       DECLARE_IMAGE_CONFIG(CIRCLE_BUTTON_BG_EFFECT_DISABLED, 44);
+       DECLARE_IMAGE_CONFIG(ONOFFBUTTON_ON_DISABLED, 39);
+       DECLARE_IMAGE_CONFIG(ONOFFBUTTON_OFF_DISABLED, 40);
+       DECLARE_IMAGE_CONFIG(ONOFFBUTTON_HANDLER_DISABLED, 41);
+       DECLARE_IMAGE_CONFIG(CIRCLE_BUTTON_BG_EFFECT_DISABLED, 42);
+       DECLARE_IMAGE_CONFIG(CHECKBOX_CHECK_MARK_PRESSED, 43);
+       DECLARE_IMAGE_CONFIG(CHECKBOX_CHECK_MARK_DIM, 44);
+       DECLARE_IMAGE_CONFIG(RADIOBUTTON_BUTTON_NORMAL, 45);
+       DECLARE_IMAGE_CONFIG(RADIOBUTTON_BUTTON_DISABLED, 46);
+       DECLARE_IMAGE_CONFIG(RADIOBUTTON_BUTTON_PRESSED, 47);
+       DECLARE_IMAGE_CONFIG(RADIOBUTTON_BUTTON_DIM, 48);
+       DECLARE_IMAGE_CONFIG(RADIOBUTTON_SELECTED, 49);
+       DECLARE_IMAGE_CONFIG(RADIOBUTTON_SELECTED_DISABLED, 50);
+       DECLARE_IMAGE_CONFIG(ONOFFBUTTON_HANDLER_DIM, 51);
 
        DECLARE_DIMENSION_CONFIG(MIN_SIZE, 1);
        DECLARE_SHAPE_CONFIG(ITEM_DEFAULT_FONT_SIZE, 1);

diff --git a/src/ui/resource/FUi_ResourceTableViewConfig.cpp b/src/ui/resource/FUi_ResourceTableViewConfig.cpp
index e928d1c..94eb6a5 100755 (executable)
--- a/src/ui/resource/FUi_ResourceTableViewConfig.cpp
+++ b/src/ui/resource/FUi_ResourceTableViewConfig.cpp
@@ -78,16 +78,18 @@ START_UI_CONFIG(TABLEVIEW);
        ADD_IMAGE_CONFIG(SECTIONITEM_BOTTOM_BG_HIGHLIGHTED, #00_list_group_press_bg_bottom.#.png);
        ADD_IMAGE_CONFIG(SECTIONITEM_BOTTOM_COVER_BG_NORMAL, #00_list_group_bg_bottom_ef.#.png);
        ADD_IMAGE_CONFIG(CHECKBOX_BG_NORMAL, #00_check_bg.png);
-       ADD_IMAGE_CONFIG(CHECKBOX_BG_PRESSED, #00_check_bg_press.png);
-       ADD_IMAGE_CONFIG(CHECKBOX_BG_HIGHLIGHTED, #00_check_bg_press.png);
-       ADD_IMAGE_CONFIG(CHECKBOX_BG_DISABLED, #00_check_bg_dim.png);
-       ADD_IMAGE_CONFIG(CHECKBOX_CHECK_MARK_NORMAL, #00_check_checking.png);
-       ADD_IMAGE_CONFIG(CHECKBOX_CHECK_MARK_DISABLED, #00_check_checking_dim.png);
-       ADD_IMAGE_CONFIG(RADIOBUTTON_NORMAL, #00_button_radio.png);
-       ADD_IMAGE_CONFIG(RADIOBUTTON_NORMAL_DISABLED, #00_button_radio_dim.png);
-       ADD_IMAGE_CONFIG(RADIOBUTTON_PRESSED, #00_button_radio_press.png);
-       ADD_IMAGE_CONFIG(RADIOBUTTON_SELECTED, #00_button_radio_select.png);
-       ADD_IMAGE_CONFIG(RADIOBUTTON_SELECTED_DISABLED, #00_button_radio_select_dim.png);
+       ADD_IMAGE_CONFIG(CHECKBOX_BG_PRESSED, #00_check_press_bg.png);
+       ADD_IMAGE_CONFIG(CHECKBOX_BG_HIGHLIGHTED, #00_check_press_bg.png);
+       ADD_IMAGE_CONFIG(CHECKBOX_BG_DISABLED, #00_check_dim_bg.png);
+       ADD_IMAGE_CONFIG(CHECKBOX_CHECK_MARK_NORMAL, #00_check_Activated.png);
+       ADD_IMAGE_CONFIG(CHECKBOX_CHECK_MARK_DISABLED, #00_check_Disabled.png);
+       ADD_IMAGE_CONFIG(RADIOBUTTON_NORMAL, #00_button_radio_bg.png);
+       ADD_IMAGE_CONFIG(RADIOBUTTON_PRESSED, #00_button_radio_press_bg.png);
+       ADD_IMAGE_CONFIG(RADIOBUTTON_NORMAL_DISABLED, #00_button_radio_dim_bg.png);
+       ADD_IMAGE_CONFIG(RADIOBUTTON_BUTTON_NORMAL, #00_button_radio_Activated.png);
+       ADD_IMAGE_CONFIG(RADIOBUTTON_BUTTON_DISABLED, #00_button_radio_Disabled.png);
+       ADD_IMAGE_CONFIG(RADIOBUTTON_BUTTON_PRESSED, #00_button_radio_press.png);
+       ADD_IMAGE_CONFIG(RADIOBUTTON_BUTTON_DIM, #00_button_radio_dim.png);
        ADD_IMAGE_CONFIG(ONOFFBUTTON_ON, #00_button_on.png);
        ADD_IMAGE_CONFIG(ONOFFBUTTON_ON_DISABLED, #00_button_on_dim.png);
        ADD_IMAGE_CONFIG(ONOFFBUTTON_OFF, #00_button_off.png);
@@ -103,6 +105,9 @@ START_UI_CONFIG(TABLEVIEW);
        ADD_IMAGE_CONFIG(SEARCH_ICON_NORMAL, #00_search_icon.png);
        ADD_IMAGE_CONFIG(BUTTON_EXPAND_CLOSED_EFFECT, #00_button_expand_closed_ef.png);
        ADD_IMAGE_CONFIG(BUTTON_EXPAND_OPENED_EFFECT, #00_button_expand_opened_ef.png);
+       ADD_IMAGE_CONFIG(CHECKBOX_CHECK_MARK_PRESSED, #00_check_press.png);
+       ADD_IMAGE_CONFIG(CHECKBOX_CHECK_MARK_DIM, #00_check_dim.png);
+       ADD_IMAGE_CONFIG(ONOFFBUTTON_HANDLER_DIM, #00_button_on_off_handler_dim.png);
 
 
        START_UI_CONFIG_MODE(720x1280);