Peter M. Groen / dali-demo

Commit 449125d267530ca658c721b6305a08907f04cc9f

Authored by Richard Huang
1 parent 76c81225

Replace some Dali::Actor public APIs with new properties 

Change-Id: If580d7fbc1515a87796056d1bd195cc3c18f81b1
Inline Side-by-side
Showing 24 changed files with 50 additions and 50 deletions
examples/bezier-curve/bezier-curve-example.cpp
  View file @449125d
... ... @@ -357,12 +357,12 @@ public:
357 357 mControlPoint1 = CreateControlPoint( parent,
358 358 CIRCLE1_IMAGE,
359 359 CONTROL_POINT1_ORIGIN );
360   - mControlPoint1Id = mControlPoint1.GetId();
  360 + mControlPoint1Id = mControlPoint1.GetProperty< int >( Actor::Property::ID );
361 361  
362 362 mControlPoint2 = CreateControlPoint( parent,
363 363 CIRCLE2_IMAGE,
364 364 CONTROL_POINT2_ORIGIN );
365   - mControlPoint2Id = mControlPoint2.GetId();
  365 + mControlPoint2Id = mControlPoint2.GetProperty< int >( Actor::Property::ID );
366 366  
367 367 Property::Map lineVertexFormat;
368 368 lineVertexFormat["aPosition"] = Property::VECTOR2;
... ...
examples/builder/examples.cpp
  View file @449125d
... ... @@ -283,7 +283,7 @@ public:
283 283  
284 284 mItemView.AddLayout( *mLayout );
285 285  
286   - mItemView.SetKeyboardFocusable( true );
  286 + mItemView.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE, true );
287 287  
288 288 mFiles.clear();
289 289 FileList files;
... ... @@ -546,7 +546,7 @@ public:
546 546 */
547 547 void OnQuitOrBack()
548 548 {
549   - if ( mItemView.OnStage() )
  549 + if ( mItemView.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) )
550 550 {
551 551 mApp.Quit();
552 552 }
... ...
examples/contact-cards/contact-card.cpp
  View file @449125d
... ... @@ -169,7 +169,7 @@ ContactCard::ContactCard(
169 169 mDetailText.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
170 170 mDetailText.SetProperty( Actor::Property::POSITION, Vector2( mContactCardLayoutInfo.textFoldedPosition.x, mContactCardLayoutInfo.textFoldedPosition.y ));
171 171 mDetailText.SetProperty( Actor::Property::SIZE, Vector2( mContactCardLayoutInfo.unfoldedSize.width - mContactCardLayoutInfo.textFoldedPosition.x * 2.0f, 0.0f ) );
172   - mDetailText.SetProperty( DevelActor::Property::OPACITY, 0.0f );
  172 + mDetailText.SetProperty( Actor::Property::OPACITY, 0.0f );
173 173  
174 174 // Attach tap detection to the overall clip control
175 175 mTapDetector = TapGestureDetector::New();
... ...
examples/dissolve-effect/dissolve-effect-example.cpp
  View file @449125d
... ... @@ -305,7 +305,7 @@ void DissolveEffectApp::StartTransition(Vector2 position, Vector2 displacement)
305 305 mCurrentImage.SetProperty( Toolkit::ImageView::Property::IMAGE, mDissolveEffect );
306 306 mAnimation.AnimateTo( Property( mCurrentImage, "uPercentage" ), 1.0f, AlphaFunction::LINEAR );
307 307  
308   - mNextImage.SetProperty( DevelActor::Property::OPACITY,0.0f);
  308 + mNextImage.SetProperty( Actor::Property::OPACITY,0.0f);
309 309 mAnimation.AnimateTo( Property( mNextImage, Actor::Property::COLOR_ALPHA ), 1.0f, AlphaFunction::LINEAR );
310 310  
311 311 if(mUseHighPrecision)
... ...
examples/drag-and-drop/drag-and-drop-example.cpp
  View file @449125d
... ... @@ -132,7 +132,7 @@ public:
132 132 DALI_LOG_INFO(gDragAndDropFilter, Debug::General, "---OnStart---\n");
133 133 DALI_LOG_INFO(gDragAndDropFilter, Debug::General, "---control name is %s---\n", control.GetProperty< std::string >( Dali::Actor::Property::NAME ).c_str());
134 134  
135   - control.SetProperty( DevelActor::Property::OPACITY,0.1f);
  135 + control.SetProperty( Actor::Property::OPACITY,0.1f);
136 136 Vector2 screenPos = detector.GetCurrentScreenPosition();
137 137 control.ScreenToLocal(mDragLocalPos.x, mDragLocalPos.y,screenPos.x, screenPos.y );
138 138 Rect<float> targetRect(screenPos.x, screenPos.y, 0.0f, 0.0f);
... ... @@ -237,7 +237,7 @@ public:
237 237  
238 238 Animation dropAnimation = Animation::New(0.5f);
239 239 dropAnimation.AnimateBetween(Property(mTextLabel[mDragRealIndex], Actor::Property::POSITION), k0, AlphaFunction::EASE_OUT);
240   - dropAnimation.AnimateBetween(Property(mTextLabel[mDragRealIndex], DevelActor::Property::OPACITY), k1, AlphaFunction::EASE_OUT);
  240 + dropAnimation.AnimateBetween(Property(mTextLabel[mDragRealIndex], Actor::Property::OPACITY), k1, AlphaFunction::EASE_OUT);
241 241 dropAnimation.Play();
242 242 }
243 243  
... ... @@ -254,7 +254,7 @@ public:
254 254 DALI_LOG_INFO(gDragAndDropFilter, Debug::General, "---OnEnd---\n");
255 255 DALI_LOG_INFO(gDragAndDropFilter, Debug::General, "---control name is %s---\n", control.GetProperty< std::string >( Dali::Actor::Property::NAME ).c_str());
256 256  
257   - control.SetProperty( DevelActor::Property::OPACITY,1.0f);
  257 + control.SetProperty( Actor::Property::OPACITY,1.0f);
