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
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
ca763e9
..
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) 20
15
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
20
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.
*
* 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 "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
#include <dali/devel-api/adaptor-framework/environment-variable.h>
// INTERNAL INCLUDES
@@
-94,19
+94,24
@@
VisualFactory::VisualFactory(Internal::VisualFactory *impl)
{
}
{
}
-Visual VisualFactory::CreateVisual( const Property::Map& propertyMap )
+Visual
::Base
VisualFactory::CreateVisual( const Property::Map& propertyMap )
{
return GetImplementation( *this ).CreateVisual( propertyMap );
}
{
return GetImplementation( *this ).CreateVisual( propertyMap );
}
-Visual
VisualFactory::CreateVisual( const Image& imag
e )
+Visual
::Base VisualFactory::CreateVisual( const std::string& url, ImageDimensions siz
e )
{
{
- return GetImplementation( *this ).CreateVisual(
imag
e );
+ return GetImplementation( *this ).CreateVisual(
url, siz
e );
}
}
-
Visual 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
}
} // namespace Toolkit