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 "Removed feedback controller Boost dependency" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
control-impl.cpp
diff --git
a/dali-toolkit/public-api/controls/control-impl.cpp
b/dali-toolkit/public-api/controls/control-impl.cpp
index
c0c71ea
..
c0780c4
100644
(file)
--- a/
dali-toolkit/public-api/controls/control-impl.cpp
+++ b/
dali-toolkit/public-api/controls/control-impl.cpp
@@
-239,7
+239,7
@@
Actor CreateBackground( Actor parent, const Vector4& color, Image image = Image(
//Create the index buffer
Property::Map indexFormat;
//Create the index buffer
Property::Map indexFormat;
- indexFormat["indices"] = Property::
UNSIGNED_
INTEGER;
+ indexFormat["indices"] = Property::INTEGER;
PropertyBuffer indexBuffer = PropertyBuffer::New( indexFormat, 6u );
indexBuffer.SetData(gQuadIndex);
PropertyBuffer indexBuffer = PropertyBuffer::New( indexFormat, 6u );
indexBuffer.SetData(gQuadIndex);
@@
-584,7
+584,7
@@
void Control::SetBackgroundColor( const Vector4& color )
Actor actor = CreateBackground(Self(), color );
background.actor = actor;
mImpl->mAddRemoveBackgroundChild = true;
Actor actor = CreateBackground(Self(), color );
background.actor = actor;
mImpl->mAddRemoveBackgroundChild = true;
- // use insert to guarantee its the first child (so that OVERLAY mode works)
+ // use insert to guarantee its the first child (so that OVERLAY
_2D
mode works)
Self().Insert( 0, actor );
mImpl->mAddRemoveBackgroundChild = false;
}
Self().Insert( 0, actor );
mImpl->mAddRemoveBackgroundChild = false;
}
@@
-619,7
+619,7
@@
void Control::SetBackgroundImage( Image image )
// Set the background actor before adding so that we do not inform derived classes
background.actor = actor;
mImpl->mAddRemoveBackgroundChild = true;
// Set the background actor before adding so that we do not inform derived classes
background.actor = actor;
mImpl->mAddRemoveBackgroundChild = true;
- // use insert to guarantee its the first child (so that OVERLAY mode works)
+ // use insert to guarantee its the first child (so that OVERLAY
_2D
mode works)
Self().Insert( 0, actor );
mImpl->mAddRemoveBackgroundChild = false;
}
Self().Insert( 0, actor );
mImpl->mAddRemoveBackgroundChild = false;
}
@@
-875,7
+875,7
@@
void Control::Initialize()
styleManager.StyleChangeSignal().Connect( this, &Control::OnStyleChange );
// Apply the current style
styleManager.StyleChangeSignal().Connect( this, &Control::OnStyleChange );
// Apply the current style
- GetImpl( styleManager ).ApplyThemeStyle( Toolkit::Control( GetOwner() ) );
+ GetImpl( styleManager ).ApplyThemeStyle
AtInit
( Toolkit::Control( GetOwner() ) );
}
}
}
}
@@
-900,7
+900,7
@@
void Control::OnControlChildRemove( Actor& child )
void Control::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change )
{
// By default the control is only interested in theme (not font) changes
void Control::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change )
{
// By default the control is only interested in theme (not font) changes
- if( change == StyleChange::THEME_CHANGE )
+ if(
styleManager &&
change == StyleChange::THEME_CHANGE )
{
GetImpl( styleManager ).ApplyThemeStyle( Toolkit::Control( GetOwner() ) );
}
{
GetImpl( styleManager ).ApplyThemeStyle( Toolkit::Control( GetOwner() ) );
}