From: Kimmo Hoikka Date: Wed, 27 May 2015 10:35:38 +0000 (-0700) Subject: Merge "(ItemFactory) Add GetExtension" into tizen X-Git-Tag: accepted/tizen/common/20150529.134100~1 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=5eb13f530dc354efac87e7aeabfca52677967523;hp=e1dfaa0c7f709144fd5018a73e78842e61708433 Merge "(ItemFactory) Add GetExtension" into tizen --- diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ItemView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ItemView.cpp index 9efd53f..3dcc6e8 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ItemView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ItemView.cpp @@ -763,3 +763,11 @@ int UtcDaliItemViewSetItemsParentOriginP(void) DALI_TEST_CHECK(view.GetItem(0).GetCurrentParentOrigin() == parentOrigin); END_TEST; } + +int UtcDaliItemFactoryGetExtention(void) +{ + ToolkitTestApplication application; + TestItemFactory factory; + DALI_TEST_CHECK( factory.GetExtension() == NULL ); + END_TEST; +} diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h b/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h index e02c62b..97d12f6 100644 --- a/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h +++ b/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h @@ -35,6 +35,8 @@ class ItemFactory { public: + class Extension; ///< Forward declare future extension interface + /** * @brief Virtual destructor. */ @@ -63,6 +65,16 @@ public: * @param[in] actor The actor that represents the released item. */ virtual void ItemReleased(unsigned int itemId, Actor actor) {}; + + /** + * Retrieve the extension for this control + * + * @return The extension if available, NULL otherwise + */ + virtual Extension* GetExtension() + { + return NULL; + } }; } // namespace Toolkit