X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Finput-style.h;h=30ce38ce760b47be433e2fe23d757ff26f2a5ae6;hb=28658e9b0c89fced72173c582b9c5635e07bd6f1;hp=5d7aeadb40e3816067dea4b7e708f3a03a176e8f;hpb=32b0b5f6c65842c8bd1140b1eeb9691fdca0c866;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 5d7aead..30ce38c 100644 --- a/dali-toolkit/internal/text/input-style.h +++ b/dali-toolkit/internal/text/input-style.h @@ -46,31 +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 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. + 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