From: Yoonsang Lee Date: Mon, 23 Mar 2015 11:51:24 +0000 (+0900) Subject: Rename property & function for background image of Control X-Git-Tag: accepted/tizen/common/20150407.101646~10^2 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=0c3c919519ffe6b2872c1dcf76f7c4c84c0f1cee Rename property & function for background image of Control Control::Property::BACKGROUND -> Control::Property::BACKGROUND_IMAGE Control::SetBackground() -> Control::SetBackgroundImage() "background" -> "background-image" Change-Id: I5e077936976ae8cefa21ecb8537d6e10a857bb29 --- diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp index a424aa7..eff8b25 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp @@ -381,7 +381,7 @@ int UtcDaliControlBackgroundImage(void) DALI_TEST_EQUALS( control.GetBackgroundColor(), Color::TRANSPARENT, TEST_LOCATION ); Image image = ResourceImage::New("TestImage"); - control.SetBackground( image ); + control.SetBackgroundImage( image ); DALI_TEST_CHECK( control.GetBackgroundActor() ); DALI_TEST_EQUALS( control.GetBackgroundColor(), Color::WHITE, TEST_LOCATION ); @@ -393,7 +393,7 @@ int UtcDaliControlBackgroundImage(void) DALI_TEST_EQUALS( control.GetBackgroundColor(), Color::TRANSPARENT, TEST_LOCATION ); control.SetBackgroundColor( Color::YELLOW ); - control.SetBackground( image ); + control.SetBackgroundImage( image ); DALI_TEST_CHECK( control.GetBackgroundActor() ); DALI_TEST_EQUALS( control.GetBackgroundColor(), Color::YELLOW, TEST_LOCATION ); @@ -408,7 +408,7 @@ int UtcDaliControlBackgroundProperties(void) DALI_TEST_CHECK( !control.GetBackgroundActor() ); DALI_TEST_EQUALS( control.GetBackgroundColor(), Color::TRANSPARENT, TEST_LOCATION ); DALI_TEST_EQUALS( control.GetProperty( Control::Property::BACKGROUND_COLOR ).Get< Vector4 >(), Color::TRANSPARENT, TEST_LOCATION ); - DALI_TEST_CHECK( control.GetProperty( Control::Property::BACKGROUND ).Get< Property::Map >().Empty() ); + DALI_TEST_CHECK( control.GetProperty( Control::Property::BACKGROUND_IMAGE ).Get< Property::Map >().Empty() ); control.SetProperty( Control::Property::BACKGROUND_COLOR, Color::RED ); DALI_TEST_CHECK( control.GetBackgroundActor() ); @@ -419,22 +419,22 @@ int UtcDaliControlBackgroundProperties(void) imageMap[ "filename" ] = "TestImage"; Property::Map map; map[ "image" ] = imageMap; - control.SetProperty( Control::Property::BACKGROUND, map ); + control.SetProperty( Control::Property::BACKGROUND_IMAGE, map ); DALI_TEST_CHECK( control.GetBackgroundActor() ); DALI_TEST_EQUALS( control.GetBackgroundColor(), Color::RED, TEST_LOCATION ); DALI_TEST_EQUALS( control.GetProperty( Control::Property::BACKGROUND_COLOR ).Get< Vector4 >(), Color::RED, TEST_LOCATION ); - Property::Value propValue = control.GetProperty( Control::Property::BACKGROUND ); + Property::Value propValue = control.GetProperty( Control::Property::BACKGROUND_IMAGE ); DALI_TEST_CHECK( propValue.HasKey( "image" ) ); DALI_TEST_CHECK( propValue.GetValue( "image" ).HasKey( "filename" ) ); DALI_TEST_CHECK( propValue.GetValue( "image" ).GetValue( "filename" ).Get< std::string>() == "TestImage" ); Property::Map emptyMap; - control.SetProperty( Control::Property::BACKGROUND, emptyMap ); + control.SetProperty( Control::Property::BACKGROUND_IMAGE, emptyMap ); DALI_TEST_CHECK( !control.GetBackgroundActor() ); DALI_TEST_EQUALS( control.GetBackgroundColor(), Color::TRANSPARENT, TEST_LOCATION ); DALI_TEST_EQUALS( control.GetProperty( Control::Property::BACKGROUND_COLOR ).Get< Vector4 >(), Color::TRANSPARENT, TEST_LOCATION ); - DALI_TEST_CHECK( control.GetProperty( Control::Property::BACKGROUND ).Get< Property::Map >().Empty() ); + DALI_TEST_CHECK( control.GetProperty( Control::Property::BACKGROUND_IMAGE ).Get< Property::Map >().Empty() ); END_TEST; } diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp index b79badd..7a64f78 100644 --- a/dali-toolkit/public-api/controls/control-impl.cpp +++ b/dali-toolkit/public-api/controls/control-impl.cpp @@ -329,7 +329,7 @@ public: break; } - case Toolkit::Control::Property::BACKGROUND: + case Toolkit::Control::Property::BACKGROUND_IMAGE: { if ( value.HasKey( "image" ) ) { @@ -338,7 +338,7 @@ public: if ( image ) { - controlImpl.SetBackground( image ); + controlImpl.SetBackgroundImage( image ); } } else if ( value.Get< Property::Map >().Empty() ) @@ -413,7 +413,7 @@ public: break; } - case Toolkit::Control::Property::BACKGROUND: + case Toolkit::Control::Property::BACKGROUND_IMAGE: { Property::Map map; @@ -579,12 +579,12 @@ public: // Properties registered without macro to use specific member variables. PropertyRegistration Control::Impl::PROPERTY_1( typeRegistration, "background-color", Toolkit::Control::Property::BACKGROUND_COLOR, Property::VECTOR4, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); -PropertyRegistration Control::Impl::PROPERTY_2( typeRegistration, "background", Toolkit::Control::Property::BACKGROUND, Property::MAP, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); +PropertyRegistration Control::Impl::PROPERTY_2( typeRegistration, "background-image", Toolkit::Control::Property::BACKGROUND_IMAGE, Property::MAP, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); PropertyRegistration Control::Impl::PROPERTY_3( typeRegistration, "width-policy", Toolkit::Control::Property::WIDTH_POLICY, Property::STRING, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); PropertyRegistration Control::Impl::PROPERTY_4( typeRegistration, "height-policy", Toolkit::Control::Property::HEIGHT_POLICY, Property::STRING, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); PropertyRegistration Control::Impl::PROPERTY_5( typeRegistration, "minimum-size", Toolkit::Control::Property::MINIMUM_SIZE, Property::VECTOR3, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); PropertyRegistration Control::Impl::PROPERTY_6( typeRegistration, "maximum-size", Toolkit::Control::Property::MAXIMUM_SIZE, Property::VECTOR3, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); -PropertyRegistration Control::Impl::PROPERTY_7( typeRegistration, "key-input-focus", Toolkit::Control::Property::KEY_INPUT_FOCUS, Property::BOOLEAN, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); +PropertyRegistration Control::Impl::PROPERTY_7( typeRegistration, "key-input-focus", Toolkit::Control::Property::KEY_INPUT_FOCUS, Property::BOOLEAN, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); Toolkit::Control Control::New() { @@ -792,7 +792,7 @@ Vector4 Control::GetBackgroundColor() const return Color::TRANSPARENT; } -void Control::SetBackground( Image image ) +void Control::SetBackgroundImage( Image image ) { Background& background( mImpl->GetBackground() ); diff --git a/dali-toolkit/public-api/controls/control-impl.h b/dali-toolkit/public-api/controls/control-impl.h index a441b07..faf0ccf 100644 --- a/dali-toolkit/public-api/controls/control-impl.h +++ b/dali-toolkit/public-api/controls/control-impl.h @@ -224,9 +224,9 @@ public: Vector4 GetBackgroundColor() const; /** - * @copydoc Dali::Toolkit::Control::SetBackground + * @copydoc Dali::Toolkit::Control::SetBackgroundImage */ - void SetBackground( Image image ); + void SetBackgroundImage( Image image ); /** * @copydoc Dali::Toolkit::Control::ClearBackground diff --git a/dali-toolkit/public-api/controls/control.cpp b/dali-toolkit/public-api/controls/control.cpp index b987ade..255589a 100644 --- a/dali-toolkit/public-api/controls/control.cpp +++ b/dali-toolkit/public-api/controls/control.cpp @@ -159,9 +159,9 @@ Vector4 Control::GetBackgroundColor() const return GetImplementation().GetBackgroundColor(); } -void Control::SetBackground( Image image ) +void Control::SetBackgroundImage( Image image ) { - GetImplementation().SetBackground( image ); + GetImplementation().SetBackgroundImage( image ); } void Control::ClearBackground() diff --git a/dali-toolkit/public-api/controls/control.h b/dali-toolkit/public-api/controls/control.h index af840cd..fd2473a 100644 --- a/dali-toolkit/public-api/controls/control.h +++ b/dali-toolkit/public-api/controls/control.h @@ -83,7 +83,7 @@ public: enum { BACKGROUND_COLOR = PROPERTY_START_INDEX, ///< name "background-color", @see SetBackgroundColor, type Vector4 - BACKGROUND, ///< name "background", @see SetBackground, type Map + BACKGROUND_IMAGE, ///< name "background-image", @see SetBackgroundImage, type Map WIDTH_POLICY, ///< name "width-policy", @see SetSizePolicy, type std::string HEIGHT_POLICY, ///< name "height-policy", @see SetSizePolicy, type std::string MINIMUM_SIZE, ///< name "minimum-size", @see SetMinimumSize, type Vector3 @@ -366,7 +366,7 @@ public: * * @param[in] image The image to set as the background. */ - void SetBackground( Image image ); + void SetBackgroundImage( Image image ); /** * @brief Clears the background.