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
Remove mesh from text input.
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
text-input
/
text-input-text-highlight-impl.h
diff --git
a/dali-toolkit/internal/controls/text-input/text-input-text-highlight-impl.h
b/dali-toolkit/internal/controls/text-input/text-input-text-highlight-impl.h
index
74a3421
..
8fdbcd9
100644
(file)
--- a/
dali-toolkit/internal/controls/text-input/text-input-text-highlight-impl.h
+++ b/
dali-toolkit/internal/controls/text-input/text-input-text-highlight-impl.h
@@
-18,10
+18,6
@@
*
*/
*
*/
-// EXTERNAL INCLUDES
-#include <dali/public-api/geometry/mesh.h>
-#include <dali/public-api/modeling/material.h>
-
// INTERNAL INCLUDES
#include <dali-toolkit/internal/controls/text-input/textview-character-positions-impl.h>
#include <dali-toolkit/public-api/controls/text-view/text-view.h>
// INTERNAL INCLUDES
#include <dali-toolkit/internal/controls/text-input/textview-character-positions-impl.h>
#include <dali-toolkit/public-api/controls/text-view/text-view.h>
@@
-141,7
+137,7
@@
public:
/**
* Creates the Mesh data needed by the Mesh Actor
*/
/**
* Creates the Mesh data needed by the Mesh Actor
*/
-
Mesh
CreateHighLightMesh();
+
void
CreateHighLightMesh();
private:
private:
@@
-163,9
+159,6
@@
private:
TextViewCharacterPositioning& mTextViewCharacterPositioning;
TextViewCharacterPositioning& mTextViewCharacterPositioning;
- Mesh mHighlightMesh; ///< Mesh Data for highlight
- MeshData mMeshData; ///< Container to hold meshData for highlight
- Material mCustomMaterial; ///< Custom material used for highlight
HighlightInfo mNewHighlightInfo; ///< Geometry info to create highlight.
};
HighlightInfo mNewHighlightInfo; ///< Geometry info to create highlight.
};