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 "Support paragraph tag <p> in markup" 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
c28b041
..
42ebe69
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) 20
19
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
21
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.
@@
-19,23
+19,20
@@
*/
// EXTERNAL INCLUDES
*/
// EXTERNAL INCLUDES
-#include <dali/public-api/rendering/geometry.h>
#include <dali/public-api/common/intrusive-ptr.h>
#include <dali/public-api/common/intrusive-ptr.h>
+#include <dali/public-api/rendering/geometry.h>
// INTERNAL INCLUDES
#include <dali-toolkit/internal/visuals/visual-base-impl.h>
namespace Dali
{
// INTERNAL INCLUDES
#include <dali-toolkit/internal/visuals/visual-base-impl.h>
namespace Dali
{
-
namespace Toolkit
{
namespace Toolkit
{
-
namespace Internal
{
namespace Internal
{
-
class BorderVisual;
class BorderVisual;
-typedef IntrusivePtr<
BorderVisual
> BorderVisualPtr;
+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.
@@
-51,7
+48,6
@@
typedef IntrusivePtr< BorderVisual > BorderVisualPtr;
class BorderVisual : public Visual::Base
{
public:
class BorderVisual : public Visual::Base
{
public:
-
/**
* @brief Create a new border visual.
*
/**
* @brief Create a new border visual.
*
@@
-59,16
+55,15
@@
public:
* @param[in] properties A Property::Map containing settings for this visual
* @return A smart-pointer to the newly allocated visual.
*/
* @param[in] properties A Property::Map containing settings for this visual
* @return A smart-pointer to the newly allocated visual.
*/
- static BorderVisualPtr New(
VisualFactoryCache& factoryCache, const Property::Map& properties
);
+ static BorderVisualPtr New(
VisualFactoryCache& factoryCache, const Property::Map& properties
);
protected:
protected:
-
/**
* @brief Constructor.
*
* @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
*/
/**
* @brief Constructor.
*
* @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
*/
- BorderVisual(
VisualFactoryCache& factoryCache
);
+ BorderVisual(
VisualFactoryCache& factoryCache
);
/**
* @brief A reference counted object may only be deleted by calling Unreference().
/**
* @brief A reference counted object may only be deleted by calling Unreference().
@@
-76,24
+71,29
@@
protected:
virtual ~BorderVisual();
/**
virtual ~BorderVisual();
/**
+ * @copydoc Visual::Base::OnInitialize
+ */
+ void OnInitialize() override;
+
+ /**
* @copydoc Visual::Base::DoSetProperties
*/
* @copydoc Visual::Base::DoSetProperties
*/
- void DoSetProperties(
const Property::Map& propertyMap
) override;
+ void DoSetProperties(
const Property::Map& propertyMap
) override;
/**
/**
- * @copydoc Visual::Base::DoSetOnS
tag
e
+ * @copydoc Visual::Base::DoSetOnS
cen
e
*/
*/
- void DoSetOnS
tage( Actor& actor
) override;
+ void DoSetOnS
cene(Actor& actor
) override;
/**
* @copydoc Visual::Base::CreatePropertyMap
*/
/**
* @copydoc Visual::Base::CreatePropertyMap
*/
- void DoCreatePropertyMap(
Property::Map& map
) const override;
+ void DoCreatePropertyMap(
Property::Map& map
) const override;
/**
* @copydoc Visual::Base::CreateInstancePropertyMap
*/
/**
* @copydoc Visual::Base::CreateInstancePropertyMap
*/
- void DoCreateInstancePropertyMap(
Property::Map& map
) const override;
+ void DoCreateInstancePropertyMap(
Property::Map& map
) const override;
/**
* @copydoc Visual::Base::OnSetTransform
/**
* @copydoc Visual::Base::OnSetTransform
@@
-101,12
+101,6
@@
protected:
void OnSetTransform() override;
private:
void OnSetTransform() override;
private:
-
- /**
- * @brief Initialize the renderer with the geometry and shader from the cache, if not available, create and save to the cache for sharing.
- */
- void InitializeRenderer();
-
/**
* Request the border shader from the factory cache. If fail, create tha shader and add it to cache.
* @return The border shader.
/**
* Request the border shader from the factory cache. If fail, create tha shader and add it to cache.
* @return The border shader.
@@
-124,16
+118,15
@@
private:
* @param[in] index The index key of the value
* @param[in] value The value
*/
* @param[in] index The index key of the value
* @param[in] value The value
*/
- void DoSetProperty(
Property::Index index, const Property::Value& value
);
+ void DoSetProperty(
Property::Index index, const Property::Value& value
);
// Undefined
// Undefined
- BorderVisual(
const BorderVisual& borderRenderer
);
+ BorderVisual(
const BorderVisual& borderRenderer
);
// Undefined
// Undefined
- BorderVisual& operator=(
const BorderVisual& borderRenderer
);
+ BorderVisual& operator=(
const BorderVisual& borderRenderer
);
private:
private:
-
Vector4 mBorderColor;
float mBorderSize;
Vector4 mBorderColor;
float mBorderSize;