TextStyle - Merge operation added. 86/24386/5
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 11 Jul 2014 06:29:04 +0000 (07:29 +0100)
committerVíctor Cebollada <v.cebollada@samsung.com>
Wed, 23 Jul 2014 06:41:27 +0000 (23:41 -0700)
commit0f85f68d2e3b1e2ad27fd597312c18b972816f67
tree172d5123808cc4b70d9ce2f1bea4bc8021e4aa79
parent294f511ad0546eb8853ffe996bf94f3ee6442368
TextStyle - Merge operation added.

It copies from a given text-style all parameters which are not default.
It's useful to merge parameters from different text-styles into one.

Change-Id: I36e8d481225f09fd5736ae4b8da7a3b78879760b
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
automated-tests/src/dali/utc-Dali-TextStyle.cpp
dali/public-api/text/text-style.cpp
dali/public-api/text/text-style.h