X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbuttons%2Fbutton-impl.h;h=e0b7d5043ed3dda7db70ac4fa2ce792e526c30d2;hp=a079cd5a2e9032b9541c1e3c453e0cfa35071499;hb=0e462103c222ad05916840bc7d7c902cf5fc82a1;hpb=d748f6c99a59e045b8a8d267012372f996cbc3fd diff --git a/dali-toolkit/internal/controls/buttons/button-impl.h b/dali-toolkit/internal/controls/buttons/button-impl.h index a079cd5..e0b7d50 100644 --- a/dali-toolkit/internal/controls/buttons/button-impl.h +++ b/dali-toolkit/internal/controls/buttons/button-impl.h @@ -149,13 +149,13 @@ public: std::string GetLabelText() const; /** - * @brief Produces a Property::Map of Text properties to create a Text Visual + * @brief Produces a Property::Map of Text properties to create a Text Visual, merging existing properties with supplied map * If the label does not exist yet, it is created. * The derived buttons are notified if any properties are changed. * @param[in] properties A Property::Map of key-value pairs of properties to set. - * @param[out] properties A Property::Map of text visual properties to set. + * @param[out] properties A Property::Map of text visual properties to set after merging inMap with existing maps */ - void MergeLabelProperties( const Property::Map& inMap, Property::Map& outMap ); + void MergeWithExistingLabelProperties( const Property::Map& inMap, Property::Map& outMap ); /** * Performs actions as requested using the action name.