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
[AT-SPI] Squashed implementation
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
buttons
/
button-impl.h
diff --git
a/dali-toolkit/internal/controls/buttons/button-impl.h
b/dali-toolkit/internal/controls/buttons/button-impl.h
index
0915d3e
..
881b0a1
100644
(file)
--- a/
dali-toolkit/internal/controls/buttons/button-impl.h
+++ b/
dali-toolkit/internal/controls/buttons/button-impl.h
@@
-2,7
+2,7
@@
#define DALI_TOOLKIT_INTERNAL_BUTTON_H
/*
#define DALI_TOOLKIT_INTERNAL_BUTTON_H
/*
- * Copyright (c) 20
19
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
20
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.
@@
-26,6
+26,7
@@
#include <dali-toolkit/devel-api/visual-factory/visual-base.h>
#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>
#include <dali-toolkit/public-api/controls/control-impl.h>
#include <dali-toolkit/devel-api/visual-factory/visual-base.h>
#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>
#include <dali-toolkit/public-api/controls/control-impl.h>
+#include <dali-toolkit/internal/controls/control/control-data-impl.h>
namespace Dali
{
namespace Dali
{
@@
-316,43
+317,43
@@
protected: // From Control
* @copydoc Toolkit::Control::OnInitialize()
* @note If overridden by deriving button classes, then an up-call to Button::OnInitialize MUST be made at the start.
*/
* @copydoc Toolkit::Control::OnInitialize()
* @note If overridden by deriving button classes, then an up-call to Button::OnInitialize MUST be made at the start.
*/
- v
irtual void OnInitialize()
;
+ v
oid OnInitialize() override
;
/**
* @copydoc Toolkit::Control::OnAccessibilityActivated()
*/
/**
* @copydoc Toolkit::Control::OnAccessibilityActivated()
*/
-
virtual bool OnAccessibilityActivated()
;
+
bool OnAccessibilityActivated() override
;
/**
* @copydoc Toolkit::Control::OnKeyboardEnter()
*/
/**
* @copydoc Toolkit::Control::OnKeyboardEnter()
*/
-
virtual bool OnKeyboardEnter()
;
+
bool OnKeyboardEnter() override
;
/**
/**
- * @copydoc Toolkit::Control::OnS
tag
eDisconnection()
- * @note If overridden by deriving button classes, then an up-call to Button::OnS
tag
eDisconnection MUST be made at the end.
+ * @copydoc Toolkit::Control::OnS
cen
eDisconnection()
+ * @note If overridden by deriving button classes, then an up-call to Button::OnS
cen
eDisconnection MUST be made at the end.
*/
*/
- v
irtual void OnStageDisconnection()
;
+ v
oid OnSceneDisconnection() override
;
/**
/**
- * @copydoc Toolkit::Control::OnS
tageCon
nnection()
+ * @copydoc Toolkit::Control::OnS
ceneCo
nnection()
*/
*/
- v
irtual void OnStageConnection( int depth )
;
+ v
oid OnSceneConnection( int depth ) override
;
/**
* @copydoc Toolkit::Control::GetNaturalSize
*/
/**
* @copydoc Toolkit::Control::GetNaturalSize
*/
-
virtual Vector3 GetNaturalSize()
;
+
Vector3 GetNaturalSize() override
;
/**
* @copydoc Toolkit::Control::OnSetResizePolicy
*/
/**
* @copydoc Toolkit::Control::OnSetResizePolicy
*/
- v
irtual void OnSetResizePolicy( ResizePolicy::Type policy, Dimension::Type dimension )
;
+ v
oid OnSetResizePolicy( ResizePolicy::Type policy, Dimension::Type dimension ) override
;
/**
* @copydoc Toolkit::Control::OnRelayout
*/
/**
* @copydoc Toolkit::Control::OnRelayout
*/
- v
irtual void OnRelayout( const Vector2& size, RelayoutContainer& container )
;
+ v
oid OnRelayout( const Vector2& size, RelayoutContainer& container ) override
;
private:
private:
@@
-362,7
+363,7
@@
private:
* @param[in] touch The touch info.
* @return true, if consumed, false otherwise.
*/
* @param[in] touch The touch info.
* @return true, if consumed, false otherwise.
*/
- bool OnTouch( Actor actor, const Touch
Data
& touch );
+ bool OnTouch( Actor actor, const Touch
Event
& touch );
/**
* Handler for tap events.
/**
* Handler for tap events.
@@
-540,6
+541,15
@@
private:
// Actions
bool mClickActionPerforming; ///< Used to manage signal emissions during action
// Actions
bool mClickActionPerforming; ///< Used to manage signal emissions during action
+
+protected:
+ struct AccessibleImpl : public Control::Impl::AccessibleImpl
+ {
+ using Control::Impl::AccessibleImpl::AccessibleImpl;
+
+ Dali::Accessibility::States CalculateStates() override;
+ std::string GetNameRaw() override;
+ };
};
} // namespace Internal
};
} // namespace Internal