TOOLBAR_IMAGE,
"" );
- mEffectIcon[ PageCarouselEffect ] = ResourceImage::New( EFFECT_CAROUSEL_IMAGE );
- mEffectIconSelected[ PageCarouselEffect ] = ResourceImage::New( EFFECT_CAROUSEL_IMAGE_SELECTED );
- mEffectIcon[ PageCubeEffect ] = ResourceImage::New( EFFECT_CAROUSEL_IMAGE );
- mEffectIconSelected[ PageCubeEffect ] = ResourceImage::New( EFFECT_CAROUSEL_IMAGE_SELECTED );
- mEffectIcon[ PageSpiralEffect ] = ResourceImage::New( EFFECT_CAROUSEL_IMAGE );
- mEffectIconSelected[ PageSpiralEffect ] = ResourceImage::New( EFFECT_CAROUSEL_IMAGE_SELECTED );
- mEffectIcon[ PageWaveEffect ] = ResourceImage::New( EFFECT_CAROUSEL_IMAGE );
- mEffectIconSelected[ PageWaveEffect ] = ResourceImage::New( EFFECT_CAROUSEL_IMAGE_SELECTED );
+ mEffectIcon[ PageCarouselEffect ] = EFFECT_CAROUSEL_IMAGE;
+ mEffectIconSelected[ PageCarouselEffect ] = EFFECT_CAROUSEL_IMAGE_SELECTED;
+ mEffectIcon[ PageCubeEffect ] = EFFECT_CAROUSEL_IMAGE;
+ mEffectIconSelected[ PageCubeEffect ] = EFFECT_CAROUSEL_IMAGE_SELECTED;
+ mEffectIcon[ PageSpiralEffect ] = EFFECT_CAROUSEL_IMAGE;
+ mEffectIconSelected[ PageSpiralEffect ] = EFFECT_CAROUSEL_IMAGE_SELECTED;
+ mEffectIcon[ PageWaveEffect ] = EFFECT_CAROUSEL_IMAGE;
+ mEffectIconSelected[ PageWaveEffect ] = EFFECT_CAROUSEL_IMAGE_SELECTED;
// Create a effect change button. (right of toolbar)
mEffectChangeButton = Toolkit::PushButton::New();
ss << APPLICATION_TITLE << ": " << EFFECT_MODE_NAME[mEffectMode];
SetTitle(ss.str());
- mEffectChangeButton.SetButtonImage( mEffectIcon[ mEffectMode ] );
+ mEffectChangeButton.SetUnselectedImage( mEffectIcon[ mEffectMode ] );
mEffectChangeButton.SetSelectedImage( mEffectIconSelected[ mEffectMode ] );
// remove old Effect if exists.
*/
void ApplyEffectToScrollView()
{
- bool wrap(true);
bool snap(true);
Stage stage = Stage::GetCurrent();
RulerPtr rulerX = CreateRuler(snap ? stageSize.width : 0.0f);
RulerPtr rulerY = new DefaultRuler;
- rulerX->SetDomain(RulerDomain(0.0f, stageSize.x * PAGE_COLUMNS, !wrap));
+ rulerX->SetDomain(RulerDomain(0.0f, stageSize.x * PAGE_COLUMNS, false));
rulerY->Disable();
Dali::Path path = Dali::Path::New();
mScrollView.RemoveConstraintsFromChildren();
rulerX = CreateRuler(snap ? stageSize.width * 0.5f : 0.0f);
- if( wrap )
- {
- rulerX->SetDomain(RulerDomain(0.0f, stageSize.x * 0.5f * PAGE_COLUMNS, !wrap));
- }
- else
- {
- rulerX->SetDomain(RulerDomain(0.0f, stageSize.x*0.5f* (PAGE_COLUMNS+1), !wrap));
- }
+ rulerX->SetDomain( RulerDomain( 0.0f, stageSize.x * 0.5f * PAGE_COLUMNS, false ) );
unsigned int currentPage = mScrollView.GetCurrentPage();
if( mScrollViewEffect )
mScrollView.ApplyEffect(mScrollViewEffect);
}
- mScrollView.SetWrapMode(wrap);
+ mScrollView.SetWrapMode( true );
mScrollView.SetRulerX( rulerX );
mScrollView.SetRulerY( rulerY );
EffectMode mEffectMode; ///< Current Effect mode
- Image mEffectIcon[Total]; ///< Icons for the effect button
- Image mEffectIconSelected[Total]; ///< Icons for the effect button when its selected
+ std::string mEffectIcon[Total]; ///< Icons for the effect button
+ std::string mEffectIconSelected[Total]; ///< Icons for the effect button when its selected
Toolkit::PushButton mEffectChangeButton; ///< Effect Change Button
};