From: Adeel Kazmi Date: Fri, 21 Oct 2016 10:34:10 +0000 (-0700) Subject: Merge "Added code for stylable transitions" into devel/master X-Git-Tag: dali_1.2.12~21 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=f4c1e7f52d49c3ce033b9ee4c3c7414b06a22d45;hp=-c Merge "Added code for stylable transitions" into devel/master --- f4c1e7f52d49c3ce033b9ee4c3c7414b06a22d45 diff --combined automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp index 0b767d7,dc0723d..35c224e --- a/automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp @@@ -16,14 -16,13 +16,15 @@@ #include #include +#include + #include #include #include #include #include #include + #include "dummy-control.h" using namespace Dali; using namespace Dali::Toolkit; @@@ -36,8 -35,6 +37,8 @@@ const char* TEST_SVG_FILE_NAME = TEST_R const char* TEST_OBJ_FILE_NAME = TEST_RESOURCE_DIR "/Cube.obj"; const char* TEST_MTL_FILE_NAME = TEST_RESOURCE_DIR "/ToyRobot-Metal.mtl"; const char* TEST_RESOURCE_LOCATION = TEST_RESOURCE_DIR "/"; + +const std::string DEFAULT_FONT_DIR( "/resources/fonts" ); } void dali_visual_startup(void) @@@ -83,6 -80,25 +84,25 @@@ int UtcDaliVisualCopyAndAssignment(void END_TEST; } + int UtcDaliVisualSetName01(void) + { + ToolkitTestApplication application; + tet_infoline( "UtcDaliVisualSetName" ); + + VisualFactory factory = VisualFactory::Get(); + Property::Map propertyMap; + propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR); + propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE); + Visual::Base visual = factory.CreateVisual( propertyMap ); + + const char* visualName = "backgroundVisual"; + visual.SetName( visualName ); + + DALI_TEST_EQUALS( visual.GetName(), visualName, TEST_LOCATION ); + + END_TEST; + } + int UtcDaliVisualSetGetDepthIndex(void) { ToolkitTestApplication application; @@@ -192,12 -208,6 +212,12 @@@ int UtcDaliVisualSize(void // DALI_TEST_EQUALS( naturalSize, Vector2(100.f, 100.f), TEST_LOCATION ); + // svg visual with a size + Visual::Base svgVisual2 = factory.CreateVisual( TEST_SVG_FILE_NAME, ImageDimensions(200, 200) ); + DALI_TEST_EQUALS( svgVisual2.GetSize(), Vector2( 200.f, 200.f ), TEST_LOCATION ); + svgVisual2.GetNaturalSize(naturalSize); + DALI_TEST_EQUALS( naturalSize, Vector2(100.f, 100.f), TEST_LOCATION ); // Natural size should still be 100, 100 + // Batch Image visual propertyMap.Clear(); propertyMap.Insert( Visual::Property::TYPE, Visual::IMAGE ); @@@ -209,31 -219,6 +229,31 @@@ batchImageVisual.GetNaturalSize( naturalSize ); DALI_TEST_EQUALS( naturalSize, Vector2( 80.0f, 160.0f ), TEST_LOCATION ); + // Text visual. + + // Load some fonts to get the same metrics on different platforms. + TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get(); + fontClient.SetDpi( 96u, 96u ); + + char* pathNamePtr = get_current_dir_name(); + const std::string pathName( pathNamePtr ); + free( pathNamePtr ); + + fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansRegular.ttf" ); + + propertyMap.Clear(); + propertyMap.Insert( Visual::Property::TYPE, Visual::TEXT ); + propertyMap.Insert( TextVisual::Property::ENABLE_MARKUP, true ); + propertyMap.Insert( TextVisual::Property::TEXT, "Hello world" ); + propertyMap.Insert( TextVisual::Property::MULTI_LINE, true ); + + Visual::Base textVisual = factory.CreateVisual( propertyMap ); + textVisual.GetNaturalSize( naturalSize ); + DALI_TEST_EQUALS( naturalSize, Size( 80.f, 20.f ), TEST_LOCATION ); + + const float height = textVisual.GetHeightForWidth( 40.f ); + DALI_TEST_EQUALS( height, 40.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION ); + END_TEST; } @@@ -927,95 -912,6 +947,95 @@@ int UtcDaliVisualGetPropertyMapBatchIma END_TEST; } +//Text shape visual +int UtcDaliVisualGetPropertyMap10(void) +{ + ToolkitTestApplication application; + tet_infoline( "UtcDaliVisualGetPropertyMap10: TextVisual" ); + + //Request PrimitiveVisual using a property map. + VisualFactory factory = VisualFactory::Get(); + + Property::Map propertyMap; + propertyMap.Insert( Visual::Property::TYPE, Visual::TEXT ); + propertyMap.Insert( "renderingBackend", static_cast( Toolkit::Text::DEFAULT_RENDERING_BACKEND ) ); + propertyMap.Insert( "text", "Hello world" ); + propertyMap.Insert( "fontFamily", "TizenSans" ); + propertyMap.Insert( "fontStyle", "{\"weight\":\"bold\"}" ); + propertyMap.Insert( "pointSize", 12.f ); + propertyMap.Insert( "multiLine", true ); + propertyMap.Insert( "horizontalAlignment", "CENTER" ); + propertyMap.Insert( "verticalAlignment", "CENTER" ); + propertyMap.Insert( "textColor", Color::RED ); + propertyMap.Insert( "enableMarkup", false ); + propertyMap.Insert( "enableAutoScroll", false ); + propertyMap.Insert( "lineSpacing", 0.f ); + propertyMap.Insert( "batchingEnabled", false ); + Visual::Base textVisual = factory.CreateVisual( propertyMap ); + + Property::Map resultMap; + textVisual.CreatePropertyMap( resultMap ); + + //Check values in the result map are identical to the initial map's values. + Property::Value* value = resultMap.Find( Visual::Property::TYPE, Property::INTEGER ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get(), (int)Visual::TEXT, TEST_LOCATION ); + + value = resultMap.Find( TextVisual::Property::RENDERING_BACKEND, Property::INTEGER ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get(), Toolkit::Text::DEFAULT_RENDERING_BACKEND, TEST_LOCATION ); + + value = resultMap.Find( TextVisual::Property::TEXT, Property::STRING ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get(), "Hello world", TEST_LOCATION ); + + value = resultMap.Find( TextVisual::Property::FONT_FAMILY, Property::STRING ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get(), "TizenSans", TEST_LOCATION ); + + value = resultMap.Find( TextVisual::Property::FONT_STYLE, Property::STRING ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get(), "{\"weight\":\"bold\"}", TEST_LOCATION ); + + value = resultMap.Find( TextVisual::Property::POINT_SIZE, Property::FLOAT ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get(), 12.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION ); + + value = resultMap.Find( TextVisual::Property::MULTI_LINE, Property::BOOLEAN ); + DALI_TEST_CHECK( value ); + DALI_TEST_CHECK( value->Get() ); + + value = resultMap.Find( TextVisual::Property::HORIZONTAL_ALIGNMENT, Property::STRING ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get(), "CENTER", TEST_LOCATION ); + + value = resultMap.Find( TextVisual::Property::VERTICAL_ALIGNMENT, Property::STRING ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get(), "CENTER", TEST_LOCATION ); + + value = resultMap.Find( TextVisual::Property::TEXT_COLOR, Property::VECTOR4 ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get(), Color::RED, TEST_LOCATION ); + + value = resultMap.Find( TextVisual::Property::ENABLE_MARKUP, Property::BOOLEAN ); + DALI_TEST_CHECK( value ); + DALI_TEST_CHECK( !value->Get() ); + + value = resultMap.Find( TextVisual::Property::ENABLE_AUTO_SCROLL, Property::BOOLEAN ); + DALI_TEST_CHECK( value ); + DALI_TEST_CHECK( !value->Get() ); + + value = resultMap.Find( TextVisual::Property::LINE_SPACING, Property::FLOAT ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get(), 0.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION ); + + value = resultMap.Find( TextVisual::Property::BATCHING_ENABLED, Property::BOOLEAN ); + DALI_TEST_CHECK( value ); + DALI_TEST_CHECK( !value->Get() ); + + END_TEST; +} + int UtcDaliVisualGetPropertyMapBatchImageVisualNoAtlas(void) { ToolkitTestApplication application; diff --combined dali-toolkit/devel-api/visual-factory/visual-base.cpp index 52f7f3e,dfe7370..c40bc41 --- a/dali-toolkit/devel-api/visual-factory/visual-base.cpp +++ b/dali-toolkit/devel-api/visual-factory/visual-base.cpp @@@ -51,6 -51,16 +51,16 @@@ Visual::Base::Base(Internal::Visual::Ba { } + void Visual::Base::SetName( const std::string& name ) + { + GetImplementation( *this ).SetName( name ); + } + + const std::string& Visual::Base::GetName() + { + return GetImplementation( *this ).GetName(); + } + void Visual::Base::SetSize( const Vector2& size ) { GetImplementation( *this ).SetSize( size ); @@@ -61,11 -71,6 +71,11 @@@ const Vector2& Visual::Base::GetSize() return GetImplementation( *this ).GetSize(); } +float Visual::Base::GetHeightForWidth( float width ) const +{ + return GetImplementation( *this ).GetHeightForWidth( width ); +} + void Visual::Base::GetNaturalSize(Vector2& naturalSize ) const { GetImplementation( *this ).GetNaturalSize( naturalSize ); diff --combined dali-toolkit/devel-api/visual-factory/visual-base.h index 075ef0f,c38720c..2cbb0b7 --- a/dali-toolkit/devel-api/visual-factory/visual-base.h +++ b/dali-toolkit/devel-api/visual-factory/visual-base.h @@@ -76,6 -76,22 +76,22 @@@ public Base& operator=( const Base& handle ); /** + * @brief Set the name of the visual + * + * Used by the styling system to animate properties + * @param[in] name The name to give the visual + */ + void SetName( const std::string& name ); + + /** + * @brief Get the name of the visual + * + * Used by the styling system to animate properties + * @return The name of the visual + */ + const std::string& GetName(); + + /** * @brief Set the size of the painting area. * * @param[in] size The size of the painting area. @@@ -90,15 -106,6 +106,15 @@@ const Vector2& GetSize() const; /** + * @brief Returns the height for a given width. + * + * @param[in] width Width to use. + * + * @return The height based on the width. + */ + float GetHeightForWidth( float width ) const; + + /** * @brief Return the natural size of the visual. * * Deriving classes stipulate the natural size and by default a visual has a ZERO natural size. diff --combined dali-toolkit/internal/file.list index 7514ea5,8437cef..57b4dbf --- a/dali-toolkit/internal/file.list +++ b/dali-toolkit/internal/file.list @@@ -29,8 -29,8 +29,9 @@@ toolkit_src_files = $(toolkit_src_dir)/visuals/primitive/primitive-visual.cpp \ $(toolkit_src_dir)/visuals/svg/svg-rasterize-thread.cpp \ $(toolkit_src_dir)/visuals/svg/svg-visual.cpp \ + $(toolkit_src_dir)/visuals/text/text-visual.cpp \ $(toolkit_src_dir)/visuals/wireframe/wireframe-visual.cpp \ + $(toolkit_src_dir)/visuals/transition-data-impl.cpp \ $(toolkit_src_dir)/controls/alignment/alignment-impl.cpp \ $(toolkit_src_dir)/controls/bloom-view/bloom-view-impl.cpp \ $(toolkit_src_dir)/controls/bubble-effect/bubble-emitter-impl.cpp \ @@@ -107,13 -107,13 +108,13 @@@ $(toolkit_src_dir)/text/property-string-parser.cpp \ $(toolkit_src_dir)/text/segmentation.cpp \ $(toolkit_src_dir)/text/shaper.cpp \ - $(toolkit_src_dir)/text/text-control-interface.cpp \ $(toolkit_src_dir)/text/text-controller.cpp \ $(toolkit_src_dir)/text/text-controller-impl.cpp \ $(toolkit_src_dir)/text/text-effects-style.cpp \ $(toolkit_src_dir)/text/text-font-style.cpp \ $(toolkit_src_dir)/text/text-io.cpp \ $(toolkit_src_dir)/text/text-scroller.cpp \ + $(toolkit_src_dir)/text/text-scroller-data.cpp \ $(toolkit_src_dir)/text/text-scroller-interface.cpp \ $(toolkit_src_dir)/text/text-view.cpp \ $(toolkit_src_dir)/text/text-view-interface.cpp \ diff --combined dali-toolkit/internal/visuals/visual-base-impl.cpp index 86d2114,922f561..48df29a --- a/dali-toolkit/internal/visuals/visual-base-impl.cpp +++ b/dali-toolkit/internal/visuals/visual-base-impl.cpp @@@ -55,7 -55,7 +55,7 @@@ void Visual::Base::SetCustomShader( con } else { - mImpl->mCustomShader = new Impl::CustomShader( shaderMap ); + mImpl->mCustomShader = new Impl::CustomShader( shaderMap ); } } @@@ -74,6 -74,16 +74,16 @@@ void Visual::Base::Initialize( Actor& a DoInitialize( actor, propertyMap ); } + void Visual::Base::SetName( const std::string& name ) + { + mImpl->mName = name; + } + + const std::string& Visual::Base::GetName() + { + return mImpl->mName; + } + void Visual::Base::SetSize( const Vector2& size ) { mImpl->mSize = size; @@@ -84,11 -94,6 +94,11 @@@ const Vector2& Visual::Base::GetSize() return mImpl->mSize; } +float Visual::Base::GetHeightForWidth( float width ) const +{ + return 0.f; +} + void Visual::Base::GetNaturalSize( Vector2& naturalSize ) const { naturalSize = Vector2::ZERO; @@@ -121,7 -126,7 +131,7 @@@ void Visual::Base::SetOnStage( Actor& a void Visual::Base::SetOffStage( Actor& actor ) { - if( GetIsOnStage() ) + if( IsOnStage() ) { DoSetOffStage( actor ); @@@ -129,16 -134,6 +139,16 @@@ } } +void Visual::Base::CreatePropertyMap( Property::Map& map ) const +{ + DoCreatePropertyMap( map ); + + if( mImpl->mCustomShader ) + { + mImpl->mCustomShader->CreatePropertyMap( map ); + } +} + void Visual::Base::EnablePreMultipliedAlpha( bool preMultipled ) { if(preMultipled) @@@ -167,12 -162,22 +177,12 @@@ void Visual::Base::DoSetOffStage( Actor mImpl->mRenderer.Reset(); } -void Visual::Base::CreatePropertyMap( Property::Map& map ) const -{ - DoCreatePropertyMap( map ); - - if( mImpl->mCustomShader ) - { - mImpl->mCustomShader->CreatePropertyMap( map ); - } -} - -bool Visual::Base::GetIsOnStage() const +bool Visual::Base::IsOnStage() const { return mImpl->mFlags & Impl::IS_ON_STAGE; } -bool Visual::Base::GetIsFromCache() const +bool Visual::Base::IsFromCache() const { return mImpl->mFlags & Impl::IS_FROM_CACHE; } diff --combined dali-toolkit/internal/visuals/visual-base-impl.h index 23394ad,5c48c1d..475a5fa --- a/dali-toolkit/internal/visuals/visual-base-impl.h +++ b/dali-toolkit/internal/visuals/visual-base-impl.h @@@ -19,7 -19,6 +19,7 @@@ */ // EXTERNAL INCLUDES +#include #include #include #include @@@ -76,6 -75,16 +76,16 @@@ public void Initialize( Actor& actor, const Property::Map& propertyMap ); /** + * @copydoc Toolkit::Visual::Base::SetName + */ + void SetName( const std::string& name ); + + /** + * @copydoc Toolkit::Visual::Base::GetName + */ + const std::string& GetName(); + + /** * @copydoc Toolkit::Visual::Base::SetSize */ virtual void SetSize( const Vector2& size ); @@@ -86,11 -95,6 +96,11 @@@ const Vector2& GetSize() const; /** + * @copydoc Toolkit::Visual::Base::GetHeightForWidth + */ + virtual float GetHeightForWidth( float width ) const; + + /** * @copydoc Toolkit::Visual::Base::GetNaturalSize */ virtual void GetNaturalSize( Vector2& naturalSize ) const; @@@ -126,7 -130,7 +136,7 @@@ * * @param[in] preMultipled whether alpha is pre-multiplied. */ - void EnablePreMultipliedAlpha( bool preMultipled ); + void EnablePreMultipliedAlpha( bool preMultipled ); /** * @brief Query whether alpha is pre-multiplied. @@@ -200,20 -204,19 +210,20 @@@ protected virtual void DoSetOffStage( Actor& actor ); protected: + /** * @brief Gets the on stage state for this Visual * * @return Returns true if this Visual is on stage, false if it is off the stage */ - bool GetIsOnStage() const; + bool IsOnStage() const; /** * @brief Gets whether the Dali::Renderer is from a shared cache (and therefore any modifications will affect other users of that renderer) * * @return Returns true if the renderer is from shared cache, false otherwise */ - bool GetIsFromCache() const; + bool IsFromCache() const; protected: /** @@@ -247,8 -250,6 +257,8 @@@ protected VisualFactoryCache& mFactoryCache; }; +typedef IntrusivePtr BasePtr; + } // namspace Visual } // namespace Internal diff --combined dali-toolkit/public-api/file.list index 2439b45,96b9818..3734525 --- a/dali-toolkit/public-api/file.list +++ b/dali-toolkit/public-api/file.list @@@ -25,10 -25,10 +25,10 @@@ public_api_src_files = $(public_api_src_dir)/controls/text-controls/text-editor.cpp \ $(public_api_src_dir)/controls/text-controls/text-label.cpp \ $(public_api_src_dir)/controls/text-controls/text-field.cpp \ + $(public_api_src_dir)/controls/video-view/video-view.cpp \ $(public_api_src_dir)/styling/style-manager.cpp \ $(public_api_src_dir)/accessibility-manager/accessibility-manager.cpp \ $(public_api_src_dir)/focus-manager/keyboard-focus-manager.cpp \ - $(public_api_src_dir)/controls/video-view/video-view.cpp \ $(public_api_src_dir)/dali-toolkit-version.cpp \ $(public_api_src_dir)/enums.cpp @@@ -113,5 -113,4 +113,5 @@@ public_api_visuals_header_files = $(public_api_src_dir)/visuals/image-visual-properties.h \ $(public_api_src_dir)/visuals/mesh-visual-properties.h \ $(public_api_src_dir)/visuals/primitive-visual-properties.h \ + $(public_api_src_dir)/visuals/text-visual-properties.h \ $(public_api_src_dir)/visuals/visual-properties.h