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 "Updated ImageVisual to handle native texture sampler" into 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
7efb142
..
aa7a69b
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.
@@
-78,42
+78,27
@@
protected:
/**
* @copydoc Visual::Base::DoSetProperties
*/
/**
* @copydoc Visual::Base::DoSetProperties
*/
- v
irtual void DoSetProperties( const Property::Map& propertyMap )
;
+ v
oid DoSetProperties( const Property::Map& propertyMap ) override
;
/**
/**
- * @copydoc Visual::Base::DoSetOnS
tag
e
+ * @copydoc Visual::Base::DoSetOnS
cen
e
*/
*/
- v
irtual void DoSetOnStage( Actor& actor )
;
+ v
oid DoSetOnScene( Actor& actor ) override
;
/**
* @copydoc Visual::Base::CreatePropertyMap
*/
/**
* @copydoc Visual::Base::CreatePropertyMap
*/
- v
irtual void DoCreatePropertyMap( Property::Map& map ) const
;
+ v
oid DoCreatePropertyMap( Property::Map& map ) const override
;
/**
/**
- * @copydoc Visual::Base::OnSetTransform
- */
- virtual void OnSetTransform();
-
-public:
-
- /**
- * Set the color of the border.
- * @param[in] color The border color.
+ * @copydoc Visual::Base::CreateInstancePropertyMap
*/
*/
- void
SetBorderColor( const Vector4& color)
;
+ void
DoCreateInstancePropertyMap( Property::Map& map ) const override
;
/**
/**
- * Set the size of the border.
- * @param[in] size The border size.
- */
- void SetBorderSize( float size );
-
- /**
- * 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: