Fix for VPSS-1038 - SetTextColor for SimpleGroupItem

Change-Id: I59108541ed66d003201c35280c4e84dcf063f32d
Signed-off-by: Sreedeep Moulik <sreedeep.m@samsung.com>

diff --git a/src/ui/controls/FUiCtrlTableViewSimpleGroupItem.cpp b/src/ui/controls/FUiCtrlTableViewSimpleGroupItem.cpp
index c4aac09..601e409 100644 (file)
--- a/src/ui/controls/FUiCtrlTableViewSimpleGroupItem.cpp
+++ b/src/ui/controls/FUiCtrlTableViewSimpleGroupItem.cpp
@@ -78,7 +78,7 @@ TableViewSimpleGroupItem::SetTextColor(const Tizen::Graphics::Color& color, Tabl
        _TableViewItemImpl* pImpl = _TableViewItemImpl::GetInstance(*this);
        SysAssertf(pImpl != null, "Not yet constructed. Construct() should be called before use.");
 
-       return pImpl->SetSimpleItemTextColor(color, status);
+       return pImpl->SetSimpleGroupItemTextColor(color, status);
 }
 
 Tizen::Graphics::Color
@@ -87,7 +87,7 @@ TableViewSimpleGroupItem::GetTextColor(TableViewItemDrawingStatus status) const
        const _TableViewItemImpl* pImpl = _TableViewItemImpl::GetInstance(*this);
        SysAssertf(pImpl != null, "Not yet constructed. Construct() should be called before use.");
 
-       return pImpl->GetSimpleItemTextColor(status);
+       return pImpl->GetSimpleGroupItemTextColor(status);
 }
 
 result

diff --git a/src/ui/controls/FUiCtrl_TableViewItem.cpp b/src/ui/controls/FUiCtrl_TableViewItem.cpp
index 668a7f9..52a049b 100644 (file)
--- a/src/ui/controls/FUiCtrl_TableViewItem.cpp
+++ b/src/ui/controls/FUiCtrl_TableViewItem.cpp
@@ -3692,6 +3692,34 @@ _TableViewItem::GetSimpleItemTextColor(TableViewItemDrawingStatus status) const
 }
 
 result
+_TableViewItem::SetSimpleGroupItemTextColor(const Tizen::Graphics::Color& color, TableViewItemDrawingStatus status)
+{
+       if (status == TABLE_VIEW_ITEM_DRAWING_STATUS_NORMAL)
+       {
+               __simpleItemTextColor[TABLE_VIEW_GROUPITEM_DRAWING_STATUS_NORMAL] = color;
+       }
+       else if (status == TABLE_VIEW_ITEM_DRAWING_STATUS_PRESSED)
+       {
+               __simpleItemTextColor[TABLE_VIEW_GROUPITEM_DRAWING_STATUS_PRESSED] = color;
+       }
+
+       return E_SUCCESS;
+}
+
+Tizen::Graphics::Color
+_TableViewItem::GetSimpleGroupItemTextColor(TableViewItemDrawingStatus status) const
+{
+       if (status == TABLE_VIEW_ITEM_DRAWING_STATUS_PRESSED)
+       {
+               return __simpleItemTextColor[TABLE_VIEW_GROUPITEM_DRAWING_STATUS_PRESSED];
+       }
+       else
+       {
+               return __simpleItemTextColor[TABLE_VIEW_GROUPITEM_DRAWING_STATUS_NORMAL];
+       }
+}
+
+result
 _TableViewItem::SetSimpleItemTextSize(int size)
 {
        if(__simpleItemTextSize == size)

diff --git a/src/ui/controls/FUiCtrl_TableViewItemImpl.cpp b/src/ui/controls/FUiCtrl_TableViewItemImpl.cpp
index 60c6332..fbeec36 100644 (file)
--- a/src/ui/controls/FUiCtrl_TableViewItemImpl.cpp
+++ b/src/ui/controls/FUiCtrl_TableViewItemImpl.cpp
@@ -322,5 +322,16 @@ _TableViewItemImpl::IsIndividualSelectionEnabled(const Tizen::Ui::_ControlImpl&
        return GetCore().IsIndividualSelectionEnabled(controlImpl.GetCore());
 }
 
+result
+_TableViewItemImpl::SetSimpleGroupItemTextColor(const Tizen::Graphics::Color& color, TableViewItemDrawingStatus status)
+{
+       return GetCore().SetSimpleGroupItemTextColor(color, status);
+}
+
+Tizen::Graphics::Color
+_TableViewItemImpl::GetSimpleGroupItemTextColor(TableViewItemDrawingStatus status) const
+{
+       return GetCore().GetSimpleGroupItemTextColor(status);
+}
 
 }}} // Tizen::Ui::Controls

diff --git a/src/ui/inc/FUiCtrl_TableViewItem.h b/src/ui/inc/FUiCtrl_TableViewItem.h
index 0935f47..529b440 100644 (file)
--- a/src/ui/inc/FUiCtrl_TableViewItem.h
+++ b/src/ui/inc/FUiCtrl_TableViewItem.h
@@ -215,6 +215,10 @@ public:
        result SetSimpleItemTextSize(int size);
        int GetSimpleItemTextSize(void) const;
 
+       //Simple group item
+       result SetSimpleGroupItemTextColor(const Tizen::Graphics::Color& color, TableViewItemDrawingStatus status);
+       Tizen::Graphics::Color GetSimpleGroupItemTextColor(TableViewItemDrawingStatus status) const;
+
        result SetSectionHeaderFooterContents(const Tizen::Base::String& text, HorizontalAlignment alignment, bool isHeader);
        result SetSectionHeaderFooterAlignment(HorizontalAlignment alignment);
 

diff --git a/src/ui/inc/FUiCtrl_TableViewItemImpl.h b/src/ui/inc/FUiCtrl_TableViewItemImpl.h
index 4c6a8f6..1522df9 100644 (file)
--- a/src/ui/inc/FUiCtrl_TableViewItemImpl.h
+++ b/src/ui/inc/FUiCtrl_TableViewItemImpl.h
@@ -81,6 +81,9 @@ public:
        result SetIndividualSelectionEnabled(const Tizen::Ui::_ControlImpl& controlImpl, bool enable);
        bool IsIndividualSelectionEnabled(const Tizen::Ui::_ControlImpl& controlImpl);
 
+       result SetSimpleGroupItemTextColor(const Tizen::Graphics::Color& color, TableViewItemDrawingStatus status = TABLE_VIEW_ITEM_DRAWING_STATUS_NORMAL);
+       Tizen::Graphics::Color GetSimpleGroupItemTextColor(TableViewItemDrawingStatus status = TABLE_VIEW_ITEM_DRAWING_STATUS_NORMAL) const;
+
 public:
        static _TableViewItemImpl* GetInstance(TableViewItemBase& tableViewItem);
        static const _TableViewItemImpl* GetInstance(const TableViewItemBase& tableViewItem);