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
[dali_1.9.3] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
border
/
border-visual.h
diff --git
a/dali-toolkit/internal/visuals/border/border-visual.h
b/dali-toolkit/internal/visuals/border/border-visual.h
index
6973a79
..
c28b041
100644
(file)
--- a/
dali-toolkit/internal/visuals/border/border-visual.h
+++ b/
dali-toolkit/internal/visuals/border/border-visual.h
@@
-2,7
+2,7
@@
#define DALI_TOOLKIT_INTERNAL_BORDER_VISUAL_H
/*
#define DALI_TOOLKIT_INTERNAL_BORDER_VISUAL_H
/*
- * Copyright (c) 201
6
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.
@@
-20,6
+20,7
@@
// EXTERNAL INCLUDES
#include <dali/public-api/rendering/geometry.h>
// EXTERNAL INCLUDES
#include <dali/public-api/rendering/geometry.h>
+#include <dali/public-api/common/intrusive-ptr.h>
// INTERNAL INCLUDES
#include <dali-toolkit/internal/visuals/visual-base-impl.h>
// INTERNAL INCLUDES
#include <dali-toolkit/internal/visuals/visual-base-impl.h>
@@
-33,6
+34,9
@@
namespace Toolkit
namespace Internal
{
namespace Internal
{
+class BorderVisual;
+typedef IntrusivePtr< BorderVisual > BorderVisualPtr;
+
/**
* The visual which renders a solid color to the control's quad border fixed to a specified size.
*
/**
* The visual which renders a solid color to the control's quad border fixed to a specified size.
*
@@
-44,66
+48,57
@@
namespace Internal
* | borderSize | FLOAT |
* | antiAliasing | BOOLEAN |
*/
* | borderSize | FLOAT |
* | antiAliasing | BOOLEAN |
*/
-
class BorderVisual : public Visual::Base
{
public:
/**
class BorderVisual : public Visual::Base
{
public:
/**
- * @brief C
onstructor
.
+ * @brief C
reate a new border visual
.
*
* @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
*
* @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
+ * @param[in] properties A Property::Map containing settings for this visual
+ * @return A smart-pointer to the newly allocated visual.
*/
*/
- BorderVisual( VisualFactoryCache& factoryCache );
-
- /**
- * @brief A reference counted object may only be deleted by calling Unreference().
- */
- virtual ~BorderVisual();
+ static BorderVisualPtr New( VisualFactoryCache& factoryCache, const Property::Map& properties );
-p
ublic: // from Visual
+p
rotected:
/**
/**
- * @copydoc Visual::SetClipRect
+ * @brief Constructor.
+ *
+ * @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
*/
*/
- virtual void SetClipRect( const Rect<int>& clipRect );
-
-protected:
+ BorderVisual( VisualFactoryCache& factoryCache );
/**
/**
- * @
copydoc Visual::DoInitialize
+ * @
brief A reference counted object may only be deleted by calling Unreference().
*/
*/
- virtual
void DoInitialize( Actor& actor, const Property::Map& propertyMap
);
+ virtual
~BorderVisual(
);
/**
/**
- * @copydoc Visual::
DoSetOnStage
+ * @copydoc Visual::
Base::DoSetProperties
*/
*/
- v
irtual void DoSetOnStage( Actor& actor )
;
+ v
oid DoSetProperties( const Property::Map& propertyMap ) override
;
/**
/**
- * @copydoc Visual::
CreatePropertyMap
+ * @copydoc Visual::
Base::DoSetOnStage
*/
*/
- virtual void DoCreatePropertyMap( Property::Map& map ) const;
-
-public:
+ void DoSetOnStage( Actor& actor ) override;
/**
/**
- * Set the color of the border.
- * @param[in] color The border color.
+ * @copydoc Visual::Base::CreatePropertyMap
*/
*/
- void
SetBorderColor( const Vector4& color)
;
+ void
DoCreatePropertyMap( Property::Map& map ) const override
;
/**
/**
- * Set the size of the border.
- * @param[in] size The border size.
+ * @copydoc Visual::Base::CreateInstancePropertyMap
*/
*/
- void
SetBorderSize( float size )
;
+ void
DoCreateInstancePropertyMap( Property::Map& map ) const override
;
/**
/**
- * Enable/Disable the anti-aliasing.
- * @param[in] enable Whether the anti-aliasing be enabled or not.
+ * @copydoc Visual::Base::OnSetTransform
*/
*/
- void
RequireAntiAliasing( bool antiAliasing )
;
+ void
OnSetTransform() override
;
private:
private:
@@
-124,6
+119,13
@@
private:
*/
Geometry CreateBorderGeometry();
*/
Geometry CreateBorderGeometry();
+ /**
+ * Helper method to set individual values by index key.
+ * @param[in] index The index key of the value
+ * @param[in] value The value
+ */
+ void DoSetProperty( Property::Index index, const Property::Value& value );
+
// Undefined
BorderVisual( const BorderVisual& borderRenderer );
// Undefined
BorderVisual( const BorderVisual& borderRenderer );