X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=docs%2Fcontent%2Fshared-javascript-and-cpp-documentation%2Fmarkup-style.md;h=18932734e92cd2a64fb51cce592666e7c8de8b7e;hp=dd40aa1c63f8a8465a19d73e331848bbf179c3b4;hb=2c2f52b1e6f532312359afbf5910a44943bbb87b;hpb=4d763eb68b5aa2448dfc81d90fc5ce598c68c99f diff --git a/docs/content/shared-javascript-and-cpp-documentation/markup-style.md b/docs/content/shared-javascript-and-cpp-documentation/markup-style.md index dd40aa1..1893273 100644 --- a/docs/content/shared-javascript-and-cpp-documentation/markup-style.md +++ b/docs/content/shared-javascript-and-cpp-documentation/markup-style.md @@ -25,7 +25,8 @@ field.enableMarkup = true; dali.stage.add( field ); ~~~ -Note the mark-up processor doesn't check the correctness of the mark-up string. This may cause the text to be badly rendered. +Note the mark-up processor doesn't check the correctness of the mark-up string. This may +cause the text to be badly rendered. The table below describes the priorities when styles are applied while rendering text. | | | | | @@ -34,6 +35,20 @@ The table below describes the priorities when styles are applied while rendering | Priority 2 | Style set through the control properties. | Will override the default platform style. | | | Priority 3 | Default platform style. | | | +Font size has slightly different priorities - the size provided by the platform is a logical +size, and can be mapped to physical point sizes using style sheets. There is a default set of +sizes defined for DALi, and these can be overridden by application specific stylesheets. Thus +the priorities are: + +| | | | +|--|--|--| +| Priority 1 | Size set by markup string. | Will override the style set through the stylesheets. | +| Priority 2 | Physical Size set by application style sheet | | +| Priority 2 | Logical Size set by application style sheet | Mapping from platform logical to physical | +| Priority 3 | Logical Size set by DALi style sheet | Mapping from platform logical to physical | + +See [Font Selection](@ref font-selection) for more details. + Current supported tags are: ## \