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
Fixes for text layout.
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
text-controls
/
text-field-impl.h
diff --git
a/dali-toolkit/internal/controls/text-controls/text-field-impl.h
b/dali-toolkit/internal/controls/text-controls/text-field-impl.h
index
5e0df24
..
0e53053
100644
(file)
--- a/
dali-toolkit/internal/controls/text-controls/text-field-impl.h
+++ b/
dali-toolkit/internal/controls/text-controls/text-field-impl.h
@@
-80,6
+80,11
@@
public:
static bool DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor );
/**
static bool DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor );
/**
+ * @copydoc TextField::TextChangedSignal()
+ */
+ Toolkit::TextField::TextChangedSignalType& TextChangedSignal();
+
+ /**
* @copydoc TextField::MaxLengthReachedSignal()
*/
Toolkit::TextField::MaxLengthReachedSignalType& MaxLengthReachedSignal();
* @copydoc TextField::MaxLengthReachedSignal()
*/
Toolkit::TextField::MaxLengthReachedSignalType& MaxLengthReachedSignal();
@@
-137,9
+142,9
@@
private: // From Control
virtual bool OnKeyEvent(const KeyEvent& event);
/**
virtual bool OnKeyEvent(const KeyEvent& event);
/**
- * @copydoc
Dali::Toolkit::Text::Controller::(ImfManager& imfManager, const ImfManager::ImfEventData& imfEvent
)
+ * @copydoc
Text::ControlInterface::AddDecoration(
)
*/
*/
-
ImfManager::ImfCallbackData OnImfEvent( ImfManager& imfManager, const ImfManager::ImfEventData& imfEvent
);
+
virtual void AddDecoration( Actor& actor
);
/**
* @copydoc Text::ControlInterface::RequestTextRelayout()
/**
* @copydoc Text::ControlInterface::RequestTextRelayout()
@@
-147,10
+152,20
@@
private: // From Control
virtual void RequestTextRelayout();
/**
virtual void RequestTextRelayout();
/**
+ * @copydoc Text::ControlInterface::TextChanged()
+ */
+ virtual void TextChanged();
+
+ /**
* @copydoc Text::ControlInterface::MaxLengthReached()
*/
virtual void MaxLengthReached();
* @copydoc Text::ControlInterface::MaxLengthReached()
*/
virtual void MaxLengthReached();
+ /**
+ * @copydoc Dali::Toolkit::Text::Controller::(ImfManager& imfManager, const ImfManager::ImfEventData& imfEvent)
+ */
+ ImfManager::ImfCallbackData OnImfEvent( ImfManager& imfManager, const ImfManager::ImfEventData& imfEvent );
+
private: // Implementation
/**
private: // Implementation
/**
@@
-193,6
+208,7
@@
private: // Implementation
private: // Data
// Signals
private: // Data
// Signals
+ Toolkit::TextField::TextChangedSignalType mTextChangedSignal;
Toolkit::TextField::MaxLengthReachedSignalType mMaxLengthReachedSignal;
Text::ControllerPtr mController;
Toolkit::TextField::MaxLengthReachedSignalType mMaxLengthReachedSignal;
Text::ControllerPtr mController;