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 "Prepare for Tizen 4.0 Build" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
control-impl.cpp
diff --git
a/dali-toolkit/public-api/controls/control-impl.cpp
b/dali-toolkit/public-api/controls/control-impl.cpp
index
5d3248e
..
3f58064
100644
(file)
--- a/
dali-toolkit/public-api/controls/control-impl.cpp
+++ b/
dali-toolkit/public-api/controls/control-impl.cpp
@@
-54,6
+54,7
@@
namespace Dali
{
namespace Dali
{
+extern bool CaseInsensitiveStringCompare( const std::string& a, const std::string& b );
namespace Toolkit
{
namespace Toolkit
{
@@
-322,7
+323,7
@@
public:
case Toolkit::DevelControl::Property::STATE:
{
case Toolkit::DevelControl::Property::STATE:
{
- Toolkit::DevelControl::State state(
DevelControl::NORMAL
);
+ Toolkit::DevelControl::State state(
controlImpl.mImpl->mState
);
if( Scripting::GetEnumerationProperty< Toolkit::DevelControl::State >( value, ControlStateTable, ControlStateTableCount, state ) )
{
if( Scripting::GetEnumerationProperty< Toolkit::DevelControl::State >( value, ControlStateTable, ControlStateTableCount, state ) )
{
@@
-506,6
+507,8
@@
public:
{
if( mState != state )
{
{
if( mState != state )
{
+ // If mState was Disabled, and new state is Focused, should probably
+ // store that fact, e.g. in another property that FocusManager can access.
mState = state;
// Trigger state change and transitions
mState = state;
// Trigger state change and transitions