258 258 }
259 259  
260 260 private:
... ...
examples/focus-integration/focus-integration.cpp
  View file @449125d
... ... @@ -66,7 +66,7 @@ public:
66 66 contentTable.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
67 67 contentTable.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
68 68 contentTable.SetCellPadding(Size(MARGIN_SIZE, MARGIN_SIZE * 0.5f));
69   - contentTable.SetKeyboardFocusable(true);
  69 + contentTable.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE,true);
70 70  
71 71 for( unsigned int i = 0; i < contentTable.GetRows(); ++i )
72 72 {
... ... @@ -93,7 +93,7 @@ public:
93 93 mContainer.SetRelativeHeight( 1, 0.3f);
94 94 mContainer.SetRelativeHeight( 2, 0.2f);
95 95 mContainer.SetRelativeHeight( 3, 0.3f);
96   - mContainer.SetKeyboardFocusable(true);
  96 + mContainer.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE,true);
97 97 contentTable.Add( mContainer );
98 98  
99 99 // Make name label for each controls
... ... @@ -134,7 +134,7 @@ public:
134 134 for(int i = 0; i<6; i++)
135 135 {
136 136 Control control = Control::DownCast( mContainer.GetChildAt( TableView::CellPosition( (i/3)*2+1, i%3 ) ) );
137   - control.SetKeyboardFocusable(true);
  137 + control.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE,true);
138 138 control.SetProperty( Dali::Actor::Property::NAME,ITEMNAME[i]);
139 139 control.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
140 140 control.KeyEventSignal().Connect( this, &FocusIntegrationExample::OnControlKeyEvent );
... ...
examples/frame-callback/frame-callback-example.cpp
  View file @449125d
... ... @@ -113,7 +113,7 @@ private:
113 113  
114 114 // Add the ID of the created ImageView to mFrameCallback.
115 115 // Again, can call methods in mFrameCallback directly as we have not set it on the stage yet.
116   - mFrameCallback.AddId( imageView.GetId() );
  116 + mFrameCallback.AddId( imageView.GetProperty< int >( Actor::Property::ID ) );
117 117  
118 118 mStage.Add( imageView );
119 119  
... ...
examples/gestures/gesture-example.cpp
  View file @449125d
