From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Thu, 2 Apr 2020 14:46:48 +0000 (+0000)
Subject: Merge "CMake - Option added to define the default toolkit resource path." into devel... 
X-Git-Tag: dali_1.9.6~2
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=d82f43904668532387d5c796aad7aa265d5536d6;hp=-c

Merge "CMake - Option added to define the default toolkit resource path." into devel/master
---

d82f43904668532387d5c796aad7aa265d5536d6
diff --combined dali-toolkit/devel-api/file.list
index 77d3d5e,e1a3a50..219fb28
--- a/dali-toolkit/devel-api/file.list
+++ b/dali-toolkit/devel-api/file.list
@@@ -3,6 -3,7 +3,7 @@@ SET( devel_api_src_dir ${ROOT_SRC_DIR}/
  
  # Add local source files here
  SET( devel_api_src_files
+   ${devel_api_src_dir}/asset-manager/asset-manager.cpp
    ${devel_api_src_dir}/builder/base64-encoding.cpp
    ${devel_api_src_dir}/builder/builder.cpp
    ${devel_api_src_dir}/builder/json-parser.cpp
@@@ -125,7 -126,6 +126,7 @@@ SET( devel_api_visuals_header_file
    ${devel_api_src_dir}/visuals/animated-image-visual-actions-devel.h
    ${devel_api_src_dir}/visuals/animated-vector-image-visual-actions-devel.h
    ${devel_api_src_dir}/visuals/animated-vector-image-visual-signals-devel.h
 +  ${devel_api_src_dir}/visuals/arc-visual-properties-devel.h
    ${devel_api_src_dir}/visuals/color-visual-properties-devel.h
    ${devel_api_src_dir}/visuals/image-visual-properties-devel.h
    ${devel_api_src_dir}/visuals/image-visual-actions-devel.h
diff --combined dali-toolkit/internal/visuals/visual-factory-impl.cpp
index 73c0afc,ca50b77..dc35220
--- a/dali-toolkit/internal/visuals/visual-factory-impl.cpp
+++ b/dali-toolkit/internal/visuals/visual-factory-impl.cpp
@@@ -26,6 -26,7 +26,7 @@@
  #include <dali/devel-api/scripting/scripting.h>
  
  // INTERNAL INCLUDES
+ #include <dali-toolkit/devel-api/asset-manager/asset-manager.h>
  #include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
  #include <dali-toolkit/public-api/visuals/image-visual-properties.h>
  #include <dali-toolkit/public-api/visuals/text-visual-properties.h>
@@@ -42,7 -43,6 +43,7 @@@
  #include <dali-toolkit/internal/visuals/text/text-visual.h>
  #include <dali-toolkit/internal/visuals/animated-image/animated-image-visual.h>
  #include <dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.h>
 +#include <dali-toolkit/internal/visuals/arc/arc-visual.h>
  #include <dali-toolkit/internal/visuals/wireframe/wireframe-visual.h>
  #include <dali-toolkit/internal/visuals/visual-factory-cache.h>
  #include <dali-toolkit/internal/visuals/visual-url.h>
@@@ -74,7 -74,7 +75,7 @@@ BaseHandle Create(
  
  DALI_TYPE_REGISTRATION_BEGIN_CREATE( Toolkit::VisualFactory, Dali::BaseHandle, Create, true )
  DALI_TYPE_REGISTRATION_END()
- const char * const  BROKEN_IMAGE_URL( DALI_IMAGE_DIR "broken.png" ); ///< URL For the broken image
+ const char* const BROKEN_IMAGE_FILE_NAME = "broken.png"; ///< The file name of the broken image.
  
  } // namespace
  
@@@ -95,7 -95,8 +96,8 @@@ void VisualFactory::OnStyleChangedSigna
  {
    if( type == StyleChange::THEME_CHANGE )
    {
-     std::string brokenImageUrl(BROKEN_IMAGE_URL);
+     const std::string imageDirPath = AssetManager::GetDaliImagePath();
+     std::string brokenImageUrl = imageDirPath + BROKEN_IMAGE_FILE_NAME;
  
      Property::Map config = Toolkit::DevelStyleManager::GetConfigurations( styleManager );
      config["brokenImageUrl"].Get( brokenImageUrl );
@@@ -276,12 -277,6 +278,12 @@@ Toolkit::Visual::Base VisualFactory::Cr
        }
        break;
      }
 +
 +    case Toolkit::DevelVisual::ARC:
 +    {
 +      visualPtr = ArcVisual::New( GetFactoryCache(), propertyMap );
 +      break;
 +    }
    }
  
    DALI_LOG_INFO( gLogFilter, Debug::Concise, "VisualFactory::CreateVisual( VisualType:%s %s%s)\n",
@@@ -410,7 -405,9 +412,9 @@@ Internal::VisualFactoryCache& VisualFac
    {
      mFactoryCache = std::unique_ptr<VisualFactoryCache>( new VisualFactoryCache( mPreMultiplyOnLoad ) );
  
-     std::string brokenImageUrl(BROKEN_IMAGE_URL);
+     const std::string imageDirPath = AssetManager::GetDaliImagePath();
+     std::string brokenImageUrl = imageDirPath + BROKEN_IMAGE_FILE_NAME;
+ 
      Toolkit::StyleManager styleManager = Toolkit::StyleManager::Get();
      if( styleManager )
      {