From 88862957423d38e8d5e650c793ad786d9e07306d Mon Sep 17 00:00:00 2001 From: Syed Khaja Moinuddin Date: Sat, 16 Mar 2013 17:57:17 +0900 Subject: [PATCH] CustomItem changes Signed-off-by: Syed Khaja Moinuddin Change-Id: I585106948a29a6ff7850ce647df0f055afb903f9 Signed-off-by: Syed Khaja Moinuddin --- inc/FUiCtrlCustomItem.h | 5 +++-- src/ui/controls/FUiCtrlCustomItem.cpp | 11 ++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/inc/FUiCtrlCustomItem.h b/inc/FUiCtrlCustomItem.h index ff217b4..1f7c714 100644 --- a/inc/FUiCtrlCustomItem.h +++ b/inc/FUiCtrlCustomItem.h @@ -33,6 +33,7 @@ #include #include #include +#include #include #include @@ -276,7 +277,7 @@ public: * @exception E_SYSTEM A system error has occurred. */ result AddElement(const Tizen::Graphics::Rectangle& rect, int elementId, ICustomElement& element); - + /** * Adds the custom drawing element to the %CustomItem control. * @@ -290,7 +291,7 @@ public: * @exception E_INVALID_ARG A specified input parameter is invalid. * @exception E_SYSTEM A system error has occurred. */ - result AddElement(const Tizen::Graphics::FloatRectangle& rect, int elementId, ICustomElement& element); + result AddElement(const Tizen::Graphics::FloatRectangle& rect, int elementId, ICustomElementF& element); /** * Removes the element from the %CustomItem control. diff --git a/src/ui/controls/FUiCtrlCustomItem.cpp b/src/ui/controls/FUiCtrlCustomItem.cpp index 43c06b8..0dae993 100644 --- a/src/ui/controls/FUiCtrlCustomItem.cpp +++ b/src/ui/controls/FUiCtrlCustomItem.cpp @@ -48,7 +48,7 @@ CustomItem::Construct(const Dimension& itemSize, ListAnnexStyle style) } result -CustomItem::Construct(const Tizen::Graphics::FloatDimension& itemSize, ListAnnexStyle style) +CustomItem::Construct(const FloatDimension& itemSize, ListAnnexStyle style) { result r = E_SUCCESS; @@ -75,7 +75,7 @@ CustomItem::AddElement(const Rectangle& rect, int elementId, const EnrichedText& } result -CustomItem::AddElement(const Tizen::Graphics::FloatRectangle& rect, int elementId, const EnrichedText& text) +CustomItem::AddElement(const FloatRectangle& rect, int elementId, const EnrichedText& text) { _CustomItemImpl* pImpl = static_cast<_CustomItemImpl*>(_ListItemBaseImpl::GetInstance(*this)); SysAssertf(pImpl != null, "Not yet constructed. Construct() should be called before use."); @@ -94,7 +94,7 @@ CustomItem::AddElement(const Rectangle& rect, int elementId, const String& text, } result -CustomItem::AddElement(const Tizen::Graphics::FloatRectangle& rect, int elementId, const String& text, bool textSliding) +CustomItem::AddElement(const FloatRectangle& rect, int elementId, const String& text, bool textSliding) { _CustomItemImpl* pImpl = static_cast<_CustomItemImpl*>(_ListItemBaseImpl::GetInstance(*this)); SysAssertf(pImpl != null, "Not yet constructed. Construct() should be called before use."); @@ -163,12 +163,13 @@ CustomItem::AddElement(const Rectangle& rect, int elementId, ICustomElement& ele } result -CustomItem::AddElement(const FloatRectangle& rect, int elementId, ICustomElement& element) +CustomItem::AddElement(const FloatRectangle& rect, int elementId, ICustomElementF& element) { _CustomItemImpl* pImpl = static_cast<_CustomItemImpl*>(_ListItemBaseImpl::GetInstance(*this)); SysAssertf(pImpl != null, "Not yet constructed. Construct() should be called before use."); - return pImpl->AddElement(rect, elementId, element); + return E_SUCCESS; + //Todo: return pImpl->AddElement(rect, elementId, element); } result -- 2.7.4