... ... @@ -89,7 +89,7 @@ void AddHelpInfo( const std::string&amp;&amp; string, Actor parent, Animation animation,
89 89 text.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_CENTER );
90 90 text.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_CENTER );
91 91 text.SetProperty( Actor::Property::POSITION, position );
92   - text.SetProperty( DevelActor::Property::OPACITY, 0.0f );
  92 + text.SetProperty( Actor::Property::OPACITY, 0.0f );
93 93 text.SetProperty( TextLabel::Property::HORIZONTAL_ALIGNMENT, Text::HorizontalAlignment::CENTER );
94 94 text.SetProperty( TextLabel::Property::MULTI_LINE, true );
95 95 parent.Add( text );
... ...
examples/homescreen-benchmark/homescreen-benchmark.cpp
  View file @449125d
... ... @@ -389,7 +389,7 @@ public:
389 389 mScrollParent.Add( page );
390 390 }
391 391  
392   - mScrollParent.SetProperty( DevelActor::Property::OPACITY, 1.0f );
  392 + mScrollParent.SetProperty( Actor::Property::OPACITY, 1.0f );
393 393 mScrollParent.SetProperty( Actor::Property::SCALE, Vector3::ONE );
394 394  
395 395 // Fade in.
... ...
examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
  View file @449125d
... ... @@ -224,7 +224,7 @@ public:
224 224 mGrabCorner.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_RIGHT );
225 225 mGrabCorner.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_RIGHT );
226 226 mGrabCorner.SetProperty( Actor::Property::POSITION, Vector2( -BORDER_WIDTH, -BORDER_WIDTH ));
227   - mGrabCorner.SetProperty( DevelActor::Property::OPACITY, 0.6f );
  227 + mGrabCorner.SetProperty( Actor::Property::OPACITY, 0.6f );
228 228  
229 229 Layer grabCornerLayer = Layer::New();
230 230 grabCornerLayer.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_RIGHT );
... ... @@ -267,7 +267,7 @@ public:
267 267 imagePrevious.RotateBy( Radian(3.14159265358979323846f), Vector3( 0, 1.0f, 0 ) );
268 268 imagePrevious.SetProperty( Actor::Property::POSITION_Y, playWidth * 0.5f );
269 269 imagePrevious.SetProperty( Actor::Property::POSITION_X, playWidth + playWidth * 0.5f );
270   - imagePrevious.SetProperty( DevelActor::Property::OPACITY, 0.6f );
  270 + imagePrevious.SetProperty( Actor::Property::OPACITY, 0.6f );
271 271 controlsLayer.Add( imagePrevious );
272 272 imagePrevious.SetProperty( Dali::Actor::Property::NAME, PREVIOUS_BUTTON_ID );
273 273 imagePrevious.TouchSignal().Connect( this, &ImageScalingAndFilteringController::OnControlTouched );
... ... @@ -277,7 +277,7 @@ public:
277 277 imageNext.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_RIGHT );
278 278 imageNext.SetProperty( Actor::Property::POSITION_Y, playWidth * 0.5f );
279 279 imageNext.SetProperty( Actor::Property::POSITION_X, stage.GetSize().x - playWidth * 0.5f );
280   - imageNext.SetProperty( DevelActor::Property::OPACITY, 0.6f );
  280 + imageNext.SetProperty( Actor::Property::OPACITY, 0.6f );
281 281 controlsLayer.Add( imageNext );
282 282 imageNext.SetProperty( Dali::Actor::Property::NAME, NEXT_BUTTON_ID );
283 283 imageNext.TouchSignal().Connect( this, &ImageScalingAndFilteringController::OnControlTouched );
... ...
examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp
  View file @449125d
... ... @@ -477,9 +477,9 @@ public:
477 477 image.SetProperty( Actor::Property::SIZE, imageSize );
478 478 image.TouchSignal().Connect( this, &ImageScalingIrregularGridController::OnTouchImage );
479 479 image.ResourceReadySignal().Connect( this, &ImageScalingIrregularGridController::ResourceReadySignal );
480   - mFittingModes[image.GetId()] = fittingMode;
481   - mResourceUrls[image.GetId()] = imageSource.configuration.path;
482   - mSizes[image.GetId()] = imageSize;
  480 + mFittingModes[image.GetProperty< int >( Actor::Property::ID )] = fittingMode;
  481 + mResourceUrls[image.GetProperty< int >( Actor::Property::ID )] = imageSource.configuration.path;
  482 + mSizes[image.GetProperty< int >( Actor::Property::ID )] = imageSize;
