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
Block the changeness of PreMultiplied for some visuals
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
visual-base-impl.h
diff --git
a/dali-toolkit/internal/visuals/visual-base-impl.h
b/dali-toolkit/internal/visuals/visual-base-impl.h
index
d04d3df
..
20b0bd9
100644
(file)
--- a/
dali-toolkit/internal/visuals/visual-base-impl.h
+++ b/
dali-toolkit/internal/visuals/visual-base-impl.h
@@
-2,7
+2,7
@@
#define DALI_TOOLKIT_INTERNAL_VISUAL_H
/*
#define DALI_TOOLKIT_INTERNAL_VISUAL_H
/*
- * Copyright (c) 202
1
Samsung Electronics Co., Ltd.
+ * Copyright (c) 202
2
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.
@@
-92,12
+92,12
@@
public:
void SetTransformAndSize(const Property::Map& transform, Size controlSize);
/**
void SetTransformAndSize(const Property::Map& transform, Size controlSize);
/**
- * @brief Performs an action on the visual with the given action
name
and attributes.
+ * @brief Performs an action on the visual with the given action
id
and attributes.
*
*
- * @param[in] action
Name The name
of the action to perform this API only takes an Index
+ * @param[in] action
Id The id
of the action to perform this API only takes an Index
* @param[in] attributes The list of attributes for the action. ( optional for this data structure to have content )
*/
* @param[in] attributes The list of attributes for the action. ( optional for this data structure to have content )
*/
- void DoAction(const Dali::Property::Index action
Name
, const Dali::Property::Value attributes);
+ void DoAction(const Dali::Property::Index action
Id
, const Dali::Property::Value attributes);
/**
* @copydoc Toolkit::Visual::Base::GetHeightForWidth
/**
* @copydoc Toolkit::Visual::Base::GetHeightForWidth
@@
-155,7
+155,7
@@
public:
*
* @param[in] preMultiplied whether alpha is pre-multiplied.
*/
*
* @param[in] preMultiplied whether alpha is pre-multiplied.
*/
- void EnablePreMultipliedAlpha(bool preMultiplied);
+ v
irtual v
oid EnablePreMultipliedAlpha(bool preMultiplied);
/**
* @brief Query whether alpha is pre-multiplied.
/**
* @brief Query whether alpha is pre-multiplied.
@@
-186,6
+186,13
@@
public:
Renderer GetRenderer();
/**
Renderer GetRenderer();
/**
+ * Convert all string keys to int keys
+ * @param[in] key The key to convert
+ * @return the index key supplied or matching, or INVALID_INDEX if no match
+ */
+ static Property::Index GetIntKey(Property::Key key);
+
+ /**
* Sets the mix color ( including opacity ) of the visual.
* @param[in] mixColor The new mix color
*/
* Sets the mix color ( including opacity ) of the visual.
* @param[in] mixColor The new mix color
*/
@@
-232,8
+239,8
@@
public:
void ResourceReady(Toolkit::Visual::ResourceStatus resourceStatus);
/**
void ResourceReady(Toolkit::Visual::ResourceStatus resourceStatus);
/**
- * @brief Called when the visuals resources are loaded / ready
- * @return true if ready, false otherwise
+ * @brief Called when the visuals resources are loaded / ready
or failed (mean, broken image ready)
+ * @return true if ready
or failed (mean, broken image ready)
, false otherwise
*/
virtual bool IsResourceReady() const;
*/
virtual bool IsResourceReady() const;