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 "Empty Implementation for INPUT_METHOD_SETTINGS property" into tizen
[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
0b3afd2
..
b832eff
100644
(file)
--- a/
dali-toolkit/internal/focus-manager/focus-manager-impl.cpp
+++ b/
dali-toolkit/internal/focus-manager/focus-manager-impl.cpp
@@
-19,18
+19,19
@@
#include "focus-manager-impl.h"
// EXTERNAL INCLUDES
#include "focus-manager-impl.h"
// EXTERNAL INCLUDES
+#include <cstring> // for strcmp
#include <dali/public-api/actors/layer.h>
#include <dali/public-api/actors/layer.h>
-#include <dali/
public
-api/adaptor-framework/accessibility-manager.h>
-#include <dali/
public
-api/adaptor-framework/sound-player.h>
-#include <dali/
public
-api/adaptor-framework/tts-player.h>
+#include <dali/
devel
-api/adaptor-framework/accessibility-manager.h>
+#include <dali/
devel
-api/adaptor-framework/sound-player.h>
+#include <dali/
devel
-api/adaptor-framework/tts-player.h>
#include <dali/public-api/animation/constraints.h>
#include <dali/public-api/animation/constraints.h>
-#include <dali/
public
-api/events/hit-test-algorithm.h>
+#include <dali/
devel
-api/events/hit-test-algorithm.h>
#include <dali/public-api/images/resource-image.h>
#include <dali/public-api/images/resource-image.h>
+#include <dali/integration-api/debug.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control.h>
#include <dali-toolkit/public-api/controls/control-impl.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control.h>
#include <dali-toolkit/public-api/controls/control-impl.h>
-#include <dali/integration-api/debug.h>
namespace Dali
{
namespace Dali
{
@@
-466,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
).Activate();
}
// Send notification for the activation of focused actor
}
// Send notification for the activation of focused actor
@@
-674,10
+675,7
@@
void FocusManager::CreateDefaultFocusIndicatorActor()
focusIndicator.SetPosition(Vector3(0.0f, 0.0f, 1.0f));
// Apply size constraint to the focus indicator
focusIndicator.SetPosition(Vector3(0.0f, 0.0f, 1.0f));
// Apply size constraint to the focus indicator
- Constraint constraint = Constraint::New<Vector3>(Actor::SIZE,
- ParentSource(Actor::SIZE),
- EqualToConstraint());
- focusIndicator.ApplyConstraint(constraint);
+ focusIndicator.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
SetFocusIndicatorActor(focusIndicator);
}
SetFocusIndicatorActor(focusIndicator);
}
@@
-817,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);
}
}
}
}
}
}
@@
-838,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);
}
}
}
}
}
}
@@
-875,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;
@@
-935,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