Updating following publication of DevelHandle APIs 53/242153/3
authorDavid Steele <david.steele@samsung.com>
Mon, 24 Aug 2020 13:34:46 +0000 (14:34 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Mon, 24 Aug 2020 18:24:03 +0000 (18:24 +0000)
Change-Id: I43bc36e1e4a55f8465f9bb9fbea1d58f54e616da

examples/text-label/text-label-example.cpp
examples/visual-fitting-mode/visual-fitting-mode-example.cpp

index 9f3088a..a19531b 100644 (file)
@@ -260,7 +260,7 @@ public:
 
     mHueAngleIndex = mLabel.RegisterProperty( "hue", 0.0f );
     Renderer bgRenderer = mLabel.GetRendererAt(0);
-    mOverrideMixColorIndex = DevelHandle::GetPropertyIndex( bgRenderer, ColorVisual::Property::MIX_COLOR );
+    mOverrideMixColorIndex = bgRenderer.GetPropertyIndex( ColorVisual::Property::MIX_COLOR );
 
     Constraint constraint = Constraint::New<Vector3>( bgRenderer, mOverrideMixColorIndex, HSVColorConstraint(0.0f, 0.5f, 0.8f));
     constraint.AddSource( Source( mLabel, mHueAngleIndex ) );
index 817f306..5f55145 100644 (file)
@@ -121,7 +121,7 @@ private:
     window.SetBackgroundColor( Color::WHITE );
 
     // Text Label filling the entire screen, with a background
-    mTextLabel = DevelHandle::New< TextLabel >( TEXT_LABEL_PROPERTIES );
+    mTextLabel = Handle::New< TextLabel >( TEXT_LABEL_PROPERTIES );
     window.Add( mTextLabel );
 
     // We want to change the padding when tapping
@@ -131,11 +131,11 @@ private:
 
     // Create an ImageView with the default behaviour, i.e. image fills to control size
     mFillImage = ImageView::New( IMAGE_NAME );
-    DevelHandle::SetProperties( mFillImage, FILL_IMAGE_PROPERTIES );
+    mFillImage.SetProperties( FILL_IMAGE_PROPERTIES );
     window.Add( mFillImage );
 
     // Create an ImageView that Keeps the aspect ratio while fitting within the given size
-    mFitKeepAspectRatioImage = DevelHandle::New< ImageView >( FIT_KEEP_ASPECT_RATIO_IMAGE_BASIC_PROPERTIES );
+    mFitKeepAspectRatioImage = Handle::New< ImageView >( FIT_KEEP_ASPECT_RATIO_IMAGE_BASIC_PROPERTIES );
     mFitKeepAspectRatioImage.SetProperty( ImageView::Property::IMAGE,
                                           Property::Map
                                           {
@@ -147,14 +147,14 @@ private:
 
     // Create an overlay label for fill image
     Actor fillLabel = TextLabel::New( FILL_LABEL );
-    DevelHandle::SetProperties( fillLabel, FILL_IMAGE_PROPERTIES );
-    DevelHandle::SetProperties( fillLabel, OVERLAY_LABEL_PROPERTIES );
+    fillLabel.SetProperties( FILL_IMAGE_PROPERTIES );
+    fillLabel.SetProperties( OVERLAY_LABEL_PROPERTIES );
     window.Add( fillLabel );
 
     // Create an overlay label for the Fit/Keep Aspect image
     Actor fitLabel = TextLabel::New( FIT_KEEP_ASPECT_LABEL );
-    DevelHandle::SetProperties( fitLabel, FIT_KEEP_ASPECT_RATIO_IMAGE_BASIC_PROPERTIES );
-    DevelHandle::SetProperties( fitLabel, OVERLAY_LABEL_PROPERTIES );
+    fitLabel.SetProperties( FIT_KEEP_ASPECT_RATIO_IMAGE_BASIC_PROPERTIES );
+    fitLabel.SetProperties( OVERLAY_LABEL_PROPERTIES );
     window.Add( fitLabel );
 
     // Respond to key events, exit if ESC/Back, change the padding if anything else