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
(AnimatedVectorImageVisual) Add some functions
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
visual-base-data-impl.h
diff --git
a/dali-toolkit/internal/visuals/visual-base-data-impl.h
b/dali-toolkit/internal/visuals/visual-base-data-impl.h
index
ca311e1
..
1f59ec0
100644
(file)
--- a/
dali-toolkit/internal/visuals/visual-base-data-impl.h
+++ b/
dali-toolkit/internal/visuals/visual-base-data-impl.h
@@
-2,7
+2,7
@@
#define DALI_TOOLKIT_INTERNAL_VISUAL_BASE_DATA_IMPL_H
/*
#define DALI_TOOLKIT_INTERNAL_VISUAL_BASE_DATA_IMPL_H
/*
- * Copyright (c) 201
7
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
8
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.
@@
-25,7
+25,9
@@
// INTERNAL INCLUDES
#include <dali-toolkit/internal/visuals/visual-base-impl.h>
#include <dali-toolkit/internal/visuals/visual-resource-observer.h>
// INTERNAL INCLUDES
#include <dali-toolkit/internal/visuals/visual-base-impl.h>
#include <dali-toolkit/internal/visuals/visual-resource-observer.h>
-#include <dali-toolkit/devel-api/align-enums.h>
+#include <dali-toolkit/public-api/align-enumerations.h>
+#include <dali-toolkit/public-api/visuals/visual-properties.h>
+#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
namespace Dali
{
namespace Dali
{
@@
-43,8
+45,9
@@
struct Base::Impl
{
/**
* Constructor
{
/**
* Constructor
+ * @param [in] fittingMode that the derived class prefers
*/
*/
- Impl();
+ Impl(
FittingMode fittingMode
);
/**
* Destructor
/**
* Destructor
@@
-123,9
+126,9
@@
struct Base::Impl
Size mControlSize;
int mDepthIndex;
Property::Index mMixColorIndex;
Size mControlSize;
int mDepthIndex;
Property::Index mMixColorIndex;
- Property::Index mOpacityIndex;
+ FittingMode mFittingMode; //< How the contents should fit the view
int mFlags;
int mFlags;
-
bool mResourceReady:1
;
+
Toolkit::Visual::ResourceStatus mResourceStatus
;
};
} // namespace Visual
};
} // namespace Visual