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 "Remove profile build dependencies" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
progress-bar
/
progress-bar-impl.cpp
diff --git
a/dali-toolkit/internal/controls/progress-bar/progress-bar-impl.cpp
b/dali-toolkit/internal/controls/progress-bar/progress-bar-impl.cpp
index
24b1aa4
..
a537621
100755
(executable)
--- a/
dali-toolkit/internal/controls/progress-bar/progress-bar-impl.cpp
+++ b/
dali-toolkit/internal/controls/progress-bar/progress-bar-impl.cpp
@@
-350,7
+350,7
@@
Toolkit::TransitionData ProgressBar::ConvertPropertyToTransition( const Property
* 4) Unregister visual if empty map was provided. This is the method to remove a visual
*/
* 4) Unregister visual if empty map was provided. This is the method to remove a visual
*/
-void ProgressBar::CreateVisualsForComponent( Property::Index index, const Property::Value& value, const
floa
t visualDepth )
+void ProgressBar::CreateVisualsForComponent( Property::Index index, const Property::Value& value, const
in
t visualDepth )
{
Toolkit::VisualFactory visualFactory = Toolkit::VisualFactory::Get();
Toolkit::Visual::Base progressVisual;
{
Toolkit::VisualFactory visualFactory = Toolkit::VisualFactory::Get();
Toolkit::Visual::Base progressVisual;
@@
-375,14
+375,13
@@
void ProgressBar::CreateVisualsForComponent( Property::Index index, const Proper
if ( progressVisual )
{
if ( progressVisual )
{
- progressVisual.SetDepthIndex( visualDepth );
if( index == Toolkit::ProgressBar::Property::INDETERMINATE_VISUAL )
{
if( index == Toolkit::ProgressBar::Property::INDETERMINATE_VISUAL )
{
- DevelControl::RegisterVisual( *this, index, progressVisual, mIndeterminate );
+ DevelControl::RegisterVisual( *this, index, progressVisual, mIndeterminate
, visualDepth
);
}
else
{
}
else
{
- DevelControl::RegisterVisual( *this, index, progressVisual, true );
+ DevelControl::RegisterVisual( *this, index, progressVisual, true
, visualDepth
);
}
}
else
}
}
else