483 483 if ( count < INITIAL_IMAGES_TO_LOAD )
484 484 {
485 485 gridActor.Add( image );
... ... @@ -512,9 +512,9 @@ public:
512 512 animation.Play();
513 513  
514 514 // Change the scaling mode:
515   - const unsigned id = actor.GetId();
  515 + const unsigned id = actor.GetProperty< int >( Actor::Property::ID );
516 516 Dali::FittingMode::Type newMode = NextMode( mFittingModes[id] );
517   - const Vector2 imageSize = mSizes[actor.GetId()];
  517 + const Vector2 imageSize = mSizes[actor.GetProperty< int >( Actor::Property::ID )];
518 518  
519 519 ImageView imageView = ImageView::DownCast( actor );
520 520 if( imageView)
... ... @@ -565,7 +565,7 @@ public:
565 565 if( gridImageView )
566 566 {
567 567 // Cycle the scaling mode options:
568   - unsigned int id = gridImageView.GetId();
  568 + unsigned int id = gridImageView.GetProperty< int >( Actor::Property::ID );
569 569  
570 570 const Vector2 imageSize = mSizes[ id ];
571 571 Dali::FittingMode::Type newMode = NextMode( mFittingModes[ id ] );
... ...
examples/image-view/image-view-example.cpp
  View file @449125d
... ... @@ -216,7 +216,7 @@ private:
216 216 {
217 217 unsigned int buttonIndex = GetButtonIndex( button );
218 218  
219   - if( mImageViews[buttonIndex].OnStage() )
  219 + if( mImageViews[buttonIndex].GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) )
220 220 {
221 221 ++mImageViewImageIndexStatus[buttonIndex];
222 222  
... ... @@ -240,7 +240,7 @@ private:
240 240 {
241 241 unsigned int buttonIndex = GetButtonIndex( button );
242 242  
243   - if( mImageViews[buttonIndex].OnStage() )
  243 + if( mImageViews[buttonIndex].GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) )
244 244 {
245 245 mImageViewRoundedCornerStatus[ buttonIndex ] = !mImageViewRoundedCornerStatus[ buttonIndex ];
246 246  
... ...
examples/item-view/item-view-example.cpp
  View file @449125d
... ... @@ -297,7 +297,7 @@ public:
297 297  
298 298 // Activate the spiral layout
299 299 SetLayout( mCurrentLayout );
300   - mItemView.SetKeyboardFocusable( true );
  300 + mItemView.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE, true );
301 301 KeyboardFocusManager::Get().PreFocusChangeSignal().Connect( this, &ItemViewExample::OnKeyboardPreFocusChange );
302 302  
303 303 // Set the title and icon to the current layout
... ... @@ -892,7 +892,7 @@ public: // From ItemFactory
892 892  
893 893 actor.Add(borderActor);
894 894  
895   - actor.SetKeyboardFocusable( true );
  895 + actor.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE, true );
896 896  
897 897 Vector3 spiralItemSize;
898 898 static_cast<ItemLayout&>(*mSpiralLayout).GetItemSize( 0u, Vector3( Stage::GetCurrent().GetSize() ), spiralItemSize );
... ...
examples/pivot/pivot-example.cpp
  View file @449125d
... ... @@ -96,7 +96,7 @@ private:
96 96 Control control = Control::New();
97 97 control.SetBackgroundColor( Vector4( Random::Range( 0.0f, 1.0f ), Random::Range( 0.0f, 1.0f ), Random::Range( 0.0f, 1.0f ), 1.0f ) );
98 98 control.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
99   - control.SetProperty( DevelActor::Property::POSITION_USES_ANCHOR_POINT, false ); // Ensures the position always uses top-left for its calculations.
  99 + control.SetProperty( Actor::Property::POSITION_USES_ANCHOR_POINT, false ); // Ensures the position always uses top-left for its calculations.
100 100 control.SetProperty( Actor::Property::ANCHOR_POINT, anchorPoint ); // This anchor-point is used for the rotation and the scale.
101 101  
102 102 // Add to the table-view
... ...
examples/property-notification/property-notification-example.cpp
  View file @449125d
... ... @@ -106,7 +106,7 @@ public:
106 106 void RedComponentNotification( PropertyNotification& /* source */ )
107 107 {
108 108 Animation animation = Animation::New( OPACITY_ANIMATION_DURATION );
109   - animation.AnimateTo( Property( mTextLabel, DevelActor::Property::OPACITY ), 0.0f );
  109 + animation.AnimateTo( Property( mTextLabel, Actor::Property::OPACITY ), 0.0f );
110 110 animation.Play();
111 111 }
112 112  
... ...
examples/remote-image-loading/remote-image-loading-example.cpp
  View file @449125d
... ... @@ -47,7 +47,7 @@ public:
47 47 {
48 48 control.TouchSignal().Connect(this, &MyTester::OnControlTouch);
49 49  
50   - control.SetKeyboardFocusable(true);
  50 + control.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE,true);
51 51 control.KeyEventSignal().Connect(this, &MyTester::OnControlKeyEvent);
52 52 control.KeyInputFocusGainedSignal().Connect(this, &MyTester::OnFocusSet);
53 53 control.KeyInputFocusLostSignal().Connect(this, &MyTester::OnFocusUnSet);
... ... @@ -75,7 +75,7 @@ public:
75 75 mImageView1.SetProperty( Dali::Actor::Property::NAME,"mImageView1");
76 76 mImageView1.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
77 77 mImageView1.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_CENTER);
78   - mImageView1.SetProperty(DevelActor::Property::POSITION_USES_ANCHOR_POINT, false);
  78 + mImageView1.SetProperty(Actor::Property::POSITION_USES_ANCHOR_POINT, false);
79 79 mImageView1.SetProperty( Actor::Property::POSITION, Vector2(0, 100));
80 80 mImageView1.SetBackgroundColor(Vector4(0.0f, 0.0f, 0.0f, 0.0f));
81 81 stage.Add(mImageView1);
... ... @@ -84,7 +84,7 @@ public:
84 84 mImageView2.SetProperty( Dali::Actor::Property::NAME,"mImageView2");
85 85 mImageView2.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
86 86 mImageView2.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_CENTER);
87   - mImageView2.SetProperty(DevelActor::Property::POSITION_USES_ANCHOR_POINT, false);
  87 + mImageView2.SetProperty(Actor::Property::POSITION_USES_ANCHOR_POINT, false);
