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
Add null check for mTextureSet.
[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
..
6575c7d
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,21
+19,19
@@
#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/adaptor-framework/environment-variable.h>
#include <dali/devel-api/adaptor-framework/environment-variable.h>
+#include <dali/devel-api/common/singleton-service.h>
// INTERNAL INCLUDES
#include <dali-toolkit/internal/visuals/visual-factory-impl.h>
namespace Dali
{
// INTERNAL INCLUDES
#include <dali-toolkit/internal/visuals/visual-factory-impl.h>
namespace Dali
{
-
namespace Toolkit
{
namespace Toolkit
{
-
namespace
{
namespace
{
-
const char
* const DALI_DEBUG_RENDERING("DALI_DEBUG_RENDERING");
+
const char
* const DALI_DEBUG_RENDERING("DALI_DEBUG_RENDERING");
}
VisualFactory VisualFactory::Get()
}
VisualFactory VisualFactory::Get()
@@
-41,29
+39,28
@@
VisualFactory VisualFactory::Get()
VisualFactory factory;
// Check whether the VisualFactory is already created
VisualFactory factory;
// Check whether the VisualFactory is already created
- SingletonService singletonService(
SingletonService::Get()
);
- if(
singletonService
)
+ SingletonService singletonService(
SingletonService::Get()
);
+ if(
singletonService
)
{
{
- BaseHandle handle = singletonService.GetSingleton(
typeid(VisualFactory)
);
- if(
handle
)
+ BaseHandle handle = singletonService.GetSingleton(
typeid(VisualFactory)
);
+ if(
handle
)
{
//If so, downcast the handle of singleton to VisualFactory
{
//If so, downcast the handle of singleton to VisualFactory
- factory = VisualFactory(
dynamic_cast<Internal::VisualFactory*>(handle.GetObjectPtr())
);
+ factory = VisualFactory(
dynamic_cast<Internal::VisualFactory*>(handle.GetObjectPtr())
);
}
}
- if(
!factory )
// If not, create the VisualFactory and register it as a singleton
+ if(
!factory)
// If not, create the VisualFactory and register it as a singleton
{
// Check whether debug rendering is required
{
// Check whether debug rendering is required
- if(
EnvironmentVariable::GetEnvironmentVariable( DALI_DEBUG_RENDERING )
)
+ if(
EnvironmentVariable::GetEnvironmentVariable(DALI_DEBUG_RENDERING)
)
{
{
- factory = VisualFactory(
new Internal::VisualFactory(true)
);
+ factory = VisualFactory(
new Internal::VisualFactory(true)
);
}
else
{
}
else
{
- factory = VisualFactory(
new Internal::VisualFactory(false)
);
+ factory = VisualFactory(
new Internal::VisualFactory(false)
);
}
}
- singletonService.Register( typeid(VisualFactory), factory );
-
+ singletonService.Register(typeid(VisualFactory), factory);
}
}
}
}
@@
-78,35
+75,40
@@
VisualFactory::~VisualFactory()
{
}
{
}
-VisualFactory::VisualFactory(
const VisualFactory& handle
)
-: BaseHandle(
handle
)
+VisualFactory::VisualFactory(
const VisualFactory& handle
)
+: BaseHandle(
handle
)
{
}
{
}
-VisualFactory& VisualFactory::operator=(
const VisualFactory& handle
)
+VisualFactory& VisualFactory::operator=(
const VisualFactory& handle
)
{
{
- BaseHandle::operator=(
handle
);
+ BaseHandle::operator=(
handle
);
return *this;
}
return *this;
}
-VisualFactory::VisualFactory(Internal::VisualFactory
*
impl)
+VisualFactory::VisualFactory(Internal::VisualFactory
*
impl)
: BaseHandle(impl)
{
}
: BaseHandle(impl)
{
}
-Visual VisualFactory::CreateVisual( const Property::Map& propertyMap )
+Visual::Base VisualFactory::CreateVisual(const Property::Map& propertyMap)
+{
+ return GetImplementation(*this).CreateVisual(propertyMap);
+}
+
+Visual::Base VisualFactory::CreateVisual(const std::string& url, ImageDimensions size)
{
{
- return GetImplementation(
*this ).CreateVisual( propertyMap
);
+ return GetImplementation(
*this).CreateVisual(url, size
);
}
}
-
Visual VisualFactory::CreateVisual( const Image& image
)
+
void VisualFactory::SetPreMultiplyOnLoad(bool preMultiply
)
{
{
-
return GetImplementation( *this ).CreateVisual( image
);
+
GetImplementation(*this).SetPreMultiplyOnLoad(preMultiply
);
}
}
-Visual VisualFactory::CreateVisual( const std::string& url, ImageDimensions size )
+bool VisualFactory::GetPreMultiplyOnLoad() const
{
{
- return GetImplementation(
*this ).CreateVisual( url, size
);
+ return GetImplementation(
*this).GetPreMultiplyOnLoad(
);
}
} // namespace Toolkit
}
} // namespace Toolkit