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
Changed grab-handle behavior to work inside Popup
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
focus-manager
/
focus-manager-impl.cpp
diff --git
a/dali-toolkit/internal/focus-manager/focus-manager-impl.cpp
b/dali-toolkit/internal/focus-manager/focus-manager-impl.cpp
index
f1dab7e
..
a96cf79
100644
(file)
--- a/
dali-toolkit/internal/focus-manager/focus-manager-impl.cpp
+++ b/
dali-toolkit/internal/focus-manager/focus-manager-impl.cpp
@@
-467,7
+467,7
@@
void FocusManager::DoActivate(Actor actor)
if(control)
{
// Notify the control that it is activated
if(control)
{
// Notify the control that it is activated
-
control.GetImplementation().
Activate();
+
GetImplementation( control ).Accessibility
Activate();
}
// Send notification for the activation of focused actor
}
// Send notification for the activation of focused actor
@@
-815,7
+815,7
@@
bool FocusManager::AccessibilityActionUp()
if(control)
{
// Notify the control that it is activated
if(control)
{
// Notify the control that it is activated
- ret =
control.GetImplementation(
).OnAccessibilityValueChange(true);
+ ret =
GetImplementation( control
).OnAccessibilityValueChange(true);
}
}
}
}
}
}
@@
-836,7
+836,7
@@
bool FocusManager::AccessibilityActionDown()
if(control)
{
// Notify the control that it is activated
if(control)
{
// Notify the control that it is activated
- ret =
control.GetImplementation(
).OnAccessibilityValueChange(false);
+ ret =
GetImplementation( control
).OnAccessibilityValueChange(false);
}
}
}
}
}
}
@@
-873,7
+873,7
@@
bool FocusManager::AccessibilityActionTouch(const TouchEvent& touchEvent)
Dali::Toolkit::Control control = Dali::Toolkit::Control::DownCast(GetCurrentFocusActor());
if(control)
{
Dali::Toolkit::Control control = Dali::Toolkit::Control::DownCast(GetCurrentFocusActor());
if(control)
{
- handled =
control.GetImplementation(
).OnAccessibilityTouch(touchEvent);
+ handled =
GetImplementation( control
).OnAccessibilityTouch(touchEvent);
}
return handled;
}
return handled;
@@
-933,7
+933,7
@@
bool FocusManager::HandlePanGesture(const Integration::PanGestureEvent& panEvent
pan.velocity.x = pan.displacement.x / panEvent.timeDelta;
pan.velocity.y = pan.displacement.y / panEvent.timeDelta;
pan.velocity.x = pan.displacement.x / panEvent.timeDelta;
pan.velocity.y = pan.displacement.y / panEvent.timeDelta;
- handled =
control.GetImplementation(
).OnAccessibilityPan(pan);
+ handled =
GetImplementation( control
).OnAccessibilityPan(pan);
}
// If the gesture is not handled by the control, check its parent
}
// If the gesture is not handled by the control, check its parent