projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove dependency to std::vector and property::value from property notification API
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
navigation-frame
/
page-impl.h
diff --git
a/dali-toolkit/internal/controls/navigation-frame/page-impl.h
b/dali-toolkit/internal/controls/navigation-frame/page-impl.h
index
333aada
..
8d2711d
100644
(file)
--- a/
dali-toolkit/internal/controls/navigation-frame/page-impl.h
+++ b/
dali-toolkit/internal/controls/navigation-frame/page-impl.h
@@
-116,17
+116,23
@@
public:
*/
Toolkit::Popup GetPopupMenu() const;
*/
Toolkit::Popup GetPopupMenu() const;
-private: // From Control
+ // Properties
/**
/**
- * @copydoc Toolkit::Control::OnInitialize()
+ * Called when a property of an object of this type is set.
+ * @param[in] object The object whose property is set.
+ * @param[in] index The property index.
+ * @param[in] value The new property value.
*/
*/
-
virtual void OnInitialize(
);
+
static void SetProperty( BaseObject* object, Property::Index index, const Property::Value& value
);
/**
/**
- * @copydoc Dali::CustomActorImpl::OnPropertySet()
+ * Called to retrieve a property of an object of this type.
+ * @param[in] object The object whose property is to be retrieved.
+ * @param[in] index The property index.
+ * @return The current value of the property.
*/
*/
-
virtual void OnPropertySet( Property::Index index, Property::Value propertyValue
);
+
static Property::Value GetProperty( BaseObject* object, Property::Index propertyIndex
);
private:
private:
@@
-144,9
+150,6
@@
private:
ActorContainer mTitleBarControls;
Toolkit::Page::ControlOnBarContainer mToolBarControls;
ActorContainer mTitleBarControls;
Toolkit::Page::ControlOnBarContainer mToolBarControls;
-
- Property::Index mPropertyTitle; ///< Property index for title.
- Property::Index mPropertySubTitle; ///< Property index for sub title.
};
} // namespace Internal
};
} // namespace Internal