From: Saravana Balaji <saravana.bs@samsung.com>
Date: Thu, 20 Jun 2013 16:53:41 +0000 (+0530)
Subject: Fix for PLM P130604-7384
X-Git-Tag: submit/tizen_2.2/20130714.153149~395^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=df4546ba61febc96a7055bb7e829043be8a103d5;p=framework%2Fosp%2Fuifw.git

Fix for PLM P130604-7384

Change-Id: I39e8afffab93b6cda0f734a11189ed6d0dbbd17a
Signed-off-by: Saravana Balaji <saravana.bs@samsung.com>
---

diff --git a/src/ui/controls/FUiCtrl_TableViewItem.cpp b/src/ui/controls/FUiCtrl_TableViewItem.cpp
index 8b6c2b0..e635ed2 100644
--- a/src/ui/controls/FUiCtrl_TableViewItem.cpp
+++ b/src/ui/controls/FUiCtrl_TableViewItem.cpp
@@ -237,6 +237,7 @@ _TableViewItem::_TableViewItem(float itemHeight)
 	, __isItemTapSoundEnabled(true)
 	, __isTabSoundPlayed(false)
 	, __isSelectedDetailButton(false)
+	, __isSimpleLastItem(false)
 	, __pHighlightVisualElement(null)
 	, __pBitmapVisualElement(null)
 	, __pMoveItemAnimation(null)
@@ -3201,10 +3202,12 @@ _TableViewItem::DrawItemDivider(void)
 
 		if(!IsContextItem())
 		{
-			if(__itemType == TABLE_VIEW_ITEM_TYPE_BOTTOM ||
-				__itemType == TABLE_VIEW_ITEM_TYPE_ONE)
+			if (!__isSimpleLastItem)
 			{
-				__pItemDivider->SetVisibleState(false);
+				if(__itemType == TABLE_VIEW_ITEM_TYPE_BOTTOM || __itemType == TABLE_VIEW_ITEM_TYPE_ONE)
+				{
+					__pItemDivider->SetVisibleState(false);
+				}
 			}
 		}
 
@@ -4966,5 +4969,11 @@ _TableViewItem::IsChildControlFocusManage(void) const
 {
 	return true;
 }
+
+void
+_TableViewItem::SetSimpleLastItemEnabled(bool enable)
+{
+	__isSimpleLastItem = enable;
+}
 }}} // Tizen::Ui::Controls
 
diff --git a/src/ui/controls/FUiCtrl_TableViewPresenter.cpp b/src/ui/controls/FUiCtrl_TableViewPresenter.cpp
index 7a6429d..3c585a7 100644
--- a/src/ui/controls/FUiCtrl_TableViewPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_TableViewPresenter.cpp
@@ -1351,6 +1351,17 @@ _TableViewPresenter::SetItemType(_TableViewItem* pItem, TableViewItemTag itemPos
 	else
 	{
 		int itemCount = GetItemCountAt(itemPosition.groupIndex);
+		if (style == TABLE_VIEW_STYLE_SIMPLE)
+		{
+			if (itemCount == 1 || (itemCount > 1 && (itemPosition.itemIndex == itemCount - 1)))
+			{
+				pItem->SetSimpleLastItemEnabled(true);
+			}
+			else
+			{
+				pItem->SetSimpleLastItemEnabled(false);
+			}
+		}
 
 		if (itemPosition.itemIndex == 0)
 		{
diff --git a/src/ui/inc/FUiCtrl_TableViewItem.h b/src/ui/inc/FUiCtrl_TableViewItem.h
index 146e6d7..4f82c3e 100644
--- a/src/ui/inc/FUiCtrl_TableViewItem.h
+++ b/src/ui/inc/FUiCtrl_TableViewItem.h
@@ -249,6 +249,7 @@ public:
 
 	void FireItemTouchReleased(void);
 	void FireItemTouchPressed(void);
+	void SetSimpleLastItemEnabled(bool enable);
 
 	// Accessibility
 	virtual void SetAccessibilityElement(void);
@@ -452,6 +453,7 @@ private:
 	bool __isItemTapSoundEnabled;
 	bool __isTabSoundPlayed;
 	bool __isSelectedDetailButton;
+	bool __isSimpleLastItem;
 
 	Tizen::Ui::Animations::_VisualElement* __pHighlightVisualElement;
 	Tizen::Ui::Animations::_VisualElement* __pBitmapVisualElement;