summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Steele <david.steele@samsung.com>2020-08-24 14:34:46 +0100
committerAdeel Kazmi <adeel.kazmi@samsung.com>2020-08-24 18:24:03 +0000
commit3f7382d5b648974e4d3f9f6db2f3ce14fb01885b (patch)
treea2691ac2c4a8cbd25bc57beb5ac7980862df8331
parentb07c88848d54198a62f0885135a35c1ff5dd9bad (diff)
downloaddali-demo-3f7382d5b648974e4d3f9f6db2f3ce14fb01885b.tar.gz
dali-demo-3f7382d5b648974e4d3f9f6db2f3ce14fb01885b.tar.bz2
dali-demo-3f7382d5b648974e4d3f9f6db2f3ce14fb01885b.zip
Updating following publication of DevelHandle APIs
Change-Id: I43bc36e1e4a55f8465f9bb9fbea1d58f54e616da
-rw-r--r--examples/text-label/text-label-example.cpp2
-rw-r--r--examples/visual-fitting-mode/visual-fitting-mode-example.cpp14
2 files changed, 8 insertions, 8 deletions
diff --git a/examples/text-label/text-label-example.cpp b/examples/text-label/text-label-example.cpp
index 9f3088af..a19531b9 100644
--- a/examples/text-label/text-label-example.cpp
+++ b/examples/text-label/text-label-example.cpp
@@ -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 ) );
diff --git a/examples/visual-fitting-mode/visual-fitting-mode-example.cpp b/examples/visual-fitting-mode/visual-fitting-mode-example.cpp
index 817f306b..5f55145f 100644
--- a/examples/visual-fitting-mode/visual-fitting-mode-example.cpp
+++ b/examples/visual-fitting-mode/visual-fitting-mode-example.cpp
@@ -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