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
Updates following publication of devel-handle APIs
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
border
/
border-visual.cpp
diff --git
a/dali-toolkit/internal/visuals/border/border-visual.cpp
b/dali-toolkit/internal/visuals/border/border-visual.cpp
index
c1ba93b
..
94376e6
100644
(file)
--- a/
dali-toolkit/internal/visuals/border/border-visual.cpp
+++ b/
dali-toolkit/internal/visuals/border/border-visual.cpp
@@
-20,7
+20,6
@@
// EXTERNAL INCLUDES
#include <dali/integration-api/debug.h>
// EXTERNAL INCLUDES
#include <dali/integration-api/debug.h>
-#include <dali/devel-api/object/handle-devel.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/visuals/border-visual-properties.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/visuals/border-visual-properties.h>
@@
-125,7
+124,7
@@
BorderVisualPtr BorderVisual::New( VisualFactoryCache& factoryCache, const Prope
}
BorderVisual::BorderVisual( VisualFactoryCache& factoryCache )
}
BorderVisual::BorderVisual( VisualFactoryCache& factoryCache )
-: Visual::Base( factoryCache, Visual::FittingMode::FILL ),
+: Visual::Base( factoryCache, Visual::FittingMode::FILL
, Toolkit::Visual::BORDER
),
mBorderColor( Color::TRANSPARENT ),
mBorderSize( 0.f ),
mBorderColorIndex( Property::INVALID_INDEX ),
mBorderColor( Color::TRANSPARENT ),
mBorderSize( 0.f ),
mBorderColorIndex( Property::INVALID_INDEX ),
@@
-197,16
+196,16
@@
void BorderVisual::DoSetProperty( Dali::Property::Index index,
}
}
}
}
-void BorderVisual::DoSetOnS
tag
e( Actor& actor )
+void BorderVisual::DoSetOnS
cen
e( Actor& actor )
{
InitializeRenderer();
{
InitializeRenderer();
- mBorderColorIndex =
DevelHandle::RegisterProperty( mImpl->mRenderer,
Toolkit::BorderVisual::Property::COLOR, COLOR_NAME, mBorderColor );
+ mBorderColorIndex =
mImpl->mRenderer.RegisterProperty(
Toolkit::BorderVisual::Property::COLOR, COLOR_NAME, mBorderColor );
if( mBorderColor.a < 1.f || mAntiAliasing)
{
mImpl->mRenderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::ON );
}
if( mBorderColor.a < 1.f || mAntiAliasing)
{
mImpl->mRenderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::ON );
}
- mBorderSizeIndex =
DevelHandle::RegisterProperty( mImpl->mRenderer,
Toolkit::BorderVisual::Property::SIZE, SIZE_NAME, mBorderSize );
+ mBorderSizeIndex =
mImpl->mRenderer.RegisterProperty(
Toolkit::BorderVisual::Property::SIZE, SIZE_NAME, mBorderSize );
actor.AddRenderer( mImpl->mRenderer );
actor.AddRenderer( mImpl->mRenderer );