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 "Stop setting crazy Z value with controls (at the moment depth is ignored by...
[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
2c32e3d
..
e275980
100644
(file)
--- a/
dali-toolkit/internal/controls/text-controls/text-field-impl.h
+++ b/
dali-toolkit/internal/controls/text-controls/text-field-impl.h
@@
-147,7
+147,7
@@
private: // From Control
/**
* @copydoc Control::OnStageConnection()
*/
/**
* @copydoc Control::OnStageConnection()
*/
- virtual void OnStageConnection(
unsigned
int depth );
+ virtual void OnStageConnection( int depth );
/**
* @copydoc Dali::CustomActorImpl::OnKeyEvent(const KeyEvent&)
/**
* @copydoc Dali::CustomActorImpl::OnKeyEvent(const KeyEvent&)
@@
-248,7
+248,6
@@
private: // Data
int mRenderingBackend;
int mExceedPolicy;
int mRenderingBackend;
int mExceedPolicy;
- unsigned int mDepth;
bool mHasBeenStaged:1;
};
bool mHasBeenStaged:1;
};