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
Replace some Dali::Actor public APIs with new properties
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
buttons
/
button-impl.cpp
diff --git
a/dali-toolkit/internal/controls/buttons/button-impl.cpp
b/dali-toolkit/internal/controls/buttons/button-impl.cpp
index
1af6848
..
d355c17
100644
(file)
--- a/
dali-toolkit/internal/controls/buttons/button-impl.cpp
+++ b/
dali-toolkit/internal/controls/buttons/button-impl.cpp
@@
-289,7
+289,7
@@
void Button::ChangeState( State requestedState )
mPreviousButtonState = mButtonState; // Store previous state for visual removal (used when animations ended)
mButtonState = requestedState; // Update current state
mPreviousButtonState = mButtonState; // Store previous state for visual removal (used when animations ended)
mButtonState = requestedState; // Update current state
- if ( Self().
OnStage(
) )
+ if ( Self().
GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE
) )
{
OnStateChange( mButtonState ); // Notify derived buttons
SelectRequiredVisual( VISUAL_INDEX_FOR_STATE[ mButtonState ][ BACKGROUND ] );
{
OnStateChange( mButtonState ); // Notify derived buttons
SelectRequiredVisual( VISUAL_INDEX_FOR_STATE[ mButtonState ][ BACKGROUND ] );
@@
-619,7
+619,7
@@
void Button::OnInitialize()
mTapDetector.Attach( self );
mTapDetector.DetectedSignal().Connect(this, &Button::OnTap);
mTapDetector.Attach( self );
mTapDetector.DetectedSignal().Connect(this, &Button::OnTap);
- self.Set
KeyboardFocusable(
true );
+ self.Set
Property( Actor::Property::KEYBOARD_FOCUSABLE,
true );
self.TouchSignal().Connect( this, &Button::OnTouch );
}
self.TouchSignal().Connect( this, &Button::OnTouch );
}