Merge "Revert "Added UNDERLINE_HEIGHT property to TextLabel to override adaptor metri...
authorPaul Wisbey <p.wisbey@samsung.com>
Thu, 9 Apr 2015 16:52:25 +0000 (09:52 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Thu, 9 Apr 2015 16:52:25 +0000 (09:52 -0700)
commitc25b3c40178dadf12dc5e8f77c17413df0a55099
tree952ea23d0b0e53375d4ffe3a6bf9989ef981463b
parent3dd71fec840b0b77278771a31b3152b732dc6682
parent9aa36e970b71cdfa780945e484e216aac1443493
Merge "Revert "Added UNDERLINE_HEIGHT property to TextLabel to override adaptor metrics and rounded up font metrics to simulate EFL behavior"" into new_text
dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
dali-toolkit/internal/text/text-controller.cpp