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 interaction between scale dimensions and bevel percentage properties...
[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
bd02762
..
558cced
100644
(file)
--- a/
dali-toolkit/internal/controls/text-controls/text-field-impl.h
+++ b/
dali-toolkit/internal/controls/text-controls/text-field-impl.h
@@
-2,7
+2,7
@@
#define __DALI_TOOLKIT_INTERNAL_TEXT_FIELD_H__
/*
#define __DALI_TOOLKIT_INTERNAL_TEXT_FIELD_H__
/*
- * Copyright (c) 201
5
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
6
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.
@@
-92,6
+92,11
@@
public:
*/
Toolkit::TextField::MaxLengthReachedSignalType& MaxLengthReachedSignal();
*/
Toolkit::TextField::MaxLengthReachedSignalType& MaxLengthReachedSignal();
+ /**
+ * @copydoc TextField::TextChangedSignal()
+ */
+ Toolkit::TextField::InputStyleChangedSignalType& InputStyleChangedSignal();
+
private: // From Control
/**
private: // From Control
/**
@@
-176,6
+181,11
@@
private: // From Control
*/
virtual void MaxLengthReached();
*/
virtual void MaxLengthReached();
+ /**
+ * @copydoc Text::ControlInterface::InputStyleChanged()
+ */
+ virtual void InputStyleChanged( Text::InputStyle::Mask inputStyleMask );
+
private: // Implementation
/**
private: // Implementation
/**
@@
-221,6
+231,13
@@
private: // Implementation
bool OnTouched( Actor actor, const TouchData& touch );
/**
bool OnTouched( Actor actor, const TouchData& touch );
/**
+ * @brief Callbacks called on idle.
+ *
+ * If there are notifications of change of input style on the queue, Toolkit::TextField::InputStyleChangedSignal() are emitted.
+ */
+ void OnIdleSignal();
+
+ /**
* Construct a new TextField.
*/
TextField();
* Construct a new TextField.
*/
TextField();
@@
-237,7
+254,7
@@
private: // Implementation
/**
* @brief Render view, create and attach actor(s) to this Text Field.
*/
/**
* @brief Render view, create and attach actor(s) to this Text Field.
*/
- void RenderText();
+ void RenderText(
Text::Controller::UpdateTextType updateTextType
);
// Connection needed to re-render text, when a Text Field returns to the stage.
void OnStageConnect( Dali::Actor actor );
// Connection needed to re-render text, when a Text Field returns to the stage.
void OnStageConnect( Dali::Actor actor );
@@
-247,6
+264,7
@@
private: // Data
// Signals
Toolkit::TextField::TextChangedSignalType mTextChangedSignal;
Toolkit::TextField::MaxLengthReachedSignalType mMaxLengthReachedSignal;
// Signals
Toolkit::TextField::TextChangedSignalType mTextChangedSignal;
Toolkit::TextField::MaxLengthReachedSignalType mMaxLengthReachedSignal;
+ Toolkit::TextField::InputStyleChangedSignalType mInputStyleChangedSignal;
Text::ControllerPtr mController;
Text::RendererPtr mRenderer;
Text::ControllerPtr mController;
Text::RendererPtr mRenderer;
@@
-255,6
+273,7
@@
private: // Data
std::vector<Actor> mClippingDecorationActors; ///< Decoration actors which need clipping.
Actor mRenderableActor;
std::vector<Actor> mClippingDecorationActors; ///< Decoration actors which need clipping.
Actor mRenderableActor;
+ CallbackBase* mIdleCallback;
int mRenderingBackend;
int mExceedPolicy;
int mRenderingBackend;
int mExceedPolicy;