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_2.3.24] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
control-impl.cpp
diff --git
a/dali-toolkit/public-api/controls/control-impl.cpp
b/dali-toolkit/public-api/controls/control-impl.cpp
index
52e9764
..
40f34a0
100644
(file)
--- a/
dali-toolkit/public-api/controls/control-impl.cpp
+++ b/
dali-toolkit/public-api/controls/control-impl.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 202
3
Samsung Electronics Co., Ltd.
+ * Copyright (c) 202
4
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-25,13
+25,10
@@
#include <dali/integration-api/debug.h>
#include <dali/public-api/animation/constraint.h>
#include <dali/public-api/math/math-utils.h>
#include <dali/integration-api/debug.h>
#include <dali/public-api/animation/constraint.h>
#include <dali/public-api/math/math-utils.h>
-#include <dali/public-api/object/type-info.h>
-#include <dali/public-api/object/type-registry-helper.h>
#include <dali/public-api/size-negotiation/relayout-container.h>
#include <cstring> // for strcmp
#include <limits>
#include <stack>
#include <dali/public-api/size-negotiation/relayout-container.h>
#include <cstring> // for strcmp
#include <limits>
#include <stack>
-#include <typeinfo>
// INTERNAL INCLUDES
#include <dali-toolkit/dali-toolkit.h>
// INTERNAL INCLUDES
#include <dali-toolkit/dali-toolkit.h>
@@
-311,12
+308,6
@@
bool Control::IsKeyboardFocusGroup()
return Toolkit::KeyboardFocusManager::Get().IsFocusGroup(Self());
}
return Toolkit::KeyboardFocusManager::Get().IsFocusGroup(Self());
}
-void Control::AccessibilityActivate()
-{
- // Inform deriving classes
- OnAccessibilityActivated();
-}
-
void Control::KeyboardEnter()
{
// Inform deriving classes
void Control::KeyboardEnter()
{
// Inform deriving classes
@@
-443,14
+434,6
@@
void Control::Initialize()
{
SetKeyboardNavigationSupport(true);
}
{
SetKeyboardNavigationSupport(true);
}
-
- Dali::TypeInfo type;
- Self().GetTypeInfo(type);
- if(type)
- {
- auto typeName = type.GetName();
- DevelControl::AppendAccessibilityAttribute(Toolkit::Control::DownCast(Self()), "class", typeName);
- }
}
void Control::OnInitialize()
}
void Control::OnInitialize()
@@
-598,7
+581,7
@@
void Control::OnPropertySet(Property::Index index, const Property::Value& proper
case Actor::Property::VISIBLE:
{
auto* accessible = GetAccessibleObject();
case Actor::Property::VISIBLE:
{
auto* accessible = GetAccessibleObject();
- if(DALI_LIKELY(accessible))
+ if(DALI_LIKELY(accessible)
&& accessible->IsHighlighted()
)
{
accessible->EmitVisible(Self().GetProperty<bool>(Actor::Property::VISIBLE));
}
{
accessible->EmitVisible(Self().GetProperty<bool>(Actor::Property::VISIBLE));
}