From: Moonhee Choi Date: Tue, 19 Dec 2017 08:05:41 +0000 (+0900) Subject: Move Some Devel Properties & APIs to the Public API X-Git-Tag: dali_1.3.5~1^2 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=4365dab5fd64788ab0c1215ac6f14619cfb9a67d Move Some Devel Properties & APIs to the Public API -control.h Toolkit::Visual::ResourceStatus GetVisualResourceStatus( const Dali::Property::Index index ); -visual-properties.h PREPARING READY FAILED -image-visual-properties.h LoadPolicy ReleasePolicy LOAD_POLICY RELEASE_POLICY ORIENTATION_CORRECTION Change-Id: Ibbb5b53361b299d6f814431f54245512980e198b Signed-off-by: Moonhee Choi --- diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp index d695e92..0a4dad2 100755 --- a/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp @@ -834,11 +834,12 @@ int UtcDaliControlResourcesReady(void) DummyControl actor = DummyControl::New(); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); + dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, smallVisual ); actor.SetSize( 200.f, 200.f ); - Toolkit::Visual::ResourceStatus resourceStatus = DevelControl::GetVisualResourceStatus(dummyImpl, DummyControl::Property::TEST_VISUAL); + Toolkit::Visual::ResourceStatus resourceStatus = actor.GetVisualResourceStatus(DummyControl::Property::TEST_VISUAL); DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION ); DALI_TEST_EQUALS( actor.IsResourceReady(), false, TEST_LOCATION ); DALI_TEST_EQUALS( static_cast(resourceStatus), static_cast(Toolkit::Visual::ResourceStatus::PREPARING), TEST_LOCATION ); @@ -852,7 +853,7 @@ int UtcDaliControlResourcesReady(void) application.SendNotification(); application.Render(); - resourceStatus = DevelControl::GetVisualResourceStatus(dummyImpl, DummyControl::Property::TEST_VISUAL); + resourceStatus = actor.GetVisualResourceStatus(DummyControl::Property::TEST_VISUAL); DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION ); DALI_TEST_EQUALS( actor.IsResourceReady(), true, TEST_LOCATION ); DALI_TEST_EQUALS( static_cast(resourceStatus), static_cast(Toolkit::Visual::ResourceStatus::READY), TEST_LOCATION ); @@ -865,12 +866,12 @@ int UtcDaliControlResourcesReady(void) dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL2, largeVisual, false ); - resourceStatus = DevelControl::GetVisualResourceStatus(dummyImpl, DummyControl::Property::TEST_VISUAL2); + resourceStatus = actor.GetVisualResourceStatus(DummyControl::Property::TEST_VISUAL2); DALI_TEST_EQUALS( static_cast(resourceStatus), static_cast(Toolkit::Visual::ResourceStatus::PREPARING), TEST_LOCATION ); application.SendNotification(); - resourceStatus = DevelControl::GetVisualResourceStatus(dummyImpl, DummyControl::Property::TEST_VISUAL2); + resourceStatus = actor.GetVisualResourceStatus(DummyControl::Property::TEST_VISUAL2); DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION ); DALI_TEST_EQUALS( actor.IsResourceReady(), true, TEST_LOCATION ); DALI_TEST_EQUALS( static_cast(resourceStatus), static_cast(Toolkit::Visual::ResourceStatus::PREPARING), TEST_LOCATION ); @@ -881,7 +882,7 @@ int UtcDaliControlResourcesReady(void) application.SendNotification(); - resourceStatus = DevelControl::GetVisualResourceStatus(dummyImpl, DummyControl::Property::TEST_VISUAL2); + resourceStatus = actor.GetVisualResourceStatus(DummyControl::Property::TEST_VISUAL2); DALI_TEST_EQUALS( static_cast(resourceStatus), static_cast(Toolkit::Visual::ResourceStatus::READY), TEST_LOCATION ); END_TEST; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp index 97a4b1d..4ff9b13 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp @@ -1526,7 +1526,7 @@ int UtcDaliImageViewResourceReadySignalWithImmediateLoad(void) Property::Map imageMap; imageMap[ ImageVisual::Property::URL ] = gImage_34_RGBA; - imageMap[ DevelImageVisual::Property::LOAD_POLICY ] = DevelImageVisual::LoadPolicy::IMMEDIATE; + imageMap[ ImageVisual::Property::LOAD_POLICY ] = ImageVisual::LoadPolicy::IMMEDIATE; tet_infoline("Creating ImageView without URL so image does not start loading"); ImageView imageView = ImageView::New(); @@ -1557,7 +1557,7 @@ int UtcDaliImageViewResourceReadySignalWithReusedImage(void) Property::Map imageMap; imageMap[ ImageVisual::Property::URL ] = gImage_34_RGBA; - imageMap[ DevelImageVisual::Property::LOAD_POLICY ] = DevelImageVisual::LoadPolicy::IMMEDIATE; + imageMap[ ImageVisual::Property::LOAD_POLICY ] = ImageVisual::LoadPolicy::IMMEDIATE; ImageView imageView = ImageView::New(); imageView.ResourceReadySignal().Connect( &ResourceReadySignal); @@ -1591,7 +1591,7 @@ int UtcDaliImageViewResourceReadySignalWithReusedImage02(void) Property::Map imageImmediateLoadingMap; imageImmediateLoadingMap[ ImageVisual::Property::URL ] = gImage_34_RGBA; - imageImmediateLoadingMap[ DevelImageVisual::Property::LOAD_POLICY ] = DevelImageVisual::LoadPolicy::IMMEDIATE; + imageImmediateLoadingMap[ ImageVisual::Property::LOAD_POLICY ] = ImageVisual::LoadPolicy::IMMEDIATE; tet_infoline("Immediate load an image"); ImageView imageView = ImageView::New(); diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ImageVisual.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ImageVisual.cpp index 679721c..a2adf41 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ImageVisual.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ImageVisual.cpp @@ -247,7 +247,7 @@ int UtcDaliImageVisualTextureReuse1(void) Property::Map propertyMap; propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::IMAGE ); propertyMap.Insert( ImageVisual::Property::URL, TEST_LARGE_IMAGE_FILE_NAME ); - propertyMap.Insert( DevelImageVisual::Property::RELEASE_POLICY, DevelImageVisual::ReleasePolicy::DETACHED ); + propertyMap.Insert( ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::DETACHED ); TestGlAbstraction& gl = application.GetGlAbstraction(); TraceCallStack& textureTrace = gl.GetTextureTrace(); @@ -1213,7 +1213,7 @@ int UtcDaliImageVisualReleasePolicy01(void) ToolkitTestApplication application; tet_infoline( "UtcDaliImageVisualReleasePolicy01 Detached Policy, disabling visual with this policy deletes texture" ); - Visual::Base imageVisual = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, DevelImageVisual::Property::RELEASE_POLICY, DevelImageVisual::ReleasePolicy::DETACHED ); + Visual::Base imageVisual = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::DETACHED ); DALI_TEST_CHECK( imageVisual ); // Set up debug trace @@ -1263,7 +1263,7 @@ int UtcDaliImageVisualReleasePolicy02(void) ToolkitTestApplication application; tet_infoline( "UtcDaliImageVisualReleasePolicy02 Destroyed Policy, Texture should be deleted when visual destroyed" ); - Visual::Base imageVisual = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, DevelImageVisual::Property::RELEASE_POLICY, DevelImageVisual::ReleasePolicy::DESTROYED ); + Visual::Base imageVisual = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::DESTROYED ); DALI_TEST_CHECK( imageVisual ); // Setup debug trace @@ -1315,7 +1315,7 @@ int UtcDaliImageVisualReleasePolicy03(void) ToolkitTestApplication application; tet_infoline( "UtcDaliImageVisualReleasePolicy03 Never Policy, texture should not be deleted after visual destroyed" ); - Visual::Base imageVisual = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, DevelImageVisual::Property::RELEASE_POLICY, DevelImageVisual::ReleasePolicy::NEVER ); + Visual::Base imageVisual = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::NEVER ); DALI_TEST_CHECK( imageVisual ); TestGlAbstraction& gl = application.GetGlAbstraction(); @@ -1365,10 +1365,10 @@ int UtcDaliImageVisualReleasePolicy04(void) tet_infoline( "UtcDaliImageVisualReleasePolicy04 Two visuals with different policies sharing a texture" ); tet_infoline( "Create first visual with Never release policy" ); - Visual::Base imageVisualNever = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, DevelImageVisual::Property::RELEASE_POLICY, DevelImageVisual::ReleasePolicy::NEVER ); + Visual::Base imageVisualNever = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::NEVER ); tet_infoline( "Create second visual with Destroyed release policy"); - Visual::Base imageVisualDestroyed = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, DevelImageVisual::Property::RELEASE_POLICY, DevelImageVisual::ReleasePolicy::DESTROYED ); + Visual::Base imageVisualDestroyed = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::DESTROYED ); // Set up trace debug TestGlAbstraction& gl = application.GetGlAbstraction(); @@ -1444,7 +1444,7 @@ int UtcDaliImageVisualReleasePolicy05(void) imageVisualNever.CreatePropertyMap( resultMap ); DALI_TEST_CHECK( ! resultMap.Empty() ); - DALI_TEST_EQUALS( ( resultMap.Find( DevelImageVisual::Property::RELEASE_POLICY ) )->Get(), (int)DevelImageVisual::ReleasePolicy::NEVER, TEST_LOCATION ); + DALI_TEST_EQUALS( ( resultMap.Find( ImageVisual::Property::RELEASE_POLICY ) )->Get(), (int)ImageVisual::ReleasePolicy::NEVER, TEST_LOCATION ); END_TEST; } @@ -1454,7 +1454,7 @@ int UtcDaliImageVisualReleasePolicy06(void) ToolkitTestApplication application; tet_infoline( "UtcDaliImageVisualReleasePolicy06 Never Policy, texture should not be affected by Disabling and Enabling visual" ); - Visual::Base imageVisual= CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, DevelImageVisual::Property::RELEASE_POLICY, DevelImageVisual::ReleasePolicy::NEVER ); + Visual::Base imageVisual= CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::NEVER ); DALI_TEST_CHECK( imageVisual ); TestGlAbstraction& gl = application.GetGlAbstraction(); @@ -1514,11 +1514,11 @@ int UtcDaliImageVisualReleasePolicy07(void) tet_infoline( "UtcDaliImageVisualReleasePolicy07 Two visuals with different policies sharing a texture DETACHED and DESTROYED" ); tet_infoline( "Create first visual with DESTROYED release policy" ); - Visual::Base imageVisualDestroyed = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, DevelImageVisual::Property::RELEASE_POLICY, DevelImageVisual::ReleasePolicy::DESTROYED ); + Visual::Base imageVisualDestroyed = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::DESTROYED ); tet_infoline( "Create second visual with DETACHED release policy"); - Visual::Base imageVisualDetached = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, DevelImageVisual::Property::RELEASE_POLICY, DevelImageVisual::ReleasePolicy::DETACHED ); + Visual::Base imageVisualDetached = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::DETACHED ); // Set up trace debug TestGlAbstraction& gl = application.GetGlAbstraction(); @@ -1584,7 +1584,21 @@ int UtcDaliImageVisualLoadPolicy01(void) textureTrace.Enable(true); tet_infoline( "Create visual with IMMEDIATE load policy" ); - Visual::Base imageVisual = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, DevelImageVisual::Property::LOAD_POLICY, DevelImageVisual::LoadPolicy::IMMEDIATE ); + VisualFactory factory = VisualFactory::Get(); + + Property::Map propertyMap; + propertyMap.Insert( Visual::Property::TYPE, Visual::IMAGE ); + propertyMap.Insert( ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME ); + propertyMap.Insert( ImageVisual::Property::DESIRED_WIDTH, 20 ); + propertyMap.Insert( ImageVisual::Property::DESIRED_HEIGHT, 30 ); + propertyMap.Insert( "loadPolicy" , ImageVisual::LoadPolicy::IMMEDIATE ); + + Visual::Base imageVisual = factory.CreateVisual( propertyMap ); + + Property::Map resultMap; + imageVisual.CreatePropertyMap( resultMap ); + DALI_TEST_CHECK( ! resultMap.Empty() ); + DALI_TEST_EQUALS( ( resultMap.Find( ImageVisual::Property::LOAD_POLICY ) )->Get(), (int)ImageVisual::LoadPolicy::IMMEDIATE, TEST_LOCATION ); DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); @@ -1637,7 +1651,7 @@ int UtcDaliImageVisualLoadPolicy02(void) textureTrace.Enable(true); tet_infoline( "Create visual with IMMEDIATE load policy" ); - Visual::Base imageVisual = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, DevelImageVisual::Property::LOAD_POLICY, DevelImageVisual::LoadPolicy::ATTACHED ); + Visual::Base imageVisual = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, ImageVisual::Property::LOAD_POLICY, ImageVisual::LoadPolicy::ATTACHED ); const unsigned int TIME_OUT_3_SECONDS = 3; DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1, TIME_OUT_3_SECONDS ), false, TEST_LOCATION ); @@ -1699,7 +1713,7 @@ int UtcDaliImageVisualLoadPolicy03(void) actor.SetSize(200.f, 200.f); tet_infoline( "Create visual with IMMEDIATE load policy" ); - Visual::Base imageVisual = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, DevelImageVisual::Property::LOAD_POLICY, DevelImageVisual::LoadPolicy::IMMEDIATE ); + Visual::Base imageVisual = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, ImageVisual::Property::LOAD_POLICY, ImageVisual::LoadPolicy::IMMEDIATE ); tet_infoline( "Registering visual allows control to get a signal once loaded even if visual not enabled( not staged )" ); dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, imageVisual, VISUAL_NOT_ENABLED ); @@ -1737,7 +1751,7 @@ int UtcDaliImageVisualLoadPolicy04(void) actor.SetSize(200.f, 200.f); tet_infoline( "Create visual with IMMEDIATE load policy" ); - Visual::Base imageVisual = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, DevelImageVisual::Property::LOAD_POLICY, DevelImageVisual::LoadPolicy::IMMEDIATE ); + Visual::Base imageVisual = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, ImageVisual::Property::LOAD_POLICY, ImageVisual::LoadPolicy::IMMEDIATE ); tet_infoline( "Registering visual allows control to get a signal once loaded even if visual not enabled( staged )" ); dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, imageVisual, VISUAL_NOT_ENABLED ); @@ -1755,7 +1769,7 @@ int UtcDaliImageVisualLoadPolicy04(void) tet_infoline( "Original control correctly signalled, now testing for signal with new Control reusing the image" ); gResourceReadySignalFired = false; // Reset signal check ready for testing next Control - Visual::Base imageVisual2 = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, DevelImageVisual::Property::LOAD_POLICY, DevelImageVisual::LoadPolicy::IMMEDIATE ); + Visual::Base imageVisual2 = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, ImageVisual::Property::LOAD_POLICY, ImageVisual::LoadPolicy::IMMEDIATE ); DummyControl actor2 = DummyControl::New(true); Impl::DummyControl& dummyImpl2 = static_cast(actor.GetImplementation()); actor2.ResourceReadySignal().Connect( &ResourceReadySignal); @@ -1788,7 +1802,7 @@ int UtcDaliImageVisualLoadPolicy05(void) Stage::GetCurrent().Add( actor ); tet_infoline( "Create visual with ATTACHED load policy" ); - Visual::Base imageVisual = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, DevelImageVisual::Property::LOAD_POLICY, DevelImageVisual::LoadPolicy::ATTACHED ); + Visual::Base imageVisual = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, ImageVisual::Property::LOAD_POLICY, ImageVisual::LoadPolicy::ATTACHED ); tet_infoline( "Registering visual allows control to get a signal once loaded" ); dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, imageVisual ); @@ -1806,7 +1820,7 @@ int UtcDaliImageVisualLoadPolicy05(void) tet_infoline( "Original control correctly signalled, now testing for signal with new Control reusing the image" ); gResourceReadySignalFired = false; // Reset signal check ready for testing next Control - Visual::Base imageVisual2 = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, DevelImageVisual::Property::LOAD_POLICY, DevelImageVisual::LoadPolicy::ATTACHED ); + Visual::Base imageVisual2 = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, ImageVisual::Property::LOAD_POLICY, ImageVisual::LoadPolicy::ATTACHED ); DummyControl actor2 = DummyControl::New(true); Impl::DummyControl& dummyImpl2 = static_cast(actor.GetImplementation()); actor2.ResourceReadySignal().Connect( &ResourceReadySignal); @@ -1832,7 +1846,7 @@ int UtcDaliImageVisualOrientationCorrection(void) Property::Map propertyMap; propertyMap.Insert( Visual::Property::TYPE, Visual::IMAGE ); propertyMap.Insert( ImageVisual::Property::URL, TEST_ROTATED_IMAGE ); - propertyMap.Insert( DevelImageVisual::Property::ORIENTATION_CORRECTION, false ); + propertyMap.Insert( "orientationCorrection", false ); Visual::Base imageVisual = factory.CreateVisual( propertyMap ); tet_infoline( "Create control for visual, need to loaded it" ); @@ -1857,7 +1871,7 @@ int UtcDaliImageVisualOrientationCorrection(void) propertyMap.Clear(); propertyMap.Insert( Visual::Property::TYPE, Visual::IMAGE ); propertyMap.Insert( ImageVisual::Property::URL, TEST_ROTATED_IMAGE ); - propertyMap.Insert( DevelImageVisual::Property::ORIENTATION_CORRECTION, true ); + propertyMap.Insert( ImageVisual::Property::ORIENTATION_CORRECTION, true ); imageVisual = factory.CreateVisual( propertyMap ); dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, imageVisual ); @@ -1874,7 +1888,7 @@ int UtcDaliImageVisualOrientationCorrection(void) imageVisual.CreatePropertyMap( resultMap ); // check the Property::ORIENTATION_CORRECTION value from the returned map - Property::Value* typeValue = resultMap.Find( DevelImageVisual::Property::ORIENTATION_CORRECTION, Property::BOOLEAN ); + Property::Value* typeValue = resultMap.Find( ImageVisual::Property::ORIENTATION_CORRECTION, Property::BOOLEAN ); DALI_TEST_EQUALS( typeValue->Get(), true, TEST_LOCATION ); END_TEST; diff --git a/dali-toolkit/devel-api/controls/control-devel.cpp b/dali-toolkit/devel-api/controls/control-devel.cpp index 1ea20d2..116f69a 100644 --- a/dali-toolkit/devel-api/controls/control-devel.cpp +++ b/dali-toolkit/devel-api/controls/control-devel.cpp @@ -83,12 +83,6 @@ bool IsVisualEnabled( const Internal::Control& control, Dali::Property::Index in return controlDataImpl.IsVisualEnabled( index ); } -Toolkit::Visual::ResourceStatus GetVisualResourceStatus( const Internal::Control& control, Dali::Property::Index index ) -{ - const Internal::Control::Impl& controlDataImpl = Internal::Control::Impl::Get( control ); - return controlDataImpl.GetVisualResourceStatus( index ); -} - Dali::Animation CreateTransition( Internal::Control& control, const Toolkit::TransitionData& handle ) { Internal::Control::Impl& controlDataImpl = Internal::Control::Impl::Get( control ); diff --git a/dali-toolkit/devel-api/controls/control-devel.h b/dali-toolkit/devel-api/controls/control-devel.h index 9a824d3..ae90f4d 100644 --- a/dali-toolkit/devel-api/controls/control-devel.h +++ b/dali-toolkit/devel-api/controls/control-devel.h @@ -215,15 +215,6 @@ DALI_IMPORT_API void EnableVisual( Internal::Control& control, Dali::Property::I DALI_IMPORT_API bool IsVisualEnabled( const Internal::Control& control, Dali::Property::Index index ); /** - * @brief Get the loading state of the visual resource. - * - * @param[in] control The control - * @param[in] index The Property index of the visual - * @return Return the loading status (PREPARING, READY and FAILED) of visual resource - */ -DALI_IMPORT_API Toolkit::Visual::ResourceStatus GetVisualResourceStatus( const Internal::Control& control, Dali::Property::Index index ); - -/** * @brief Create a transition effect on the control. * * Only generates an animation if the properties described in the transition diff --git a/dali-toolkit/devel-api/image-loader/texture-manager.h b/dali-toolkit/devel-api/image-loader/texture-manager.h index b88eab9..ce4bf3d 100644 --- a/dali-toolkit/devel-api/image-loader/texture-manager.h +++ b/dali-toolkit/devel-api/image-loader/texture-manager.h @@ -61,7 +61,7 @@ DALI_IMPORT_API std::string AddTexture( TextureSet& textureSet ); */ DALI_IMPORT_API TextureSet RemoveTexture( const std::string& textureUrl ); -} +} // TextureManager } // Toolkit diff --git a/dali-toolkit/devel-api/visual-factory/visual-base.cpp b/dali-toolkit/devel-api/visual-factory/visual-base.cpp index b6a51fb..88cb626 100644 --- a/dali-toolkit/devel-api/visual-factory/visual-base.cpp +++ b/dali-toolkit/devel-api/visual-factory/visual-base.cpp @@ -61,7 +61,7 @@ const std::string& Visual::Base::GetName() return GetImplementation( *this ).GetName(); } -void Visual::Base::SetTransformAndSize( const Property::Map& transform, Size controlSize ) +void Visual::Base::SetTransformAndSize( const Dali::Property::Map& transform, Size controlSize ) { GetImplementation( *this ).SetTransformAndSize( transform, controlSize ); } @@ -91,7 +91,7 @@ int Visual::Base::GetDepthIndex() const return GetImplementation( *this ).GetDepthIndex(); } -void Visual::Base::CreatePropertyMap( Property::Map& map ) const +void Visual::Base::CreatePropertyMap( Dali::Property::Map& map ) const { GetImplementation( *this ).CreatePropertyMap( map ); } diff --git a/dali-toolkit/devel-api/visual-factory/visual-base.h b/dali-toolkit/devel-api/visual-factory/visual-base.h index da41237..54a0310 100644 --- a/dali-toolkit/devel-api/visual-factory/visual-base.h +++ b/dali-toolkit/devel-api/visual-factory/visual-base.h @@ -38,13 +38,6 @@ class Base; namespace Visual { -enum class ResourceStatus -{ - PREPARING, - READY, - FAILED -}; - /** * @brief A Visual provides a renderer for drawing a control component. A control may have multiple visuals. * diff --git a/dali-toolkit/devel-api/visuals/image-visual-properties-devel.h b/dali-toolkit/devel-api/visuals/image-visual-properties-devel.h index e87af5d..a340755 100644 --- a/dali-toolkit/devel-api/visuals/image-visual-properties-devel.h +++ b/dali-toolkit/devel-api/visuals/image-visual-properties-devel.h @@ -30,42 +30,6 @@ namespace Toolkit namespace DevelImageVisual { -/** - * @brief The policy determining if the image is loaded when the visual is staged or created. - */ -namespace LoadPolicy -{ - -/** - * @brief The available named elements that define the LoadPolicy. - */ -enum Type -{ - IMMEDIATE = 0, ///< The image is loaded when the ImageVisual is created. - ATTACHED ///< The image is loaded when the ImageVisual is attached to the stage. -}; - -} // namespace LoadPolicy - -/** - * @brief The policy determining when a image is deleted from the cache in relation to the ImageVisual lifetime. - * @note If the texture is being shared by another visual it persist if still required. - */ -namespace ReleasePolicy -{ - -/** - * @brief The available named elements that define the ReleasePolicy. - */ -enum Type -{ - DETACHED = 0, ///< Image deleted from cache when ImageVisual detached from stage. - DESTROYED, ///< Image deleted from cache when ImageVisual destroyed. - NEVER ///< Image is never deleted, will survive the lifetime of the application. -}; - -} // namespace ReleasePolicy; - namespace Property { @@ -89,29 +53,9 @@ enum Type FRAME_DELAY = Dali::Toolkit::ImageVisual::Property::FRAME_DELAY, MASK_CONTENT_SCALE = Dali::Toolkit::ImageVisual::Property::MASK_CONTENT_SCALE, CROP_TO_MASK = Dali::Toolkit::ImageVisual::Property::CROP_TO_MASK, - - /** - * @brief The policy to determine when an image should be loaded. - * @details Name "loadPolicy", Type LoadPolicy::Type (Property::INTEGER)or Property::STRING. - * @note Default LoadPolicy::ATTACHED - * @see LoadPolicy::Type - */ - LOAD_POLICY = CROP_TO_MASK + 1, - - /** - * @brief The policy to determine when an image should no longer be cached. - * @details Name "releasePolicy", Type ReleasePolicy::Type (Property::INTEGER) or Property::STRING - * @note Default ReleasePolicy::DESTROYED - * @see ReleasePolicy::Type - */ - RELEASE_POLICY = CROP_TO_MASK + 2, - - /** - * @brief Determines if image orientation should be corrected so the image displays as it was intended. - * @details Name "orientationCorrection", Type Property::BOOLEAN, if true the image's orientation will be corrected. - * @note Default true - */ - ORIENTATION_CORRECTION = CROP_TO_MASK + 3, + LOAD_POLICY = Dali::Toolkit::ImageVisual::Property::LOAD_POLICY, + RELEASE_POLICY = Dali::Toolkit::ImageVisual::Property::RELEASE_POLICY, + ORIENTATION_CORRECTION = Dali::Toolkit::ImageVisual::Property::ORIENTATION_CORRECTION, /** * @brief Overlays the auxiliary iamge on top of an NPatch image. @@ -123,14 +67,14 @@ enum Type * @details Name "auxiliaryImage", Type Property::STRING, URL of the image. * @note Default true */ - AUXILIARY_IMAGE = CROP_TO_MASK + 4, + AUXILIARY_IMAGE = ORIENTATION_CORRECTION + 1, /** * @brief An alpha value for mixing between the masked main NPatch image and the auxiliary image * @details Name "auxiliaryImageAlpha", Type Property::FLOAT, between 0 and 1 * @note Default 0 */ - AUXILIARY_IMAGE_ALPHA = CROP_TO_MASK + 5, + AUXILIARY_IMAGE_ALPHA = ORIENTATION_CORRECTION + 2, }; diff --git a/dali-toolkit/internal/controls/control/control-data-impl.h b/dali-toolkit/internal/controls/control/control-data-impl.h index df661ef..ddd7506 100644 --- a/dali-toolkit/internal/controls/control/control-data-impl.h +++ b/dali-toolkit/internal/controls/control/control-data-impl.h @@ -31,6 +31,7 @@ #include #include #include +#include namespace Dali { diff --git a/dali-toolkit/internal/visuals/animated-gradient/animated-gradient-visual.cpp b/dali-toolkit/internal/visuals/animated-gradient/animated-gradient-visual.cpp index f20286c..78ed950 100755 --- a/dali-toolkit/internal/visuals/animated-gradient/animated-gradient-visual.cpp +++ b/dali-toolkit/internal/visuals/animated-gradient/animated-gradient-visual.cpp @@ -19,6 +19,7 @@ //INTERNAL INCLUDES #include +#include #include #include #include diff --git a/dali-toolkit/internal/visuals/image/image-visual.cpp b/dali-toolkit/internal/visuals/image/image-visual.cpp index 8845541..51924f0 100644 --- a/dali-toolkit/internal/visuals/image/image-visual.cpp +++ b/dali-toolkit/internal/visuals/image/image-visual.cpp @@ -94,15 +94,15 @@ DALI_ENUM_TO_STRING_TABLE_END( WRAP_MODE ) // load policies DALI_ENUM_TO_STRING_TABLE_BEGIN( LOAD_POLICY ) -DALI_ENUM_TO_STRING_WITH_SCOPE( DevelImageVisual::LoadPolicy, IMMEDIATE ) -DALI_ENUM_TO_STRING_WITH_SCOPE( DevelImageVisual::LoadPolicy, ATTACHED ) +DALI_ENUM_TO_STRING_WITH_SCOPE( Dali::Toolkit::ImageVisual::LoadPolicy, IMMEDIATE ) +DALI_ENUM_TO_STRING_WITH_SCOPE( Dali::Toolkit::ImageVisual::LoadPolicy, ATTACHED ) DALI_ENUM_TO_STRING_TABLE_END( LOAD_POLICY ) // release policies DALI_ENUM_TO_STRING_TABLE_BEGIN( RELEASE_POLICY ) -DALI_ENUM_TO_STRING_WITH_SCOPE( DevelImageVisual::ReleasePolicy, DETACHED ) -DALI_ENUM_TO_STRING_WITH_SCOPE( DevelImageVisual::ReleasePolicy, DESTROYED ) -DALI_ENUM_TO_STRING_WITH_SCOPE( DevelImageVisual::ReleasePolicy, NEVER ) +DALI_ENUM_TO_STRING_WITH_SCOPE( Dali::Toolkit::ImageVisual::ReleasePolicy, DETACHED ) +DALI_ENUM_TO_STRING_WITH_SCOPE( Dali::Toolkit::ImageVisual::ReleasePolicy, DESTROYED ) +DALI_ENUM_TO_STRING_WITH_SCOPE( Dali::Toolkit::ImageVisual::ReleasePolicy, NEVER ) DALI_ENUM_TO_STRING_TABLE_END( RELEASE_POLICY ) const Vector4 FULL_TEXTURE_RECT(0.f, 0.f, 1.f, 1.f); @@ -282,8 +282,8 @@ ImageVisual::ImageVisual( VisualFactoryCache& factoryCache, mSamplingMode( samplingMode ), mWrapModeU( WrapMode::DEFAULT ), mWrapModeV( WrapMode::DEFAULT ), - mLoadPolicy( DevelImageVisual::LoadPolicy::ATTACHED ), - mReleasePolicy( DevelImageVisual::ReleasePolicy::DETACHED ), + mLoadPolicy( Toolkit::ImageVisual::LoadPolicy::ATTACHED ), + mReleasePolicy( Toolkit::ImageVisual::ReleasePolicy::DETACHED ), mAtlasRect( 0.0f, 0.0f, 0.0f, 0.0f ), mAttemptAtlasing( false ), mLoading( false ), @@ -305,8 +305,8 @@ ImageVisual::ImageVisual( VisualFactoryCache& factoryCache, const Image& image ) mSamplingMode( SamplingMode::DEFAULT ), mWrapModeU( WrapMode::DEFAULT ), mWrapModeV( WrapMode::DEFAULT ), - mLoadPolicy( DevelImageVisual::LoadPolicy::ATTACHED ), - mReleasePolicy( DevelImageVisual::ReleasePolicy::DESTROYED ), + mLoadPolicy( Toolkit::ImageVisual::LoadPolicy::ATTACHED ), + mReleasePolicy( Toolkit::ImageVisual::ReleasePolicy::DESTROYED ), mAtlasRect( 0.0f, 0.0f, 0.0f, 0.0f ), mAttemptAtlasing( false ), mLoading( false ), @@ -331,7 +331,7 @@ ImageVisual::~ImageVisual() } // ImageVisual destroyed so remove texture unless ReleasePolicy is set to never release - if( ( mTextureId != TextureManager::INVALID_TEXTURE_ID ) && ( mReleasePolicy != DevelImageVisual::ReleasePolicy::NEVER ) ) + if( ( mTextureId != TextureManager::INVALID_TEXTURE_ID ) && ( mReleasePolicy != Toolkit::ImageVisual::ReleasePolicy::NEVER ) ) { RemoveTexture(); } @@ -400,20 +400,20 @@ void ImageVisual::DoSetProperties( const Property::Map& propertyMap ) } else if ( keyValue.first == LOAD_POLICY_NAME ) { - DoSetProperty( Toolkit::DevelImageVisual::Property::LOAD_POLICY, keyValue.second ); + DoSetProperty( Toolkit::ImageVisual::Property::LOAD_POLICY, keyValue.second ); } else if( keyValue.first == RELEASE_POLICY_NAME ) { - DoSetProperty( Toolkit::DevelImageVisual::Property::RELEASE_POLICY, keyValue.second ); + DoSetProperty( Toolkit::ImageVisual::Property::RELEASE_POLICY, keyValue.second ); } else if( keyValue.first == ORIENTATION_CORRECTION_NAME ) { - DoSetProperty( Toolkit::DevelImageVisual::Property::ORIENTATION_CORRECTION, keyValue.second ); + DoSetProperty( Toolkit::ImageVisual::Property::ORIENTATION_CORRECTION, keyValue.second ); } } } // Load image immediately if LOAD_POLICY requires it - if ( mLoadPolicy == DevelImageVisual::LoadPolicy::IMMEDIATE ) + if ( mLoadPolicy == Toolkit::ImageVisual::LoadPolicy::IMMEDIATE ) { auto attemptAtlasing = AttemptAtlasing(); LoadTexture( attemptAtlasing, mAtlasRect, mTextures, mOrientationCorrection, @@ -554,22 +554,22 @@ void ImageVisual::DoSetProperty( Property::Index index, const Property::Value& v break; } - case Toolkit::DevelImageVisual::Property::RELEASE_POLICY: + case Toolkit::ImageVisual::Property::RELEASE_POLICY: { int releasePolicy; Scripting::GetEnumerationProperty( value, RELEASE_POLICY_TABLE, RELEASE_POLICY_TABLE_COUNT, releasePolicy ); - mReleasePolicy = DevelImageVisual::ReleasePolicy::Type( releasePolicy ); + mReleasePolicy = Toolkit::ImageVisual::ReleasePolicy::Type( releasePolicy ); break; } - case Toolkit::DevelImageVisual::Property::LOAD_POLICY: + case Toolkit::ImageVisual::Property::LOAD_POLICY: { int loadPolicy; Scripting::GetEnumerationProperty( value, LOAD_POLICY_TABLE, LOAD_POLICY_TABLE_COUNT, loadPolicy ); - mLoadPolicy = DevelImageVisual::LoadPolicy::Type( loadPolicy ); + mLoadPolicy = Toolkit::ImageVisual::LoadPolicy::Type( loadPolicy ); break; } - case Toolkit::DevelImageVisual::Property::ORIENTATION_CORRECTION: + case Toolkit::ImageVisual::Property::ORIENTATION_CORRECTION: { bool orientationCorrection( mOrientationCorrection ); if( value.Get( orientationCorrection ) ) @@ -892,7 +892,7 @@ void ImageVisual::DoSetOffStage( Actor& actor ) // Image release is dependent on the ReleasePolicy, renderer is destroyed. actor.RemoveRenderer( mImpl->mRenderer); - if( mReleasePolicy == DevelImageVisual::ReleasePolicy::DETACHED ) + if( mReleasePolicy == Toolkit::ImageVisual::ReleasePolicy::DETACHED ) { RemoveTexture(); // If INVALID_TEXTURE_ID then removal will be attempted on atlas } @@ -948,9 +948,9 @@ void ImageVisual::DoCreatePropertyMap( Property::Map& map ) const map.Insert( Toolkit::ImageVisual::Property::CROP_TO_MASK, mMaskingData->mCropToMask ); } - map.Insert( Toolkit::DevelImageVisual::Property::LOAD_POLICY, mLoadPolicy ); - map.Insert( Toolkit::DevelImageVisual::Property::RELEASE_POLICY, mReleasePolicy ); - map.Insert( Toolkit::DevelImageVisual::Property::ORIENTATION_CORRECTION, mOrientationCorrection ); + map.Insert( Toolkit::ImageVisual::Property::LOAD_POLICY, mLoadPolicy ); + map.Insert( Toolkit::ImageVisual::Property::RELEASE_POLICY, mReleasePolicy ); + map.Insert( Toolkit::ImageVisual::Property::ORIENTATION_CORRECTION, mOrientationCorrection ); } void ImageVisual::DoCreateInstancePropertyMap( Property::Map& map ) const diff --git a/dali-toolkit/internal/visuals/image/image-visual.h b/dali-toolkit/internal/visuals/image/image-visual.h index 3108b55..d78ceca 100644 --- a/dali-toolkit/internal/visuals/image/image-visual.h +++ b/dali-toolkit/internal/visuals/image/image-visual.h @@ -33,6 +33,7 @@ #include #include #include +#include namespace Dali { @@ -369,8 +370,8 @@ private: Dali::SamplingMode::Type mSamplingMode:4; Dali::WrapMode::Type mWrapModeU:3; Dali::WrapMode::Type mWrapModeV:3; - DevelImageVisual::LoadPolicy::Type mLoadPolicy; - DevelImageVisual::ReleasePolicy::Type mReleasePolicy; + Dali::Toolkit::ImageVisual::LoadPolicy::Type mLoadPolicy; + Dali::Toolkit::ImageVisual::ReleasePolicy::Type mReleasePolicy; Vector4 mAtlasRect; bool mAttemptAtlasing; ///< If true will attempt atlasing, otherwise create unique texture bool mLoading; ///< True if the texture is still loading. diff --git a/dali-toolkit/internal/visuals/visual-base-data-impl.h b/dali-toolkit/internal/visuals/visual-base-data-impl.h index 79c099c..fd24205 100644 --- a/dali-toolkit/internal/visuals/visual-base-data-impl.h +++ b/dali-toolkit/internal/visuals/visual-base-data-impl.h @@ -26,6 +26,7 @@ #include #include #include +#include namespace Dali { diff --git a/dali-toolkit/internal/visuals/visual-base-impl.h b/dali-toolkit/internal/visuals/visual-base-impl.h index 6fc777d..b9cf7e9 100644 --- a/dali-toolkit/internal/visuals/visual-base-impl.h +++ b/dali-toolkit/internal/visuals/visual-base-impl.h @@ -32,6 +32,7 @@ #include #include #include +#include namespace Dali { diff --git a/dali-toolkit/public-api/controls/control.cpp b/dali-toolkit/public-api/controls/control.cpp index 5d28b91..14205f9 100644 --- a/dali-toolkit/public-api/controls/control.cpp +++ b/dali-toolkit/public-api/controls/control.cpp @@ -140,6 +140,13 @@ bool Control::IsResourceReady() const return controlDataImpl.IsResourceReady(); } +Toolkit::Visual::ResourceStatus Control::GetVisualResourceStatus( Dali::Property::Index index ) +{ + const Internal::Control& internalControl = Toolkit::Internal::GetImplementation( *this ); + const Internal::Control::Impl& controlDataImpl = Internal::Control::Impl::Get( internalControl ); + return controlDataImpl.GetVisualResourceStatus( index ); +} + Control::KeyEventSignalType& Control::KeyEventSignal() { return Internal::GetImplementation(*this).KeyEventSignal(); diff --git a/dali-toolkit/public-api/controls/control.h b/dali-toolkit/public-api/controls/control.h index 58f3205..8e522a2 100644 --- a/dali-toolkit/public-api/controls/control.h +++ b/dali-toolkit/public-api/controls/control.h @@ -28,6 +28,9 @@ #include #include +// INTERNAL INCLUDES +#include + namespace Dali { @@ -395,6 +398,15 @@ public: */ bool IsResourceReady() const; + /** + * @brief Get the loading state of the visual resource. + * + * @SINCE_1_3_5 + * @param[in] index The Property index of the visual + * @return Return the loading status (PREPARING, READY and FAILED) of visual resource + */ + Visual::ResourceStatus GetVisualResourceStatus( const Dali::Property::Index index ); + // Signals /** diff --git a/dali-toolkit/public-api/visuals/image-visual-properties.h b/dali-toolkit/public-api/visuals/image-visual-properties.h index 93902cf..0f5d58b 100644 --- a/dali-toolkit/public-api/visuals/image-visual-properties.h +++ b/dali-toolkit/public-api/visuals/image-visual-properties.h @@ -232,10 +232,78 @@ enum * @note If this is false, then the mask is scaled to fit the image before being applied. */ CROP_TO_MASK, + + /** + * @brief The policy to determine when an image should be loaded. + * @details Name "loadPolicy", Type LoadPolicy::Type (Property::INTEGER)or Property::STRING. + * @SINCE_1_3_5 + * @note Default LoadPolicy::ATTACHED + * @see LoadPolicy::Type + */ + + LOAD_POLICY, + + /** + * @brief The policy to determine when an image should no longer be cached. + * @details Name "releasePolicy", Type ReleasePolicy::Type (Property::INTEGER) or Property::STRING + * @SINCE_1_3_5 + * @note Default ReleasePolicy::DESTROYED + * @see ReleasePolicy::Type + */ + RELEASE_POLICY, + + /** + * @brief Determines if image orientation should be corrected so the image displays as it was intended. + * @details Name "orientationCorrection", Type Property::BOOLEAN, if true the image's orientation will be corrected. + * @SINCE_1_3_5 + * @note Default true + */ + ORIENTATION_CORRECTION, + }; } // namespace Property +/** + * @brief The policy determining if the image is loaded when the visual is staged or created. + * @SINCE_1_3_5 + */ +namespace LoadPolicy +{ + +/** + * @brief The available named elements that define the LoadPolicy. + * @SINCE_1_3_5 + */ +enum Type +{ + IMMEDIATE = 0, ///< The image is loaded when the ImageVisual is created. + ATTACHED ///< The image is loaded when the ImageVisual is attached to the stage. +}; + +} // namespace LoadPolicy + +/** + * @brief The policy determining when a image is deleted from the cache in relation to the ImageVisual lifetime. + * @SINCE_1_3_5 + * @note If the texture is being shared by another visual it persist if still required. + */ +namespace ReleasePolicy +{ + +/** + * @brief The available named elements that define the ReleasePolicy. + * @SINCE_1_3_5 + */ +enum Type +{ + DETACHED = 0, ///< Image deleted from cache when ImageVisual detached from stage. + DESTROYED, ///< Image deleted from cache when ImageVisual destroyed. + NEVER ///< Image is never deleted, will survive the lifetime of the application. +}; + +} // namespace ReleasePolicy; + } // namespace ImageVisual /** diff --git a/dali-toolkit/public-api/visuals/visual-properties.h b/dali-toolkit/public-api/visuals/visual-properties.h index 94b504b..bb0ecd2 100644 --- a/dali-toolkit/public-api/visuals/visual-properties.h +++ b/dali-toolkit/public-api/visuals/visual-properties.h @@ -325,6 +325,18 @@ enum } // namespace Shader + +/** + * @brief Status of resource which is used for visual. + * @SINCE_1_3_5 + */ +enum class ResourceStatus +{ + PREPARING, /// Resource is prepared. @SINCE_1_3_5 + READY, /// Resource is ready. @SINCE_1_3_5 + FAILED /// Resource is fail to load @SINCE_1_3_5 +}; + } // namespace Visual /**