// EXTERNAL INCLUDES
#include <dali/integration-api/debug.h>
#include <dali/public-api/object/type-registry.h>
-#include <efl_assist_theme.h>
// INTERNAL INCLUDES
-#include <common/adaptor-impl.h>
+#include <singleton-service-impl.h>
namespace Dali
{
namespace Adaptor
{
-namespace
-{
-
-BaseHandle Create()
-{
- return ColorController::Get();
-}
-Dali::TypeRegistration COLOR_CONTROLLER_TYPE( typeid(Dali::ColorController), typeid(Dali::BaseHandle), Create );
-
-}
-
Dali::ColorController ColorController::Get()
{
Dali::ColorController colorController;
- if ( Adaptor::IsAvailable() )
+ Dali::SingletonService service( SingletonService::Get() );
+ if ( service )
{
// Check whether the singleton is already created
- Dali::BaseHandle handle = Dali::Adaptor::Get().GetSingleton( typeid( Dali::ColorController ) );
+ Dali::BaseHandle handle = service.GetSingleton( typeid( Dali::ColorController ) );
if(handle)
{
// If so, downcast the handle
}
else
{
- Adaptor& adaptorImpl( Adaptor::GetImplementation( Adaptor::Get() ) );
colorController = Dali::ColorController( new ColorController( ) );
- adaptorImpl.RegisterSingleton( typeid( colorController ), colorController );
+ service.Register( typeid( colorController ), colorController );
}
}
bool ColorController::RetrieveColor( const std::string& colorCode, Vector4& colorValue )
{
- int R = 0;
- int G = 0;
- int B = 0;
- int A = 0;
-
- if( ea_theme_color_get(colorCode.c_str(), &R, &G, &B, &A, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL) )
- {
- colorValue.r = (float) (R) / 255.0f;
- colorValue.g = (float) (G) / 255.0f;
- colorValue.b = (float) (B) / 255.0f;
- colorValue.a = (float) (A) / 255.0f;
-
- return true;
- }
-
return false;
}
bool ColorController::RetrieveColor( const std::string& colorCode , Vector4& textColor, Vector4& textOutlineColor, Vector4& textShadowColor)
{
- int R = 0;
- int G = 0;
- int B = 0;
- int A = 0;
-
- int outlineR = 0;
- int outlineG = 0;
- int outlineB = 0;
- int outlineA = 0;
-
- int shadowR = 0;
- int shadowG = 0;
- int shadowB = 0;
- int shadowA = 0;
-
- if( ea_theme_color_get(colorCode.c_str(), &R, &G, &B, &A, &outlineR, &outlineG, &outlineB, &outlineA, &shadowR, &shadowG, &shadowB, &shadowA) )
- {
- textColor.r = (float) (R) / 255.0f;
- textColor.g = (float) (G) / 255.0f;
- textColor.b = (float) (B) / 255.0f;
- textColor.a = (float) (A) / 255.0f;
-
- textOutlineColor.r = (float) (outlineR) / 255.0f;
- textOutlineColor.g = (float) (outlineG) / 255.0f;
- textOutlineColor.b = (float) (outlineB) / 255.0f;
- textOutlineColor.a = (float) (outlineA) / 255.0f;
-
- textShadowColor.r = (float) (shadowR) / 255.0f;
- textShadowColor.g = (float) (shadowG) / 255.0f;
- textShadowColor.b = (float) (shadowB) / 255.0f;
- textShadowColor.a = (float) (shadowA) / 255.0f;
-
- return true;
- }
-
return false;
}