X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbuttons%2Fbutton-impl.cpp;h=5fc7a898b86a00911af5ae855bc26402cc864ff3;hb=refs%2Fchanges%2F99%2F80299%2F18;hp=07722b96bc8c0a286ba12a3e4a11cd56ec1909b6;hpb=805ae527fca54726f894fb9936c288c7c0f7dbe7;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/buttons/button-impl.cpp b/dali-toolkit/internal/controls/buttons/button-impl.cpp index 07722b9..5fc7a89 100644 --- a/dali-toolkit/internal/controls/buttons/button-impl.cpp +++ b/dali-toolkit/internal/controls/buttons/button-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -29,7 +29,9 @@ // INTERNAL INCLUDES #include #include -#include +#include +#include + /** * Button states and contents @@ -563,11 +565,11 @@ 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(); Toolkit::VisualFactory rendererFactory = Toolkit::VisualFactory::Get(); - Toolkit::Visual colorRenderer; + Toolkit::Visual::Base colorRenderer; Property::Map map; - map["rendererType"] = "COLOR"; - map["mixColor"] = color; + map[ Toolkit::Visual::Property::TYPE ] = Toolkit::Visual::COLOR; + map[ Toolkit::ColorVisual::Property::MIX_COLOR ] = color; colorRenderer = rendererFactory.CreateVisual( map ); colorRenderer.SetOnStage( placementActor );