BubbleActor::BubbleActor( unsigned int numberOfBubble,
const Vector2& movementArea)
-: mMovementArea( movementArea ),
+: mActor(),
+ mRenderer(),
+ mMovementArea( movementArea ),
+ mIndicesOffset(),
+ mIndiceStartEndPos(),
+ mIndicesPercentage(),
+ mIndexGravity( Property::INVALID_INDEX ),
+ mIndexDynamicScale( Property::INVALID_INDEX ),
+ mIndexInvertedMovementArea( Property::INVALID_INDEX ),
mNumBubble( numberOfBubble ),
mRandomSeed( 0 )
{
{
struct Vertex
{
- float index;
- Dali::Vector2 position;
- Dali::Vector2 textureCoord;
-
Vertex()
- {}
+ : index( 0.0f ), position(), textureCoord()
+ {
+ }
Vertex( float index, const Dali::Vector2& position, const Dali::Vector2& textureCoord )
: index( index ), position( position ), textureCoord( textureCoord )
- {}
+ {
+ }
+
+ float index;
+ Dali::Vector2 position;
+ Dali::Vector2 textureCoord;
};
/**
std::string line;
std::getline(ss, line);
- while (std::getline(ss, line))
+ while (std::getline(ss, line))
{
std::istringstream isline(line, std::istringstream::in);
std::string tag;
if (iniObj)
{
- pntAcum += (int)mPoints.Size();
- texAcum += (int)mTextures.Size();
- nrmAcum += (int)mNormals.Size();
-
CenterAndScale(true, mPoints);
-
- face = 0;
-
mSceneLoaded = true;
-
return true;
}
namespace Internal
{
-namespace
-{
-
#define MAXIMUM_NUMBER_OF_CONTROLS 2
-}
-
/**
* ConfirmationPopup implementation class.
*
Popup::Popup()
: Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS | REQUIRES_STYLE_CHANGE_SIGNALS ) ),
- // Main variables:
+ mTouchedOutsideSignal(),
+ mShowingSignal(),
+ mShownSignal(),
+ mHidingSignal(),
+ mHiddenSignal(),
+ mLayer(),
+ mPopupLayout(),
+ mBacking(),
+ mPreviousFocusedActor(),
+ mTailImage(),
+ mPopupContainer(),
+ mAnimation(),
mAlterAddedChild( false ),
mLayoutDirty( true ),
+ mAutoHideTimer(),
mTouchTransparent( false ),
-
- // Property variables:
+ mTitle(),
+ mContent(),
+ mFooter(),
mDisplayState( Toolkit::Popup::HIDDEN ), // Hidden until shown with SetDisplayState()
mTailVisible( false ),
mTailPosition( DEFAULT_TAIL_POSITION ),
mContextualMode( Toolkit::Popup::NON_CONTEXTUAL ),
mAnimationDuration( DEFAULT_POPUP_ANIMATION_DURATION ),
mAnimationMode( Toolkit::Popup::FADE ),
+ mEntryAnimationData(),
+ mExitAnimationData(),
mAutoHideDelay( 0 ),
mBackingEnabled( true ),
mBackingColor( DEFAULT_BACKING_COLOR ),
+ mPopupBackgroundImage(),
+ mBackgroundOuterBorder(),
+ mMargin(),
mTailUpImage( DEFAULT_TAIL_UP_IMAGE_PATH ),
mTailDownImage( DEFAULT_TAIL_DOWN_IMAGE_PATH ),
mTailLeftImage( DEFAULT_TAIL_LEFT_IMAGE_PATH ),
{
if( image.GetLoadingState() == Dali::ResourceLoadingFailed )
{
- Image image = RendererFactory::GetBrokenRendererImage();
+ Image brokenImage = RendererFactory::GetBrokenRendererImage();
if( mImpl->mRenderer )
{
- ApplyImageToSampler( image );
+ ApplyImageToSampler( brokenImage );
}
}
}
if( childMap )
{
Property::Value* policy = childMap->Find( "policy" );
- Property::Value* value = childMap->Find( "value" );
- if( policy && value )
+ Property::Value* childMapValue = childMap->Find( "value" );
+ if( policy && childMapValue )
{
std::string policyValue;
policy->Get( policyValue );
{
if( policy == Toolkit::TableView::FIXED )
{
- (tableViewImpl.*funcFixed)( index, value->Get<float>() );
+ (tableViewImpl.*funcFixed)( index, childMapValue->Get<float>() );
}
else if( policy == Toolkit::TableView::RELATIVE )
{
- (tableViewImpl.*funcRelative)( index, value->Get<float>() );
+ (tableViewImpl.*funcRelative)( index, childMapValue->Get<float>() );
}
else if( policy == Toolkit::TableView::FIT )
{
void FeedbackStyle::StyleChanged( const std::string& userDefinedThemePath, Dali::StyleChange::Type styleChange )
{
- if( StyleChange::THEME_CHANGE )
+ if( styleChange == StyleChange::THEME_CHANGE )
{
string userDefinedTheme;
const char* PLUGIN_FILE = "libdali-script-plugin-v8.so";
}
-Script::Script(void) : mPlugin(NULL)
+Script::Script()
+: mPlugin( NULL )
{
ScriptPluginProxy *plugin = new ScriptPluginProxy( PLUGIN_FILE );
- if( mPlugin )
- {
- DALI_LOG_WARNING("Reloading script plugin %s, is this what you wanted to do?",PLUGIN_FILE);
- delete mPlugin;
- mPlugin = NULL;
- }
-
if( plugin->IsInitialized() )
{
mPlugin = plugin;
{
delete plugin;
}
-
}
bool Script::ExecuteFile( const std::string& filename )