X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Fmarkup-processor.h;h=de66e7f56cb3a5159bef6ebb5029f24f2cabb650;hp=0c43300f73d68d507fac4d61e51611b50ed101fc;hb=528aa3699cd51dab5115bca1aaebb65d4bc67c15;hpb=c8f181e1ca529f7d92ba638ccedadd7dd51be7eb diff --git a/dali-toolkit/internal/text/markup-processor.h b/dali-toolkit/internal/text/markup-processor.h old mode 100644 new mode 100755 index 0c43300..de66e7f --- a/dali-toolkit/internal/text/markup-processor.h +++ b/dali-toolkit/internal/text/markup-processor.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_H__ -#define __DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_H__ +#ifndef DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_H +#define DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_H /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -24,6 +24,7 @@ // INTERNAL INCLUDES #include +#include #include namespace Dali @@ -41,15 +42,17 @@ namespace Text struct MarkupProcessData { MarkupProcessData( Vector& colorRuns, - Vector& fontRuns ) + Vector& fontRuns, + Vector& items ) : colorRuns( colorRuns ), fontRuns( fontRuns ), + items(items), markupProcessedText() {} Vector& colorRuns; ///< The color runs. Vector& fontRuns; ///< The font description runs. - + Vector& items; ///< The embedded items. std::string markupProcessedText; ///< The mark-up string. }; @@ -67,4 +70,4 @@ void ProcessMarkupString( const std::string& markupString, MarkupProcessData& ma } // namespace Dali -#endif // __DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_H__ +#endif // DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_H