88 88 mImageView2.SetProperty( Actor::Property::POSITION, Vector2(400, 100));
89 89 mImageView2.SetBackgroundColor(Vector4(0.0f, 0.0f, 0.0f, 0.0f));
90 90 stage.Add(mImageView2);
... ... @@ -93,7 +93,7 @@ public:
93 93 mImageView3.SetProperty( Dali::Actor::Property::NAME,"mImageView3");
94 94 mImageView3.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
95 95 mImageView3.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_CENTER);
96   - mImageView3.SetProperty(DevelActor::Property::POSITION_USES_ANCHOR_POINT, false);
  96 + mImageView3.SetProperty(Actor::Property::POSITION_USES_ANCHOR_POINT, false);
97 97 mImageView3.SetProperty( Actor::Property::POSITION, Vector2(0, 400));
98 98 mImageView3.SetBackgroundColor(Vector4(0.0f, 0.0f, 0.0f, 0.0f));
99 99 stage.Add(mImageView3);
... ... @@ -102,7 +102,7 @@ public:
102 102 mImageView4.SetProperty( Dali::Actor::Property::NAME,"mImageView4");
103 103 mImageView4.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
104 104 mImageView4.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_CENTER);
105   - mImageView4.SetProperty(DevelActor::Property::POSITION_USES_ANCHOR_POINT, false);
  105 + mImageView4.SetProperty(Actor::Property::POSITION_USES_ANCHOR_POINT, false);
