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
Fix for the layout engine.
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
text-controller-impl.h
diff --git
a/dali-toolkit/internal/text/text-controller-impl.h
b/dali-toolkit/internal/text/text-controller-impl.h
index
c630d9e
..
79f56d3
100644
(file)
--- a/
dali-toolkit/internal/text/text-controller-impl.h
+++ b/
dali-toolkit/internal/text/text-controller-impl.h
@@
-102,10
+102,12
@@
struct EventData
enum State
{
INACTIVE,
enum State
{
INACTIVE,
+ INTERRUPTED,
SELECTING,
SELECTION_CHANGED,
EDITING,
EDITING_WITH_POPUP,
SELECTING,
SELECTION_CHANGED,
EDITING,
EDITING_WITH_POPUP,
+ EDITING_WITH_GRAB_HANDLE,
GRAB_HANDLE_PANNING,
SELECTION_HANDLE_PANNING
};
GRAB_HANDLE_PANNING,
SELECTION_HANDLE_PANNING
};
@@
-329,6
+331,11
@@
struct Controller::Impl
*/
void GetDefaultFonts( Dali::Vector<FontRun>& fonts, Length numberOfCharacters );
*/
void GetDefaultFonts( Dali::Vector<FontRun>& fonts, Length numberOfCharacters );
+ /**
+ * @brief Retrieve the line height of the default font.
+ */
+ float GetDefaultFontLineHeight();
+
void OnCursorKeyEvent( const Event& event );
void OnTapEvent( const Event& event );
void OnCursorKeyEvent( const Event& event );
void OnTapEvent( const Event& event );