summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdeel Kazmi <adeel.kazmi@samsung.com>2017-11-10 17:03:09 +0000
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>2017-11-10 17:03:09 +0000
commit54da7c68bf1bebe9fcd10671387fa9b041f2e874 (patch)
tree8cac8940f11ee791689e4bdbda3fb167f5757adf
parent18feedecd0f60aa1a42a4c9f695181e266bc2d37 (diff)
parent93656d7eceb0a8ebe4136432785c534783f5efbc (diff)
downloaddali-demo-54da7c68bf1bebe9fcd10671387fa9b041f2e874.tar.gz
dali-demo-54da7c68bf1bebe9fcd10671387fa9b041f2e874.tar.bz2
dali-demo-54da7c68bf1bebe9fcd10671387fa9b041f2e874.zip
Merge "LoadPolicy::Immediate Waits for ResourceReady Signal" into devel/master
-rw-r--r--examples/image-policies/image-policies-example.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/examples/image-policies/image-policies-example.cpp b/examples/image-policies/image-policies-example.cpp
index 7f7acc84..a630742d 100644
--- a/examples/image-policies/image-policies-example.cpp
+++ b/examples/image-policies/image-policies-example.cpp
@@ -98,6 +98,7 @@ class ImagePolicies: public ConnectionTracker
* param[in] releasePolicy Which ReleasePolicy to use
* param[in] synchronousLoading If the Image should be loaded synchronously
* param[in] imageFilenameId Which image to load, referring to the array of filenames for this example.
+ * return An ImageView with the required set up
*/
ImageView CreateImageView( bool correctionEnabled, DevelImageVisual::LoadPolicy::Type loadPolicy, DevelImageVisual::ReleasePolicy::Type releasePolicy, bool synchronousLoading, unsigned int imageFilenameId )
{
@@ -121,6 +122,7 @@ class ImagePolicies: public ConnectionTracker
return imageView;
}
+
/**
* To prevent the next button being pressed before an Image has loaded the Button can br disabled.
* This function will disable the next button.
@@ -185,7 +187,9 @@ class ImagePolicies: public ConnectionTracker
dualImageViewTable.AddChild( immediate, TableView::CellPosition( 0, 1 ) );
mTable.AddChild( dualImageViewTable, TableView::CellPosition( TableRowPlacement::IMAGE, 0 ) );
+ DisableButtonWhilstLoading();
mPersistantImageView = CreateImageView( true, DevelImageVisual::LoadPolicy::IMMEDIATE, DevelImageVisual::ReleasePolicy::DESTROYED, false, 4 );
+ mPersistantImageView.ResourceReadySignal().Connect( this, &ImagePolicies::ResourceReadySignal );
}
/**