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 changes I2df640e0,Ia1188305,I7fae506e,I7967a7cc,Ib0fdcdf4, ... 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
..
1db13d5
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) 201
4
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
9
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.
@@
-98,7
+98,7
@@
private: // From Button
/**
* @copydoc Toolkit::Internal::Button::OnInitialize
*/
/**
* @copydoc Toolkit::Internal::Button::OnInitialize
*/
- v
irtual void OnInitialize()
;
+ v
oid OnInitialize() override
;
private:
private:
@@
-127,6
+127,15
@@
private:
private:
IconAlignment mIconAlignment; ///< The alignment of the icon against the label.
private:
IconAlignment mIconAlignment; ///< The alignment of the icon against the label.
+
+protected:
+ struct AccessibleImpl : public Button::AccessibleImpl
+ {
+ using Button::AccessibleImpl::AccessibleImpl;
+
+ Dali::Accessibility::States CalculateStates() override;
+ };
+ void OnStateChange( State newState ) override;
};
} // namespace Internal
};
} // namespace Internal
@@
-155,4
+164,4
@@
inline const Toolkit::Internal::PushButton& GetImplementation( const Toolkit::Pu
} // namespace Dali
} // namespace Dali
-#endif //
__DALI_TOOLKIT_INTERNAL_PUSH_BUTTON_H__
+#endif //
DALI_TOOLKIT_INTERNAL_PUSH_BUTTON_H