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 "Support Underline to Markup using underlined-character-run" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
buttons
/
push-button-impl.h
diff --git
a/dali-toolkit/internal/controls/buttons/push-button-impl.h
b/dali-toolkit/internal/controls/buttons/push-button-impl.h
index
ecc7ac7
..
6300fe2
100644
(file)
--- a/
dali-toolkit/internal/controls/buttons/push-button-impl.h
+++ b/
dali-toolkit/internal/controls/buttons/push-button-impl.h
@@
-1,8
+1,8
@@
-#ifndef
__DALI_TOOLKIT_INTERNAL_PUSH_BUTTON_H__
-#define
__DALI_TOOLKIT_INTERNAL_PUSH_BUTTON_H__
+#ifndef
DALI_TOOLKIT_INTERNAL_PUSH_BUTTON_H
+#define
DALI_TOOLKIT_INTERNAL_PUSH_BUTTON_H
/*
/*
- * Copyright (c) 20
14
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
21
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.
@@
-27,13
+27,10
@@
namespace Dali
{
namespace Dali
{
-
namespace Toolkit
{
namespace Toolkit
{
-
namespace Internal
{
namespace Internal
{
-
/**
* PushButton implementation class.
*
/**
* PushButton implementation class.
*
@@
-42,7
+39,6
@@
namespace Internal
class PushButton : public Button
{
public:
class PushButton : public Button
{
public:
-
/**
* Create a new PushButton.
* @return A smart-pointer to the newly allocated PushButton.
/**
* Create a new PushButton.
* @return A smart-pointer to the newly allocated PushButton.
@@
-50,7
+46,6
@@
public:
static Dali::Toolkit::PushButton New();
protected:
static Dali::Toolkit::PushButton New();
protected:
-
/**
* Construct a new PushButton.
*/
/**
* Construct a new PushButton.
*/
@@
-62,7
+57,6
@@
protected:
virtual ~PushButton();
public:
virtual ~PushButton();
public:
-
// Properties
/**
// Properties
/**
@@
-83,7
+77,7
@@
public:
* @param[in] index The property index.
* @param[in] value The new property value.
*/
* @param[in] index The property index.
* @param[in] value The new property value.
*/
- static void SetProperty(
BaseObject* object, Property::Index index, const Property::Value& value
);
+ static void SetProperty(
BaseObject* object, Property::Index index, const Property::Value& value
);
/**
* Called to retrieve a property of an object of this type.
/**
* Called to retrieve a property of an object of this type.
@@
-91,23
+85,21
@@
public:
* @param[in] index The property index.
* @return The current value of the property.
*/
* @param[in] index The property index.
* @return The current value of the property.
*/
- static Property::Value GetProperty(
BaseObject* object, Property::Index propertyIndex
);
+ static Property::Value GetProperty(
BaseObject* object, Property::Index propertyIndex
);
private: // From Button
private: // From Button
-
/**
* @copydoc Toolkit::Internal::Button::OnInitialize
*/
/**
* @copydoc Toolkit::Internal::Button::OnInitialize
*/
- v
irtual void OnInitialize()
;
+ v
oid OnInitialize() override
;
private:
private:
-
/**
* @brief Sets the alignment mode to use to align the icon to the label.
*
* @param[in] iconAlignment The alignment mode to use
*/
/**
* @brief Sets the alignment mode to use to align the icon to the label.
*
* @param[in] iconAlignment The alignment mode to use
*/
- void SetIconAlignment(
const PushButton::IconAlignment iconAlignment
);
+ void SetIconAlignment(
const PushButton::IconAlignment iconAlignment
);
/**
* @brief Gets the alignment mode used to align the icon to the label.
/**
* @brief Gets the alignment mode used to align the icon to the label.
@@
-117,42
+109,49
@@
private:
const PushButton::IconAlignment GetIconAlignment() const;
private:
const PushButton::IconAlignment GetIconAlignment() const;
private:
-
// Undefined
// Undefined
- PushButton(
const PushButton&
);
+ PushButton(
const PushButton&
);
// Undefined
// Undefined
- PushButton& operator=(
const PushButton&
);
+ PushButton& operator=(
const PushButton&
);
private:
private:
+ IconAlignment mIconAlignment; ///< The alignment of the icon against the label.
+
+protected:
+ struct AccessibleImpl : public Button::AccessibleImpl
+ {
+ using Button::AccessibleImpl::AccessibleImpl;
- IconAlignment mIconAlignment; ///< The alignment of the icon against the label.
+ Dali::Accessibility::States CalculateStates() override;
+ };
+ void OnStateChange(State newState) override;
};
} // namespace Internal
// Helpers for public-api forwarding methods
};
} // namespace Internal
// Helpers for public-api forwarding methods
-inline Toolkit::Internal::PushButton& GetImplementation(
Toolkit::PushButton& button
)
+inline Toolkit::Internal::PushButton& GetImplementation(
Toolkit::PushButton& button
)
{
{
- DALI_ASSERT_ALWAYS(
button
);
+ DALI_ASSERT_ALWAYS(
button
);
Dali::RefObject& handle = button.GetImplementation();
Dali::RefObject& handle = button.GetImplementation();
- return static_cast<Toolkit::Internal::PushButton&>(
handle
);
+ return static_cast<Toolkit::Internal::PushButton&>(
handle
);
}
}
-inline const Toolkit::Internal::PushButton& GetImplementation(
const Toolkit::PushButton& button
)
+inline const Toolkit::Internal::PushButton& GetImplementation(
const Toolkit::PushButton& button
)
{
{
- DALI_ASSERT_ALWAYS(
button
);
+ DALI_ASSERT_ALWAYS(
button
);
const Dali::RefObject& handle = button.GetImplementation();
const Dali::RefObject& handle = button.GetImplementation();
- return static_cast<const Toolkit::Internal::PushButton&>(
handle
);
+ return static_cast<const Toolkit::Internal::PushButton&>(
handle
);
}
} // namespace Toolkit
} // namespace Dali
}
} // namespace Toolkit
} // namespace Dali
-#endif //
__DALI_TOOLKIT_INTERNAL_PUSH_BUTTON_H__
+#endif //
DALI_TOOLKIT_INTERNAL_PUSH_BUTTON_H