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 "Do not re-position the text popup when the text scrolls." into devel/master
[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
392df2c
..
3073611
100644
(file)
--- a/
dali-toolkit/internal/text/text-controller-impl.h
+++ b/
dali-toolkit/internal/text/text-controller-impl.h
@@
-230,6
+230,7
@@
struct Controller::Impl
~Impl()
{
~Impl()
{
+ delete mFontDefaults;
delete mEventData;
}
delete mEventData;
}
@@
-278,6
+279,12
@@
struct Controller::Impl
return ( mEventData && mEventData->mIsShowingPlaceholderText );
}
return ( mEventData && mEventData->mIsShowingPlaceholderText );
}
+ bool IsShowingRealText() const
+ {
+ return ( !IsShowingPlaceholderText() &&
+ 0u != mLogicalModel->mText.Count() );
+ }
+
/**
* @brief Called when placeholder-text is hidden
*/
/**
* @brief Called when placeholder-text is hidden
*/