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
Adding Visual namespace and Visual becomes Visual::Base
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
buttons
/
button-impl.cpp
diff --git
a/dali-toolkit/internal/controls/buttons/button-impl.cpp
b/dali-toolkit/internal/controls/buttons/button-impl.cpp
index
af8cd5c
..
2350489
100644
(file)
--- a/
dali-toolkit/internal/controls/buttons/button-impl.cpp
+++ b/
dali-toolkit/internal/controls/buttons/button-impl.cpp
@@
-29,7
+29,7
@@
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/text-controls/text-label.h>
#include <dali-toolkit/public-api/controls/image-view/image-view.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/text-controls/text-label.h>
#include <dali-toolkit/public-api/controls/image-view/image-view.h>
-#include <dali-toolkit/devel-api/
controls/renderer-factory/renderer
-factory.h>
+#include <dali-toolkit/devel-api/
visual-factory/visual
-factory.h>
/**
* Button states and contents
/**
* Button states and contents
@@
-562,14
+562,14
@@
void Button::SetColor( const Vector4& color, Button::PaintState selectedState )
{
// If there is no existing content, create a new actor to use for flat color.
Actor placementActor = Actor::New();
{
// If there is no existing content, create a new actor to use for flat color.
Actor placementActor = Actor::New();
- Toolkit::
RendererFactory rendererFactory = Toolkit::Renderer
Factory::Get();
- Toolkit::
ControlRenderer
colorRenderer;
+ Toolkit::
VisualFactory rendererFactory = Toolkit::Visual
Factory::Get();
+ Toolkit::
Visual::Base
colorRenderer;
Property::Map map;
Property::Map map;
- map["rendererType"] = "
color
";
+ map["rendererType"] = "
COLOR
";
map["mixColor"] = color;
map["mixColor"] = color;
- colorRenderer = rendererFactory.Create
ControlRenderer
( map );
+ colorRenderer = rendererFactory.Create
Visual
( map );
colorRenderer.SetOnStage( placementActor );
SetupContent( *contentActor, placementActor ); //
colorRenderer.SetOnStage( placementActor );
SetupContent( *contentActor, placementActor ); //