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 branch 'devel/master' into devel/new_mesh
[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
85b88e2
..
a305880
100644
(file)
--- a/
dali-toolkit/internal/controls/text-controls/text-field-impl.h
+++ b/
dali-toolkit/internal/controls/text-controls/text-field-impl.h
@@
-137,14
+137,19
@@
private: // From Control
virtual void OnPan( const PanGesture& gesture );
/**
virtual void OnPan( const PanGesture& gesture );
/**
+ * @copydoc Control::OnStageConnection()
+ */
+ virtual void OnStageConnection( unsigned int depth );
+
+ /**
* @copydoc Dali::CustomActorImpl::OnKeyEvent(const KeyEvent&)
*/
virtual bool OnKeyEvent(const KeyEvent& event);
/**
* @copydoc Dali::CustomActorImpl::OnKeyEvent(const KeyEvent&)
*/
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, bool needsClipping
);
/**
* @copydoc Text::ControlInterface::RequestTextRelayout()
/**
* @copydoc Text::ControlInterface::RequestTextRelayout()
@@
-161,6
+166,11
@@
private: // From Control
*/
virtual void 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
/**
@@
-200,6
+210,14
@@
private: // Implementation
TextField(const TextField&);
TextField& operator=(const TextField& rhs);
TextField(const TextField&);
TextField& operator=(const TextField& rhs);
+ /**
+ * @brief Render view, create and attach actor(s) to this Text Field.
+ */
+ void RenderText();
+
+ // Connection needed to re-render text, when a Text Field returns to the stage.
+ void OnStageConnect( Dali::Actor actor );
+
private: // Data
// Signals
private: // Data
// Signals
@@
-210,11
+228,14
@@
private: // Data
Text::RendererPtr mRenderer;
Text::DecoratorPtr mDecorator;
Text::ClipperPtr mClipper; ///< For EXCEED_POLICY_CLIP
Text::RendererPtr mRenderer;
Text::DecoratorPtr mDecorator;
Text::ClipperPtr mClipper; ///< For EXCEED_POLICY_CLIP
+ std::vector<Actor> mClippingDecorationActors; ///< Decoration actors which need clipping.
-
Renderable
Actor mRenderableActor;
+ Actor mRenderableActor;
int mRenderingBackend;
int mExceedPolicy;
int mRenderingBackend;
int mExceedPolicy;
+ unsigned int mDepth;
+ bool mHasBeenStaged:1;
};
} // namespace Internal
};
} // namespace Internal