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 "Add new layouting support for TextLabel and ImageView." into devel/master
[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
e0b7d50
..
8b1417c
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) 201
4
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
7
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.
@@
-588,7
+588,7
@@
protected:
* @param[in] value the value to set on the component
* @param[in] visualDepth the depth of the visual if overlapping another
*/
* @param[in] value the value to set on the component
* @param[in] visualDepth the depth of the visual if overlapping another
*/
- void CreateVisualsForComponent( Property::Index index
,const Property::Value& value, const floa
t visualDepth );
+ void CreateVisualsForComponent( Property::Index index
, const Property::Value& value, const in
t visualDepth );
/**
* @brief Get the Property map for the given Visual
/**
* @brief Get the Property map for the given Visual
@@
-680,6
+680,11
@@
private:
// Actions
bool mClickActionPerforming; ///< Used to manage signal emissions during action
// Actions
bool mClickActionPerforming; ///< Used to manage signal emissions during action
+
+ // Deprecated API support
+ Image mSetButtonImage; ///< Store set image if deprecated SetButtonImage used.
+ Image mSetSelectedImage; ///< Store set image if deprecated SetSelectedImage used.
+
};
} // namespace Internal
};
} // namespace Internal