[dali_1.3.0] Merge branch 'devel/master'

Change-Id: I27fa89066cc4c79e784a7a4748b28c84171937c8

[dali_1.3.0] Merge branch 'devel/master'
Change-Id: I27fa89066cc4c79e784a7a4748b28c84171937c8
adam.b
2 parents df990c43 82ffd350
Showing 2 changed files with 5 additions and 1 deletions
examples/image-policies/image-policies-example.cpp
packaging/com.samsung.dali-demo.spec
@@ -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 );
   }
   /**
@@ -2,7 +2,7 @@
 Name:       com.samsung.dali-demo
 Summary:    The OpenGLES Canvas Core Demo
-Version:    1.2.65
+Version:    1.3.0
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0