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
Text improvement
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
visual-base-impl.cpp
diff --git
a/dali-toolkit/internal/visuals/visual-base-impl.cpp
b/dali-toolkit/internal/visuals/visual-base-impl.cpp
index
8d2158f
..
d14dcd3
100755
(executable)
--- a/
dali-toolkit/internal/visuals/visual-base-impl.cpp
+++ b/
dali-toolkit/internal/visuals/visual-base-impl.cpp
@@
-435,14
+435,14
@@
const Vector4& Visual::Base::GetMixColor() const
return mImpl->mMixColor;
}
return mImpl->mMixColor;
}
-void Visual::Base::Add
ResourceObserver( Visual::Resource
Observer& observer)
+void Visual::Base::Add
EventObserver( Visual::Event
Observer& observer)
{
{
- mImpl->m
Resource
Observer = &observer;
+ mImpl->m
Event
Observer = &observer;
}
}
-void Visual::Base::Remove
ResourceObserver( Visual::Resource
Observer& observer )
+void Visual::Base::Remove
EventObserver( Visual::Event
Observer& observer )
{
{
- mImpl->m
Resource
Observer = NULL;
+ mImpl->m
Event
Observer = NULL;
}
void Visual::Base::ResourceReady(Toolkit::Visual::ResourceStatus resourceStatus)
}
void Visual::Base::ResourceReady(Toolkit::Visual::ResourceStatus resourceStatus)
@@
-451,10
+451,10
@@
void Visual::Base::ResourceReady(Toolkit::Visual::ResourceStatus resourceStatus)
{
mImpl->mResourceStatus = resourceStatus;
{
mImpl->mResourceStatus = resourceStatus;
- if( mImpl->m
Resource
Observer )
+ if( mImpl->m
Event
Observer )
{
// observer is currently a control impl
{
// observer is currently a control impl
- mImpl->m
Resource
Observer->ResourceReady( *this );
+ mImpl->m
Event
Observer->ResourceReady( *this );
}
}
}
}
}
}
@@
-474,6
+474,11
@@
Visual::FittingMode Visual::Base::GetFittingMode() const
return mImpl->mFittingMode;
}
return mImpl->mFittingMode;
}
+Visual::Base& Visual::Base::GetVisualObject()
+{
+ return *this;
+}
+
Renderer Visual::Base::GetRenderer()
{
return mImpl->mRenderer;
Renderer Visual::Base::GetRenderer()
{
return mImpl->mRenderer;