106 106 mImageView4.SetProperty( Actor::Property::POSITION, Vector2(400, 400));
107 107 mImageView4.SetBackgroundColor(Vector4(0.0f, 0.0f, 0.0f, 0.0f));
108 108 stage.Add(mImageView4);
... ... @@ -111,7 +111,7 @@ public:
111 111 mImageView5.SetProperty( Dali::Actor::Property::NAME,"mImageView5");
112 112 mImageView4.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
113 113 mImageView5.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_CENTER);
114   - mImageView5.SetProperty(DevelActor::Property::POSITION_USES_ANCHOR_POINT, false);
  114 + mImageView5.SetProperty(Actor::Property::POSITION_USES_ANCHOR_POINT, false);
115 115 mImageView5.SetProperty( Actor::Property::POSITION, Vector2(800, 100));
116 116 mImageView5.SetBackgroundColor(Vector4(0.0f, 0.0f, 0.0f, 0.0f));
117 117 stage.Add(mImageView5);
... ...
examples/simple-visuals-control/my-control-impl.cpp
  View file @449125d
... ... @@ -77,7 +77,7 @@ Demo::MyControl Internal::MyControl::New()
77 77 void MyControl::OnInitialize()
78 78 {
79 79 Dali::Actor self = Self();
80   - self.SetKeyboardFocusable( true );
  80 + self.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE, true );
81 81 }
82 82  
83 83 void MyControl::SetProperty( BaseObject* object, Property::Index index, const Property::Value& value )
... ...
examples/styling/styling-application.cpp
  View file @449125d
... ... @@ -380,7 +380,7 @@ Actor StylingApplication::CreateResizableContentPane()
380 380 grabHandle.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_RIGHT );
381 381 grabHandle.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_RIGHT );
382 382 grabHandle.SetProperty( Actor::Property::POSITION, Vector2( -BORDER_WIDTH, -BORDER_WIDTH ));
383   - grabHandle.SetProperty( DevelActor::Property::OPACITY, 0.6f );
  383 + grabHandle.SetProperty( Actor::Property::OPACITY, 0.6f );
384 384  
385 385 Layer grabCornerLayer = Layer::New();
386 386 grabCornerLayer.SetProperty( Dali::Actor::Property::NAME,"GrabCornerLayer");
... ...
examples/text-label/text-label-example.cpp
  View file @449125d
