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
Moved Text Controller & Markup Processor to sub-folders
[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
2967b1d
..
568af24
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) 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.
@@
-20,7
+20,7
@@
// EXTERNAL INCLUDES
#include <dali/public-api/math/vector2.h>
// EXTERNAL INCLUDES
#include <dali/public-api/math/vector2.h>
-#include <dali/public-api/rendering/renderer.h>
+#include <dali/public-api/rendering/
visual-
renderer.h>
// INTERNAL INCLUDES
#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
// INTERNAL INCLUDES
#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
@@
-96,9
+96,9
@@
struct Base::Impl
void UpdatePropertyMap(const Property::Map& map);
/**
void UpdatePropertyMap(const Property::Map& map);
/**
- *
Register or s
et the uniform properties onto the renderer
+ *
S
et the uniform properties onto the renderer
*/
*/
- void
RegisterUniforms(
Renderer renderer, Toolkit::Direction::Type direction);
+ void
SetUniforms(Visual
Renderer renderer, Toolkit::Direction::Type direction);
/**
* Convert the control size and the transform attributes into the actual
/**
* Convert the control size and the transform attributes into the actual
@@
-112,27
+112,27
@@
struct Base::Impl
Vector4 mOffsetSizeMode;
Toolkit::Align::Type mOrigin;
Toolkit::Align::Type mAnchorPoint;
Vector4 mOffsetSizeMode;
Toolkit::Align::Type mOrigin;
Toolkit::Align::Type mAnchorPoint;
- Property::Index mOffsetIndex;
- Property::Index mSizeIndex;
};
};
-
Renderer
mRenderer;
+
VisualRenderer
mRenderer;
CustomShader* mCustomShader;
EventObserver* mEventObserver; ///< Allows controls to observe when the visual has events to notify
std::string mName;
Transform mTransform;
Vector4 mMixColor;
Size mControlSize;
CustomShader* mCustomShader;
EventObserver* mEventObserver; ///< Allows controls to observe when the visual has events to notify
std::string mName;
Transform mTransform;
Vector4 mMixColor;
Size mControlSize;
- float mCornerRadius;
+ float mBorderlineWidth;
+ Vector4 mBorderlineColor;
+ float mBorderlineOffset;
+ Vector4 mCornerRadius;
float mCornerRadiusPolicy;
int mDepthIndex;
float mCornerRadiusPolicy;
int mDepthIndex;
- Property::Index mMixColorIndex;
- Property::Index mCornerRadiusIndex;
- FittingMode mFittingMode; //< How the contents should fit the view
+ FittingMode mFittingMode; ///< How the contents should fit the view
int mFlags;
Toolkit::Visual::ResourceStatus mResourceStatus;
const Toolkit::Visual::Type mType;
int mFlags;
Toolkit::Visual::ResourceStatus mResourceStatus;
const Toolkit::Visual::Type mType;
- bool mNeedCornerRadius;
+ bool mAlwaysUsingBorderline : 1; ///< Whether we need the borderline in shader always.
+ bool mAlwaysUsingCornerRadius : 1; ///< Whether we need the corner radius in shader always.
};
} // namespace Visual
};
} // namespace Visual