X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Ffont-description-run.h;h=04a5e91a7190fabe5e4f4a1e6c556e0d1c4794a3;hb=75fe6c4a2f784bd52ccf8eb16049317825338a6e;hp=b14ab1d32ad1c088371c5aaccd9970b86ccde6d7;hpb=87a9019904ab49c42f1e32e7ebb6a1512b0dc28c;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/text/font-description-run.h b/dali-toolkit/internal/text/font-description-run.h index b14ab1d..04a5e91 100644 --- a/dali-toolkit/internal/text/font-description-run.h +++ b/dali-toolkit/internal/text/font-description-run.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_TEXT_FONT_DESCRIPTION_RUN_H /* - * Copyright (c) 2019 Samsung Electronics Co., Ltd. + * Copyright (c) 2021 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,13 +27,10 @@ namespace Dali { - namespace Toolkit { - namespace Text { - /** * @brief Run of characters with the same font. */ @@ -44,44 +41,46 @@ struct FontDescriptionRun */ FontDescriptionRun() : characterRun{}, - familyName{ nullptr }, - familyLength{ 0u }, - weight{ FontWeight::NONE }, - width{ FontWidth::NONE }, - slant{ FontSlant::NONE }, - size{ 0u }, - familyDefined{ false }, - weightDefined{ false }, - widthDefined{ false }, - slantDefined{ false }, - sizeDefined{ false } - {} + familyName{nullptr}, + familyLength{0u}, + weight{FontWeight::NONE}, + width{FontWidth::NONE}, + slant{FontSlant::NONE}, + size{0u}, + familyDefined{false}, + weightDefined{false}, + widthDefined{false}, + slantDefined{false}, + sizeDefined{false} + { + } - FontDescriptionRun( const CharacterRun& characterRun, - char* familyName, - Length familyLength, - FontWeight weight, - FontWidth width, - FontSlant slant, - PointSize26Dot6 size, - bool familyDefined, - bool weightDefined, - bool widthDefined, - bool slantDefined, - bool sizeDefined ) - : characterRun{ characterRun }, - familyName{ familyName }, - familyLength{ familyLength }, - weight{ weight }, - width{ width }, - slant{ slant }, - size{ size }, - familyDefined{ familyDefined }, - weightDefined{ weightDefined }, - widthDefined{ widthDefined }, - slantDefined{ slantDefined }, - sizeDefined{ sizeDefined } - {} + FontDescriptionRun(const CharacterRun& characterRun, + char* familyName, + Length familyLength, + FontWeight weight, + FontWidth width, + FontSlant slant, + PointSize26Dot6 size, + bool familyDefined, + bool weightDefined, + bool widthDefined, + bool slantDefined, + bool sizeDefined) + : characterRun{characterRun}, + familyName{familyName}, + familyLength{familyLength}, + weight{weight}, + width{width}, + slant{slant}, + size{size}, + familyDefined{familyDefined}, + weightDefined{weightDefined}, + widthDefined{widthDefined}, + slantDefined{slantDefined}, + sizeDefined{sizeDefined} + { + } CharacterRun characterRun; ///< The initial character index and the number of characters of the run. char* familyName; ///< The font's family name. @@ -91,11 +90,11 @@ struct FontDescriptionRun FontSlant slant; ///< The font's slant. PointSize26Dot6 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. + 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. }; } // namespace Text