projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Fixed an incorrect ellipsis" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
rendering
/
atlas
/
atlas-glyph-manager-impl.h
diff --git
a/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.h
b/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.h
index
a2232f9
..
3d2613e
100644
(file)
--- a/
dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.h
+++ b/
dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.h
@@
-1,8
+1,8
@@
-#ifndef
__DALI_TOOLKIT_ATLAS_GLYPH_MANAGER_IMPL_H__
-#define
__DALI_TOOLKIT_ATLAS_GLYPH_MANAGER_IMPL_H__
+#ifndef
DALI_TOOLKIT_ATLAS_GLYPH_MANAGER_IMPL_H
+#define
DALI_TOOLKIT_ATLAS_GLYPH_MANAGER_IMPL_H
/*
/*
- * Copyright (c) 201
5
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
9
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-53,6
+53,9
@@
public:
Text::GlyphIndex mIndex;
uint32_t mImageId;
int32_t mCount;
Text::GlyphIndex mIndex;
uint32_t mImageId;
int32_t mCount;
+ uint16_t mOutlineWidth;
+ bool isItalic:1;
+ bool isBold:1;
};
struct FontGlyphRecord
};
struct FontGlyphRecord
@@
-70,6
+73,7
@@
public:
* @copydoc Toolkit::AtlasGlyphManager::Add
*/
void Add( const Text::GlyphInfo& glyph,
* @copydoc Toolkit::AtlasGlyphManager::Add
*/
void Add( const Text::GlyphInfo& glyph,
+ const Toolkit::AtlasGlyphManager::GlyphStyle& style,
const PixelData& bitmap,
Dali::Toolkit::AtlasManager::AtlasSlot& slot );
const PixelData& bitmap,
Dali::Toolkit::AtlasManager::AtlasSlot& slot );
@@
-85,6
+89,7
@@
public:
*/
bool IsCached( Text::FontId fontId,
Text::GlyphIndex index,
*/
bool IsCached( Text::FontId fontId,
Text::GlyphIndex index,
+ const Toolkit::AtlasGlyphManager::GlyphStyle& style,
Dali::Toolkit::AtlasManager::AtlasSlot& slot );
/**
Dali::Toolkit::AtlasManager::AtlasSlot& slot );
/**
@@
-105,7
+110,7
@@
public:
/**
* @copydoc toolkit::AtlasGlyphManager::AdjustReferenceCount
*/
/**
* @copydoc toolkit::AtlasGlyphManager::AdjustReferenceCount
*/
- void AdjustReferenceCount( Text::FontId fontId, Text::GlyphIndex index, int32_t delta );
+ void AdjustReferenceCount( Text::FontId fontId, Text::GlyphIndex index,
const Toolkit::AtlasGlyphManager::GlyphStyle& style,
int32_t delta );
/**
* @copydoc Toolkit::AtlasGlyphManager::GetTextures
/**
* @copydoc Toolkit::AtlasGlyphManager::GetTextures
@@
-155,4
+160,4
@@
inline Internal::AtlasGlyphManager& GetImplementation(Toolkit::AtlasGlyphManager
} // namespace Dali
} // namespace Dali
-#endif //
__DALI_TOOLKIT_ATLAS_GLYPH_MANAGER_IMPL_H__
+#endif //
DALI_TOOLKIT_ATLAS_GLYPH_MANAGER_IMPL_H