From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Tue, 11 Oct 2016 18:53:09 +0000 (-0700)
Subject: Merge "Changed control defaults to listen to style change" into devel/master
X-Git-Tag: dali_1.2.10~9
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=a3ab994876ea86236784101dd85370815c336e8b;hp=84e05cec3039abe8ecaaa950d4f93dd4f94282fe

Merge "Changed control defaults to listen to style change" into devel/master
---

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-AsyncImageLoader.cpp b/automated-tests/src/dali-toolkit/utc-Dali-AsyncImageLoader.cpp
index e85d90f..21603f3 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-AsyncImageLoader.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-AsyncImageLoader.cpp
@@ -215,27 +215,25 @@ int UtcDaliAsyncImageLoaderCancelAll(void)
 
   loader.ImageLoadedSignal().Connect( &loadedSignalVerifier, &ImageLoadedSignalVerifier::ImageLoaded );
 
-  uint32_t id01 = loader.Load( gImage_34_RGBA, ImageDimensions( 34, 34 ) );
+  loader.Load( gImage_34_RGBA, ImageDimensions( 34, 34 ) );
   uint32_t id02 = loader.Load( gImage_50_RGBA, ImageDimensions( 25, 25 ) );
 
-  // cancel the loading of the first and second image
+  // try to cancel the loading of the first and second image, however the cancellation of the first image is not guaranteed
   loader.CancelAll();
 
   uint32_t id03 = loader.Load( gImage_128_RGB, ImageDimensions( 100, 100 ), FittingMode::SCALE_TO_FILL, SamplingMode::BOX_THEN_LINEAR, true );
+  loader.Load( gImage_128_RGB, ImageDimensions( 128, 128 ), FittingMode::SCALE_TO_FILL, SamplingMode::BOX_THEN_LINEAR, true );
 
   EventThreadCallback* eventTrigger = EventThreadCallback::Get();
   CallbackBase* callback = eventTrigger->GetCallback();
 
-  eventTrigger->WaitingForTrigger( 1 );// waiting until the third images is loaded
+  eventTrigger->WaitingForTrigger( 2 );// waiting until the third images is loaded
 
   CallbackBase::Execute( *callback );
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_CHECK( loadedSignalVerifier.LoadedImageCount() == 1 );
-
-  DALI_TEST_CHECK( !loadedSignalVerifier.Verify( id01, 34, 34 ) );  // first image is not loaded
   DALI_TEST_CHECK( !loadedSignalVerifier.Verify( id02, 25, 25 ) ); // second image is not loaded
   DALI_TEST_CHECK( loadedSignalVerifier.Verify( id03, 100, 100 ) ); // third image is successfully loaded
 
diff --git a/dali-toolkit/internal/visuals/visual-factory-impl.cpp b/dali-toolkit/internal/visuals/visual-factory-impl.cpp
index bcc9acd..6baaec2 100644
--- a/dali-toolkit/internal/visuals/visual-factory-impl.cpp
+++ b/dali-toolkit/internal/visuals/visual-factory-impl.cpp
@@ -149,16 +149,17 @@ Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& property
         }
         else // Regular image
         {
+          bool batchingEnabled( false );
           Property::Value* batchingEnabledValue = propertyMap.Find( Toolkit::ImageVisual::Property::BATCHING_ENABLED, BATCHING_ENABLED );
           if( batchingEnabledValue  )
           {
-            bool batchingEnabled( false );
             batchingEnabledValue->Get( batchingEnabled );
-            if( batchingEnabled )
-            {
-              visualPtr = new BatchImageVisual( *( mFactoryCache.Get() ) );
-              break;
-            }
+          }
+
+          if( batchingEnabled )
+          {
+            visualPtr = new BatchImageVisual( *( mFactoryCache.Get() ) );
+            break;
           }
           else
           {