X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Finput-style.h;h=30ce38ce760b47be433e2fe23d757ff26f2a5ae6;hb=ce9f965e8f8f51ae0992a85db9fd919519992a65;hp=a9e6eab0acc307c114122ba0b5784f7d1f103f27;hpb=c8f181e1ca529f7d92ba638ccedadd7dd51be7eb;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/text/input-style.h b/dali-toolkit/internal/text/input-style.h index a9e6eab..30ce38c 100644 --- a/dali-toolkit/internal/text/input-style.h +++ b/dali-toolkit/internal/text/input-style.h @@ -46,29 +46,45 @@ struct InputStyle width( TextAbstraction::FontWidth::NORMAL ), slant( TextAbstraction::FontSlant::NORMAL ), size( 0.f ), + lineSpacing( 0.f ), + underlineProperties(), + shadowProperties(), + embossProperties(), + outlineProperties(), + isDefaultColor( true ), familyDefined( false ), weightDefined( false ), widthDefined( false ), slantDefined( false ), - sizeDefined( false ) + sizeDefined( false ), + lineSpacingDefined( false ) {} ~InputStyle() {}; - Vector4 textColor; ///< The text's color. - std::string fontStyle; ///< The font's style string. - std::string familyName; ///< The font's family name. - FontWeight weight; ///< The font's weight. - FontWidth width; ///< The font's width. - FontSlant slant; ///< The font's slant. - float size; ///< The font's size. - - bool familyDefined : 1; ///< Whether the font's family is defined. - bool weightDefined : 1; ///< Whether the font's weight is defined. - bool widthDefined : 1; ///< Whether the font's width is defined. - bool slantDefined : 1; ///< Whether the font's slant is defined. - bool sizeDefined : 1; ///< Whether the font's size is defined. + Vector4 textColor; ///< The text's color. + std::string fontStyle; ///< The font's style string. + std::string familyName; ///< The font's family name. + FontWeight weight; ///< The font's weight. + FontWidth width; ///< The font's width. + FontSlant slant; ///< The font's slant. + float size; ///< The font's size. + + float lineSpacing; ///< The line's spacing. + std::string underlineProperties; ///< The underline properties string. + std::string shadowProperties; ///< The shadow properties string. + std::string embossProperties; ///< The emboss properties string. + std::string outlineProperties; ///< The outline properties string. + + bool isDefaultColor : 1; ///< Whether the text's color is the default. + bool familyDefined : 1; ///< Whether the font's family is defined. + bool weightDefined : 1; ///< Whether the font's weight is defined. + bool widthDefined : 1; ///< Whether the font's width is defined. + bool slantDefined : 1; ///< Whether the font's slant is defined. + bool sizeDefined : 1; ///< Whether the font's size is defined. + + bool lineSpacingDefined : 1; ///< Whether the line spacing is defined. }; } // namespace Text