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
Dont register accessibility and keyboard focus properties as scene graph properties
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
focus-manager
/
keyboard-focus-manager-impl.cpp
diff --git
a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
index
fb20d56
..
5be38ac
100644
(file)
--- a/
dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
+++ b/
dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
@@
-34,8
+34,8
@@
// 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-toolkit/public-api/focus-manager/focus-manager.h>
-#include <dali-toolkit/
public
-api/focus-manager/keyinput-focus-manager.h>
+#include <dali-toolkit/public-api/focus-manager/
accessibility-
focus-manager.h>
+#include <dali-toolkit/
devel
-api/focus-manager/keyinput-focus-manager.h>
namespace Dali
{
namespace Dali
{
@@
-168,10
+168,6
@@
bool KeyboardFocusManager::DoSetCurrentFocusActor(const unsigned int actorID)
// Save the current focused actor
mCurrentFocusActor = actorID;
// Save the current focused actor
mCurrentFocusActor = actorID;
- // Move the accessibility focus to the same actor
-// Toolkit::FocusManager focusManager = Toolkit::FocusManager::Get();
-// focusManager.SetCurrentFocusActor(actor);
-
DALI_LOG_INFO( gLogFilter, Debug::General, "[%s:%d] SUCCEED\n", __FUNCTION__, __LINE__);
return true;
}
DALI_LOG_INFO( gLogFilter, Debug::General, "[%s:%d] SUCCEED\n", __FUNCTION__, __LINE__);
return true;
}
@@
-401,7
+397,7
@@
void KeyboardFocusManager::SetAsFocusGroup(Actor actor, bool isFocusGroup)
Property::Index propertyIsFocusGroup = actor.GetPropertyIndex(IS_FOCUS_GROUP_PROPERTY_NAME);
if(propertyIsFocusGroup == Property::INVALID_INDEX)
{
Property::Index propertyIsFocusGroup = actor.GetPropertyIndex(IS_FOCUS_GROUP_PROPERTY_NAME);
if(propertyIsFocusGroup == Property::INVALID_INDEX)
{
- actor.RegisterProperty(IS_FOCUS_GROUP_PROPERTY_NAME, isFocusGroup);
+ actor.RegisterProperty(IS_FOCUS_GROUP_PROPERTY_NAME, isFocusGroup
, Property::READ_WRITE
);
}
else
{
}
else
{
@@
-522,7
+518,7
@@
void KeyboardFocusManager::OnKeyEvent(const KeyEvent& event)
AccessibilityManager accessibilityManager = AccessibilityManager::Get();
bool isAccessibilityEnabled = accessibilityManager.IsEnabled();
AccessibilityManager accessibilityManager = AccessibilityManager::Get();
bool isAccessibilityEnabled = accessibilityManager.IsEnabled();
- Toolkit::
FocusManager accessibilityFocusManager = Toolkit::
FocusManager::Get();
+ Toolkit::
AccessibilityFocusManager accessibilityFocusManager = Toolkit::Accessibility
FocusManager::Get();
std::string keyName = event.keyPressedName;
std::string keyName = event.keyPressedName;