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
DALi signals refactor to remove V2 naming
[platform/core/uifw/dali-toolkit.git]
/
base
/
dali-toolkit
/
internal
/
focus-manager
/
keyboard-focus-manager-impl.cpp
diff --git
a/base/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
b/base/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
index
0ccc095
..
93e5feb
100644
(file)
--- a/
base/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
+++ b/
base/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
@@
-147,9
+147,9
@@
bool KeyboardFocusManager::DoSetCurrentFocusActor(const unsigned int actorID)
}
// Send notification for the change of focus actor
}
// Send notification for the change of focus actor
- if( !mFocusChangedSignal
V2
.Empty() )
+ if( !mFocusChangedSignal.Empty() )
{
{
- mFocusChangedSignal
V2
.Emit(GetCurrentFocusActor(), actor);
+ mFocusChangedSignal.Emit(GetCurrentFocusActor(), actor);
}
DALI_LOG_INFO( gLogFilter, Debug::General, "[%s:%d] Focus Changed\n", __FUNCTION__, __LINE__);
}
DALI_LOG_INFO( gLogFilter, Debug::General, "[%s:%d] Focus Changed\n", __FUNCTION__, __LINE__);
@@
-219,11
+219,11
@@
bool KeyboardFocusManager::MoveFocus(Toolkit::Control::KeyboardFocusNavigationDi
parentLayoutControl = GetParentLayoutControl(parentLayoutControl);
}
parentLayoutControl = GetParentLayoutControl(parentLayoutControl);
}
- if(!succeed && !mPreFocusChangeSignal
V2
.Empty())
+ if(!succeed && !mPreFocusChangeSignal.Empty())
{
// Don't know how to move the focus further. The application needs to tell us which actor to move the focus to
mIsWaitingKeyboardFocusChangeCommit = true;
{
// Don't know how to move the focus further. The application needs to tell us which actor to move the focus to
mIsWaitingKeyboardFocusChangeCommit = true;
- Actor nextFocusableActor = mPreFocusChangeSignal
V2
.Emit(currentFocusActor, Actor(), direction);
+ Actor nextFocusableActor = mPreFocusChangeSignal.Emit(currentFocusActor, Actor(), direction);
mIsWaitingKeyboardFocusChangeCommit = false;
if ( nextFocusableActor && nextFocusableActor.IsKeyboardFocusable() )
mIsWaitingKeyboardFocusChangeCommit = false;
if ( nextFocusableActor && nextFocusableActor.IsKeyboardFocusable() )
@@
-264,10
+264,10
@@
bool KeyboardFocusManager::DoMoveFocusWithinLayoutControl(Toolkit::Control contr
// We will try to move the focus to the actor. Emit a signal to notify the proposed actor to focus
// Signal handler can check the proposed actor and return a different actor if it wishes.
// We will try to move the focus to the actor. Emit a signal to notify the proposed actor to focus
// Signal handler can check the proposed actor and return a different actor if it wishes.
- if( !mPreFocusChangeSignal
V2
.Empty() )
+ if( !mPreFocusChangeSignal.Empty() )
{
mIsWaitingKeyboardFocusChangeCommit = true;
{
mIsWaitingKeyboardFocusChangeCommit = true;
- committedFocusActor = mPreFocusChangeSignal
V2
.Emit(currentFocusActor, nextFocusableActor, direction);
+ committedFocusActor = mPreFocusChangeSignal.Emit(currentFocusActor, nextFocusableActor, direction);
mIsWaitingKeyboardFocusChangeCommit = false;
}
mIsWaitingKeyboardFocusChangeCommit = false;
}
@@
-323,10
+323,10
@@
bool KeyboardFocusManager::DoMoveFocusToNextFocusGroup(bool forward)
parentLayoutControl = GetParentLayoutControl(parentLayoutControl);
}
parentLayoutControl = GetParentLayoutControl(parentLayoutControl);
}
- if(!mFocusGroupChangedSignal
V2
.Empty())
+ if(!mFocusGroupChangedSignal.Empty())
{
// Emit a focus group changed signal. The applicaton can move the focus to a new focus group
{
// Emit a focus group changed signal. The applicaton can move the focus to a new focus group
- mFocusGroupChangedSignal
V2
.Emit(GetCurrentFocusActor(), forward);
+ mFocusGroupChangedSignal.Emit(GetCurrentFocusActor(), forward);
}
return succeed;
}
return succeed;
@@
-344,9
+344,9
@@
void KeyboardFocusManager::DoActivate(Actor actor)
}
// Send notification for the activation of focused actor
}
// Send notification for the activation of focused actor
- if( !mFocusedActorActivatedSignal
V2
.Empty() )
+ if( !mFocusedActorActivatedSignal.Empty() )
{
{
- mFocusedActorActivatedSignal
V2
.Emit(actor);
+ mFocusedActorActivatedSignal.Emit(actor);
}
}
}
}
}
}
@@
-362,9
+362,9
@@
void KeyboardFocusManager::ClearFocus()
}
// Send notification for the change of focus actor
}
// Send notification for the change of focus actor
- if( !mFocusChangedSignal
V2
.Empty() )
+ if( !mFocusChangedSignal.Empty() )
{
{
- mFocusChangedSignal
V2
.Emit(actor, Actor());
+ mFocusChangedSignal.Emit(actor, Actor());
}
}
}
}
@@
-695,24
+695,24
@@
void KeyboardFocusManager::OnTouched(const TouchEvent& touchEvent)
ClearFocus();
}
ClearFocus();
}
-Toolkit::KeyboardFocusManager::PreFocusChangeSignal
V2
& KeyboardFocusManager::PreFocusChangeSignal()
+Toolkit::KeyboardFocusManager::PreFocusChangeSignal
Type
& KeyboardFocusManager::PreFocusChangeSignal()
{
{
- return mPreFocusChangeSignal
V2
;
+ return mPreFocusChangeSignal;
}
}
-Toolkit::KeyboardFocusManager::FocusChangedSignal
V2
& KeyboardFocusManager::FocusChangedSignal()
+Toolkit::KeyboardFocusManager::FocusChangedSignal
Type
& KeyboardFocusManager::FocusChangedSignal()
{
{
- return mFocusChangedSignal
V2
;
+ return mFocusChangedSignal;
}
}
-Toolkit::KeyboardFocusManager::FocusGroupChangedSignal
V2
& KeyboardFocusManager::FocusGroupChangedSignal()
+Toolkit::KeyboardFocusManager::FocusGroupChangedSignal
Type
& KeyboardFocusManager::FocusGroupChangedSignal()
{
{
- return mFocusGroupChangedSignal
V2
;
+ return mFocusGroupChangedSignal;
}
}
-Toolkit::KeyboardFocusManager::FocusedActorActivatedSignal
V2
& KeyboardFocusManager::FocusedActorActivatedSignal()
+Toolkit::KeyboardFocusManager::FocusedActorActivatedSignal
Type
& KeyboardFocusManager::FocusedActorActivatedSignal()
{
{
- return mFocusedActorActivatedSignal
V2
;
+ return mFocusedActorActivatedSignal;
}
bool KeyboardFocusManager::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor )
}
bool KeyboardFocusManager::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor )