From d4c4ac66b994cc5b186e2bf6ecf1097c7fd7f674 Mon Sep 17 00:00:00 2001 From: Seoyeon Kim Date: Tue, 15 Jan 2019 19:42:50 +0900 Subject: [PATCH] Restore the deprecated property of Actor - One former patch removed some deprecated APIs including a property, "POSITION_INHERITANCE". - But, to keep binary compatibility, the table of Property and the number of properties should be same, even though the properties can be removed. - Instead, Property name changes to RESERVED_PROPERTY_01, not to be used in an application Change-Id: I6d855df42e2d74756f2819ae507e3b637595c796 Signed-off-by: Seoyeon Kim --- dali/devel-api/actors/actor-devel.h | 1 + dali/internal/event/actors/actor-impl.cpp | 1 + dali/public-api/actors/actor.h | 1 + 3 files changed, 3 insertions(+) diff --git a/dali/devel-api/actors/actor-devel.h b/dali/devel-api/actors/actor-devel.h index 074634aea..0378efd02 100644 --- a/dali/devel-api/actors/actor-devel.h +++ b/dali/devel-api/actors/actor-devel.h @@ -73,6 +73,7 @@ enum Type INHERIT_ORIENTATION = Dali::Actor::Property::INHERIT_ORIENTATION, INHERIT_SCALE = Dali::Actor::Property::INHERIT_SCALE, COLOR_MODE = Dali::Actor::Property::COLOR_MODE, + RESERVED_PROPERTY_01 = Dali::Actor::Property::RESERVED_PROPERTY_01, DRAW_MODE = Dali::Actor::Property::DRAW_MODE, SIZE_MODE_FACTOR = Dali::Actor::Property::SIZE_MODE_FACTOR, WIDTH_RESIZE_POLICY = Dali::Actor::Property::WIDTH_RESIZE_POLICY, diff --git a/dali/internal/event/actors/actor-impl.cpp b/dali/internal/event/actors/actor-impl.cpp index 8d923b3db..d2b33c9fa 100644 --- a/dali/internal/event/actors/actor-impl.cpp +++ b/dali/internal/event/actors/actor-impl.cpp @@ -192,6 +192,7 @@ DALI_PROPERTY( "leaveRequired", BOOLEAN, true, false, false, Dali: DALI_PROPERTY( "inheritOrientation", BOOLEAN, true, false, false, Dali::Actor::Property::INHERIT_ORIENTATION ) DALI_PROPERTY( "inheritScale", BOOLEAN, true, false, false, Dali::Actor::Property::INHERIT_SCALE ) DALI_PROPERTY( "colorMode", STRING, true, false, false, Dali::Actor::Property::COLOR_MODE ) +DALI_PROPERTY( "reservedProperty01", STRING, true, false, false, Dali::Actor::Property::RESERVED_PROPERTY_01 ) // This property was removed, but to keep binary compatibility and TypeRegister test app, remain it here. DALI_PROPERTY( "drawMode", STRING, true, false, false, Dali::Actor::Property::DRAW_MODE ) DALI_PROPERTY( "sizeModeFactor", VECTOR3, true, false, false, Dali::Actor::Property::SIZE_MODE_FACTOR ) DALI_PROPERTY( "widthResizePolicy", STRING, true, false, false, Dali::Actor::Property::WIDTH_RESIZE_POLICY ) diff --git a/dali/public-api/actors/actor.h b/dali/public-api/actors/actor.h index d0c2f9885..cd70260dc 100644 --- a/dali/public-api/actors/actor.h +++ b/dali/public-api/actors/actor.h @@ -298,6 +298,7 @@ public: INHERIT_ORIENTATION, ///< name "inheritOrientation", type bool @SINCE_1_0.0 INHERIT_SCALE, ///< name "inheritScale", type bool @SINCE_1_0.0 COLOR_MODE, ///< name "colorMode", type std::string @SINCE_1_0.0 + RESERVED_PROPERTY_01, ///< name "reservedProperty01", This property is removed because it's deprecated. DRAW_MODE, ///< name "drawMode", type std::string @SINCE_1_0.0 SIZE_MODE_FACTOR, ///< name "sizeModeFactor", type Vector3 @SINCE_1_0.0 WIDTH_RESIZE_POLICY, ///< name "widthResizePolicy", type String @SINCE_1_0.0 -- 2.34.1