... ... @@ -471,7 +471,7 @@ public:
471 471 // Use a white button with 50% transparency as a clear color button
472 472 if ( Color::WHITE == AVAILABLE_COLORS[ index ] && styleButtonIndex != StyleType::TEXT_COLOR )
473 473 {
474   - mColorButtons[index].SetProperty( DevelActor::Property::OPACITY,0.5f);
  474 + mColorButtons[index].SetProperty( Actor::Property::OPACITY,0.5f);
475 475  
476 476 mColorButtons[index].SetProperty( Toolkit::Button::Property::LABEL,
477 477 Property::Map().Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT )
... ...
examples/text-memory-profiling/text-memory-profiling-example.cpp
  View file @449125d
... ... @@ -389,7 +389,7 @@ public:
389 389 */
390 390 void ReturnToPreviousScreen()
391 391 {
392   - if ( mItemView.OnStage() )
  392 + if ( mItemView.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) )
393 393 {
394 394 // Quit the application if it is in the main menu
395 395 mApplication.Quit();
... ...
examples/text-overlap/text-overlap-example.cpp
  View file @449125d
... ... @@ -36,8 +36,8 @@ void TextOverlapController::Create( Application&amp; app )
36 36 mLabels[0].SetProperty( Dali::Actor::Property::NAME,"Label1");
37 37 mLabels[1].SetProperty( Dali::Actor::Property::NAME,"Label2");
38 38  
39   - mLabels[0].SetProperty( DevelActor::Property::SIBLING_ORDER, 1 );
40   - mLabels[1].SetProperty( DevelActor::Property::SIBLING_ORDER, 2 );
  39 + mLabels[0].SetProperty( Dali::DevelActor::Property::SIBLING_ORDER, 1 );
  40 + mLabels[1].SetProperty( Dali::DevelActor::Property::SIBLING_ORDER, 2 );
41 41  
42 42 mLabels[0].SetProperty( Control::Property::BACKGROUND, Color::RED );
43 43 mLabels[1].SetProperty( Control::Property::BACKGROUND, Color::YELLOW );
... ...
examples/transitions/shadow-button-impl.cpp
  View file @449125d
... ... @@ -123,7 +123,7 @@ void ShadowButton::SetCheckState( bool checkState )
123 123 {
124 124 mCheckState = checkState;
125 125 DevelControl::EnableVisual( *this, Demo::ShadowButton::Property::CHECKBOX_FG_VISUAL, true );
126   - if( Self().OnStage() )
  126 + if( Self().GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) )
127 127 {
128 128 if( checkState )
129 129 {
... ...
examples/video-view/video-view-example.cpp
  View file @449125d
... ... @@ -173,7 +173,7 @@ class VideoViewController: public ConnectionTracker
173 173  
174 174 bool OnButtonClicked( Button button )
175 175 {
176   - if( mPauseButton.GetId() == button.GetId())
  176 + if( mPauseButton.GetProperty< int >( Actor::Property::ID ) == button.GetProperty< int >( Actor::Property::ID ))
177 177 {
178 178 if( mIsPlay )
179 179 {
... ... @@ -186,7 +186,7 @@ class VideoViewController: public ConnectionTracker
186 186 mVideoView.Pause();
187 187 }
188 188 }
189   - else if( mPlayButton.GetId() == button.GetId())
  189 + else if( mPlayButton.GetProperty< int >( Actor::Property::ID ) == button.GetProperty< int >( Actor::Property::ID ))
190 190 {
191 191 mPauseButton.SetProperty( Actor::Property::VISIBLE, true );
192 192 mPauseButton.SetProperty( Button::Property::DISABLED, false );
... ... @@ -196,7 +196,7 @@ class VideoViewController: public ConnectionTracker
196 196 mIsPlay = true;
197 197 mVideoView.Play();
198 198 }
199   - else if( mChangeButton.GetId() == button.GetId())
  199 + else if( mChangeButton.GetProperty< int >( Actor::Property::ID ) == button.GetProperty< int >( Actor::Property::ID ))
200 200 {
201 201 bool underlay = false;
202 202 underlay = mVideoView.GetProperty( Toolkit::VideoView::Property::UNDERLAY ).Get< bool >();
... ... @@ -209,11 +209,11 @@ class VideoViewController: public ConnectionTracker
209 209 mVideoView.SetProperty( Toolkit::VideoView::Property::UNDERLAY, true );
210 210 }
211 211 }
212   - else if( mBackwardButton.GetId() == button.GetId())
  212 + else if( mBackwardButton.GetProperty< int >( Actor::Property::ID ) == button.GetProperty< int >( Actor::Property::ID ))
213 213 {
214 214 mVideoView.Backward( SEEK_POS );
215 215 }
216   - else if( mForwardButton.GetId() == button.GetId())
  216 + else if( mForwardButton.GetProperty< int >( Actor::Property::ID ) == button.GetProperty< int >( Actor::Property::ID ))
217 217 {
218 218 mVideoView.Forward( SEEK_POS );
219 219 }
... ...
shared/dali-table-view.cpp
  View file @449125d
... ... @@ -512,7 +512,7 @@ Actor DaliTableView::CreateTile( const std::string&amp; name, const std::string&amp; tit
512 512 focusableTile.SetProperty( Actor::Property::NAME, name );
513 513  
514 514 // Set the tile to be keyboard focusable
515   - focusableTile.SetKeyboardFocusable( true );
  515 + focusableTile.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE, true );
516 516  
517 517 // Register a property with the ImageView. This allows us to inject the scroll-view position into the shader.
518 518 Property::Value value = Vector3( 0.0f, 0.0f, 0.0f );
... ... @@ -532,7 +532,7 @@ Actor DaliTableView::CreateTile( const std::string&amp; name, const std::string&amp; tit
532 532 borderImage.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
533 533 borderImage.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
534 534 borderImage.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
535   - borderImage.SetProperty( DevelActor::Property::OPACITY, 0.8f );
  535 + borderImage.SetProperty( Actor::Property::OPACITY, 0.8f );
536 536 focusableTile.Add( borderImage );
537 537  
538 538 TextLabel label = TextLabel::New();
... ...