Merge "Changes after TouchedSignal changes" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / devel-api / visual-factory / visual-factory.cpp

diff --git a/dali-toolkit/devel-api/visual-factory/visual-factory.cpp b/dali-toolkit/devel-api/visual-factory/visual-factory.cpp
index b91d79d..46cbbac 100644 (file)
--- a/dali-toolkit/devel-api/visual-factory/visual-factory.cpp
+++ b/dali-toolkit/devel-api/visual-factory/visual-factory.cpp
@@ -1,5 +1,5 @@
  /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -19,7 +19,7 @@
 #include "visual-factory.h"
 
 // EXTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/singleton-service.h>
+#include <dali/devel-api/common/singleton-service.h>
 #include <dali/devel-api/adaptor-framework/environment-variable.h>
 
 // INTERNAL INCLUDES
@@ -99,14 +99,19 @@ Visual::Base VisualFactory::CreateVisual( const Property::Map& propertyMap )
   return GetImplementation( *this ).CreateVisual( propertyMap );
 }
 
-Visual::Base VisualFactory::CreateVisual( const Image& image )
+Visual::Base VisualFactory::CreateVisual( const std::string& url, ImageDimensions size )
 {
-  return GetImplementation( *this ).CreateVisual( image );
+  return GetImplementation( *this ).CreateVisual( url, size );
 }
 
-Visual::Base VisualFactory::CreateVisual( const std::string& url, ImageDimensions size )
+void VisualFactory::SetPreMultiplyOnLoad( bool preMultiply )
 {
-  return GetImplementation( *this ).CreateVisual( url, size );
+  GetImplementation( *this ).SetPreMultiplyOnLoad( preMultiply );
+}
+
+bool VisualFactory::GetPreMultiplyOnLoad() const
+{
+  return GetImplementation( *this ).GetPreMultiplyOnLoad();
 }
 
 } // namespace Toolkit