Revert "[Tizen] SVACE issue resolved"

This reverts commit ee96dd22ff6b1bb885c3d350135879ff01267e39.

Change-Id: I4815d7a5df64643c68f1741eaecd1bbac65a95a2

diff --git a/dali-toolkit/internal/styling/style-manager-impl.cpp b/dali-toolkit/internal/styling/style-manager-impl.cpp
index 98596eb318e23fc8ed9ece30720d8661cbbcec14..b38d23b0b815cc5f605086a52b853ebff024558f 100644 (file)
--- a/dali-toolkit/internal/styling/style-manager-impl.cpp
+++ b/dali-toolkit/internal/styling/style-manager-impl.cpp
@@ -34,7 +34,7 @@
 namespace
 {
 
-//const char* LANDSCAPE_QUALIFIER = "landscape";
+const char* LANDSCAPE_QUALIFIER = "landscape";
 const char* PORTRAIT_QUALIFIER  = "portrait";
 const char* FONT_SIZE_QUALIFIER = "fontsize";
 
@@ -295,16 +295,23 @@ bool StyleManager::LoadJSON( Toolkit::Builder builder, const std::string& jsonFi
 static void CollectQualifiers( std::vector<std::string>& qualifiersOut )
 {
   // Append the relevant qualifier for orientation
-  // int orientation = 0; // Get the orientation from the system
-  /*
-  //// To Do /////
-  Getting orientation from the system, and determine Qualifie LANDSCAPE or PORTRAIT
-  orientation  0, 180 : PORTRAIT_QUALIFIER (default)
-  orientation 90, 270 : LANDSCAPE_QUALIFIER
-  */
-
-  qualifiersOut.push_back( std::string( PORTRAIT_QUALIFIER ) );
-
+  int orientation = 0; // Get the orientation from the system
+  switch( orientation )
+  {
+    case 90:
+    case 270:
+    {
+      qualifiersOut.push_back( std::string( LANDSCAPE_QUALIFIER ) );
+      break;
+    }
+    case 180:
+    case 0: // fall through
+    default:
+    {
+      qualifiersOut.push_back( std::string( PORTRAIT_QUALIFIER ) );
+      break;
+    }
+  }
 }
 
 /**

diff --git a/dali-toolkit/internal/visuals/visual-base-impl.cpp b/dali-toolkit/internal/visuals/visual-base-impl.cpp
index 8a6f24b6a2ddadbab31ae6bda54d3096e98bb0d3..c61aeba6b672acb289640aff61adf18bc79f3c40 100644 (file)
--- a/dali-toolkit/internal/visuals/visual-base-impl.cpp
+++ b/dali-toolkit/internal/visuals/visual-base-impl.cpp
@@ -490,11 +490,8 @@ void Visual::Base::AnimateProperty(
   Property::Map map;
   DoCreatePropertyMap( map );
   Property::Value* valuePtr = map.Find( Toolkit::DevelVisual::Property::TYPE );
-  int visualType = -1;
-  if( valuePtr )
-  {
-    valuePtr->Get( visualType );
-  }
+  int visualType;
+  valuePtr->Get(visualType);
 
   if( animator.propertyKey == Toolkit::DevelVisual::Property::MIX_COLOR ||
       animator.propertyKey == MIX_COLOR ||
@@ -512,7 +509,7 @@ void Visual::Base::AnimateProperty(
   }
   else if( mImpl->mRenderer )
   {
-    AnimateRendererProperty( transition, animator );
+    AnimateRendererProperty(transition, animator);
   }
 }