Revert "Rename visual fitting mode property"

This reverts commit 85096f6a37dde26dceebb8fbb218f4f2fc65522e.

Change-Id: Ic46274bfa83cb93657babe03245149dbebb6c522

diff --git a/dali-toolkit/devel-api/visuals/visual-properties-devel.h b/dali-toolkit/devel-api/visuals/visual-properties-devel.h
index ec53128..7839982 100644 (file)
--- a/dali-toolkit/devel-api/visuals/visual-properties-devel.h
+++ b/dali-toolkit/devel-api/visuals/visual-properties-devel.h
@@ -70,7 +70,7 @@ enum Type
    * @see DevelVisual::FittingMode
    * @note The default is defined by the type of visual (if it's suitable to be stretched or not).
    */
-  VISUAL_FITTING_MODE = OPACITY + 1,
+  FITTING_MODE        = OPACITY + 1,
 };
 
 } // namespace Property

diff --git a/dali-toolkit/internal/visuals/visual-base-impl.cpp b/dali-toolkit/internal/visuals/visual-base-impl.cpp
index 8389fc0..1cf6da7 100755 (executable)
--- a/dali-toolkit/internal/visuals/visual-base-impl.cpp
+++ b/dali-toolkit/internal/visuals/visual-base-impl.cpp
@@ -55,10 +55,10 @@ namespace Internal
 namespace
 {
 
-DALI_ENUM_TO_STRING_TABLE_BEGIN( VISUAL_FITTING_MODE )
+DALI_ENUM_TO_STRING_TABLE_BEGIN( FITTING_MODE )
 DALI_ENUM_TO_STRING_WITH_SCOPE( Visual::FittingMode, FIT_KEEP_ASPECT_RATIO  )
 DALI_ENUM_TO_STRING_WITH_SCOPE( Visual::FittingMode, FILL  )
-DALI_ENUM_TO_STRING_TABLE_END( VISUAL_FITTING_MODE )
+DALI_ENUM_TO_STRING_TABLE_END( FITTING_MODE )
 
 } // namespace
 
@@ -116,9 +116,9 @@ void Visual::Base::SetProperties( const Property::Map& propertyMap )
       {
         matchKey = Property::Key( Toolkit::Visual::Property::OPACITY );
       }
-      else if( matchKey == VISUAL_FITTING_MODE )
+      else if( matchKey == FITTING_MODE )
       {
-        matchKey = Property::Key( Toolkit::DevelVisual::Property::VISUAL_FITTING_MODE );
+        matchKey = Property::Key( Toolkit::DevelVisual::Property::FITTING_MODE );
       }
     }
 
@@ -181,10 +181,10 @@ void Visual::Base::SetProperties( const Property::Map& propertyMap )
         }
         break;
       }
-      case Toolkit::DevelVisual::Property::VISUAL_FITTING_MODE:
+      case Toolkit::DevelVisual::Property::FITTING_MODE:
       {
         Scripting::GetEnumerationProperty< Visual::FittingMode >(
-          value, VISUAL_FITTING_MODE_TABLE, VISUAL_FITTING_MODE_TABLE_COUNT, mImpl->mFittingMode );
+          value, FITTING_MODE_TABLE, FITTING_MODE_TABLE_COUNT, mImpl->mFittingMode );
         break;
       }
     }
@@ -318,8 +318,8 @@ void Visual::Base::CreatePropertyMap( Property::Map& map ) const
   map.Insert( Toolkit::Visual::Property::OPACITY, mImpl->mMixColor.a );
 
   auto fittingModeString = Scripting::GetLinearEnumerationName< FittingMode >(
-    mImpl->mFittingMode, VISUAL_FITTING_MODE_TABLE, VISUAL_FITTING_MODE_TABLE_COUNT );
-  map.Insert( Toolkit::DevelVisual::Property::VISUAL_FITTING_MODE, fittingModeString );
+    mImpl->mFittingMode, FITTING_MODE_TABLE, FITTING_MODE_TABLE_COUNT );
+  map.Insert( Toolkit::DevelVisual::Property::FITTING_MODE, fittingModeString );
 }
 
 void Visual::Base::CreateInstancePropertyMap( Property::Map& map ) const

diff --git a/dali-toolkit/internal/visuals/visual-string-constants.cpp b/dali-toolkit/internal/visuals/visual-string-constants.cpp
index ad5b4ae..864dde0 100644 (file)
--- a/dali-toolkit/internal/visuals/visual-string-constants.cpp
+++ b/dali-toolkit/internal/visuals/visual-string-constants.cpp
@@ -73,7 +73,7 @@ const char * const MIX_COLOR( "mixColor" );
 const char * const OPACITY( "opacity" );
 
 // Fitting mode
-const char * const VISUAL_FITTING_MODE( "visualFittingMode" );
+const char * const FITTING_MODE( "fittingMode" );
 
 // Color visual
 const char * const RENDER_IF_TRANSPARENT_NAME( "renderIfTransparent" );

diff --git a/dali-toolkit/internal/visuals/visual-string-constants.h b/dali-toolkit/internal/visuals/visual-string-constants.h
index 89b73a7..88e6c0a 100644 (file)
--- a/dali-toolkit/internal/visuals/visual-string-constants.h
+++ b/dali-toolkit/internal/visuals/visual-string-constants.h
@@ -59,7 +59,7 @@ extern const char * const MIX_COLOR;
 extern const char * const OPACITY;
 
 // Fitting mode
-extern const char * const VISUAL_FITTING_MODE;
+extern const char * const FITTING_MODE;
 
 // Color visual
 extern const char * const RENDER_IF_TRANSPARENT_NAME;