* [NON-SMACK Targets](#non-smack-targets)
* [SMACK enabled Targets](#smack-enabled-targets)
* [DEBUG Builds](#debug-builds)
+ * [3. Building for MS Windows](#3-building-for-ms-windows)
+ * Build with the Visual Studio project.
+ * Build with CMake.
# Build Instructions
### DEBUG Builds
$ gbs build -A [TARGET_ARCH] --define "%enable_debug 1"
+
+
+## 3. Building for MS Windows
+
+Third party dependencies are built using vcpkg. Instructions on how to install vcpkg can be found in the
+vcpkg-script folder in the windows-dependencies repository.
+
+- Download the windows-dependencies repository from DaliHub
+
+ $ git clone https://github.com/dalihub/windows-dependencies.git
+
+- Read the windows-dependencies/vcpkg-script/Readme.md file for more instructions on how to build and install the third-party dependencies.
+
+### Build with the Visual Studio project
+ Read the windows-dependencies/README.md file for more instructions on how to build and run DALi for MS Windows.
+
+### Build with CMake
+
+ * Requirements
+ It's required the version 3.12.2 of CMake and a Git Bash Shell.
+
+ * Notes and troubleshoting:
+ It should be possible to use the MS Visual studio Developer Command Prompt (https://docs.microsoft.com/en-us/dotnet/framework/tools/developer-command-prompt-for-vs) to build DALi from the command line.
+ However, the CMake version installed with MS Visual Studio 2017 is a bit out of date and some VCPKG modules require a higher version.
+ This instructions have been tested with CMake 3.12.2 on a Git Bash shell.
+
+ * Define an environment variable to set the path to the VCPKG folder
+
+ $ export VCPKG_FOLDER=C:/Users/username/Workspace/VCPKG_TOOL
+
+ * Define an environment variable to set the path where DALi is going to be installed.
+
+ $ export DALI_ENV_FOLDER=C:/Users/username/Workspace/dali-env
+
+ * Execute the following commands to create the makefiles, build and install DALi.
+
+ $ cmake -g Ninja . -DCMAKE_TOOLCHAIN_FILE=$VCPKG_FOLDER/vcpkg/scripts/buildsystems/vcpkg.cmake -DENABLE_PKG_CONFIGURE=OFF -DENABLE_LINK_TEST=OFF -DCMAKE_INSTALL_PREFIX=$DALI_ENV_FOLDER -DINSTALL_CMAKE_MODULES=ON -DUSE_DEFAULT_RESOURCE_DIR=OFF
+ $ cmake --build . --target install
+
+
+ * Options:
+ - CMAKE_TOOLCHAIN_FILE ---> Needed to find packages installed by VCPKG.
+ - ENABLE_PKG_CONFIGURE ---> Whether to install pkg configure files (not currently working on MS Windows. CMake modules used instead).
+ - ENABLE_LINK_TEST ---> Whether to enable the link test (not currently working on MS Windows).
+ - CMAKE_INSTALL_PREFIX ---> Were DALi is installed.
+ - INSTALL_CMAKE_MODULES ---> Whether to install the CMake modules (Used by the CMake command find_package() to find previously installed libraries).
+ - ENABLE_DEBUG ---> Whether to build with debug enabled.
+ - USE_DEFAULT_RESOURCE_DIR ---> Whether to use the default resource folders. Otherwise set environment variables for DALI_IMAGE_DIR, DALI_SOUND_DIR, DALI_STYLE_DIR, DALI_STYLE_IMAGE_DIR and DALI_DATA_READ_ONLY_DIR
const char* TEST_LARGE_IMAGE_FILE_NAME = TEST_RESOURCE_DIR "/tbcol.png";
const char* TEST_IMAGE_FILE_NAME = TEST_RESOURCE_DIR "/gallery-small-1.jpg";
+const char* TEST_SVG_FILE_NAME = TEST_RESOURCE_DIR "/Kid1.svg";
Vector4 GetControlBackgroundColor( Control& control )
{
return color;
}
+bool gResourceReadySignalFired = false;
+
+void ResourceReadySignal( Control control )
+{
+ if( control.GetVisualResourceStatus( Control::Property::BACKGROUND ) == Visual::ResourceStatus::FAILED )
+ {
+ Property::Map propertyMap;
+ propertyMap.Insert( ImageVisual::Property::URL, TEST_SVG_FILE_NAME );
+ control.SetProperty( Control::Property::BACKGROUND, propertyMap );
+ }
+
+ gResourceReadySignalFired = true;
+}
+
} // namespace
///////////////////////////////////////////////////////////////////////////////////////////////////
END_TEST;
}
+int UtcDaliControlResourcesReady02(void)
+{
+ ToolkitTestApplication application;
+ tet_infoline( "Change a resource during ResourceReady callback" );
+
+ gResourceReadySignalFired = false;
+
+ Control control = Control::New();
+ control.SetSize( 200.f, 200.f );
+ control.ResourceReadySignal().Connect( &ResourceReadySignal );
+
+ Property::Map propertyMap;
+ propertyMap.Insert( ImageVisual::Property::URL, "invalid.jpg" );
+ control.SetProperty( Control::Property::BACKGROUND, propertyMap );
+
+ Stage::GetCurrent().Add( control );
+
+ application.SendNotification();
+ application.Render();
+
+ DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+
+ application.SendNotification();
+ application.Render();
+
+ DALI_TEST_EQUALS( control.IsResourceReady(), true, TEST_LOCATION );
+ DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION );
+ gResourceReadySignalFired = false;
+
+ END_TEST;
+}
+
int UtcDaliControlMarginProperty(void)
{
ToolkitTestApplication application;
FIND_PACKAGE( dali-windows-dependencies REQUIRED)
FIND_PACKAGE( dali-core REQUIRED)
FIND_PACKAGE( dali-adaptor REQUIRED)
- FIND_PATH( SYSTEM_INCLUDE_DIR "dali-windows-dependencies.h" )
ENDIF()
+SET( VCPKG_INCLUDE_DIR "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include")
+
# Define non-boolean options to CMake
SET(WITH_STYLE "480x800" CACHE STRING "Select the style folder to use")
# from root/build/tizen, get back to root
SET(ROOT_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../)
+# Deployment folder should come from spec file or command line:
+SET( PREFIX ${CMAKE_INSTALL_PREFIX})
+SET( EXEC_PREFIX ${CMAKE_INSTALL_PREFIX})
+
# Make sure the path is absolute
GET_FILENAME_COMPONENT(ROOT_SRC_DIR ${ROOT_SRC_DIR} ABSOLUTE)
ENDIF()
# Set up compiler definitions
+
IF(CMAKE_BUILD_TYPE MATCHES Debug)
- MESSAGE( STATUS "CMAKE_BUILD_TYPE: " Debug )
SET( ENABLE_DEBUG ON )
-ELSE()
- MESSAGE( STATUS "CMAKE_BUILD_TYPE: " Release )
ENDIF()
IF( ENABLE_DEBUG )
+ MESSAGE( STATUS "CMAKE_BUILD_TYPE: " Debug )
ADD_DEFINITIONS( "-DDEBUG_ENABLED" )
SET( ENABLE_EXPORTALL ON )
-ENDIF( ENABLE_DEBUG )
+ELSE()
+ MESSAGE( STATUS "CMAKE_BUILD_TYPE: " Release )
+ENDIF()
IF( ENABLE_I18N )
ADD_DEFINITIONS( "-DDGETTEXT_ENABLED" )
ENDIF( ENABLE_I18N )
-IF( SET_VCPKG_INSTALL_PREFIX )
+IF( WIN32 )
ADD_DEFINITIONS( "-DBUILDING_DALI_TOOLKIT" )
+
IF( USE_DEFAULT_RESOURCE_DIR )
- ADD_DEFINITIONS( -DDALI_IMAGE_DIR=\"${VCPKG_INSTALLED_DIR}/share/dali/toolkit/images/\"
- -DDALI_SOUND_DIR=\"${VCPKG_INSTALLED_DIR}/share/dali/toolkit/sounds/\"
- -DDALI_STYLE_DIR=\"${VCPKG_INSTALLED_DIR}/share/dali/toolkit/styles/\"
- -DDALI_STYLE_IMAGE_DIR=\"${VCPKG_INSTALLED_DIR}/share/dali/toolkit/styles/images/\"
- -DDALI_DATA_READ_ONLY_DIR=\"${VCPKG_INSTALLED_DIR}/share/\" )
+ SET( INSTALL_SHARE_DIR "${PREFIX}/share" )
+ IF( VCPKG_TOOLKIT_BUILD )
+ SET( INSTALL_SHARE_DIR "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/share" )
+ ENDIF()
+
+ ADD_DEFINITIONS( -DDALI_IMAGE_DIR=\"${INSTALL_SHARE_DIR}/dali/toolkit/images/\"
+ -DDALI_SOUND_DIR=\"${INSTALL_SHARE_DIR}/dali/toolkit/sounds/\"
+ -DDALI_STYLE_DIR=\"${INSTALL_SHARE_DIR}/dali/toolkit/styles/\"
+ -DDALI_STYLE_IMAGE_DIR=\"${INSTALL_SHARE_DIR}/dali/toolkit/styles/images/\"
+ -DDALI_DATA_READ_ONLY_DIR=\"${INSTALL_SHARE_DIR}/\" )
ENDIF()
-ELSE()
+ELSEIF( UNIX )
ADD_DEFINITIONS(-DPIC -DSTDC_HEADERS)
IF( USE_DEFAULT_RESOURCE_DIR )
ADD_DEFINITIONS( -DDALI_IMAGE_DIR=\"${dataReadOnlyDir}/toolkit/images/\"
ENDIF("${ARCH}" STREQUAL "arm")
IF( NOT ${ENABLE_EXPORTALL} )
- ADD_DEFINITIONS( "-fvisibility=hidden -DHIDE_DALI_INTERNALS" )
+ ADD_DEFINITIONS( "-DHIDE_DALI_INTERNALS" )
ENDIF( NOT ${ENABLE_EXPORTALL} )
ENDIF()
SET( ENABLE_VECTOR_BASED_TEXT_RENDERING 1 )
ENDIF()
-# Deployment folder should come from spec file or command line:
-SET( PREFIX ${CMAKE_INSTALL_PREFIX})
-SET( EXEC_PREFIX ${CMAKE_INSTALL_PREFIX})
-
# Set paths
SET( toolkit_images_dir ${ROOT_SRC_DIR}/dali-toolkit/styles/images-common )
SET( toolkit_sounds_dir ${ROOT_SRC_DIR}/dali-toolkit/sounds )
ENDIF()
# Set up the lib dir
-IF( SET_VCPKG_INSTALL_PREFIX )
+SET( LIB_DIR $ENV{libdir} )
+IF( NOT LIB_DIR )
+ SET( LIB_DIR ${CMAKE_INSTALL_LIBDIR} )
+ENDIF()
+IF( NOT LIB_DIR )
SET( LIB_DIR ${PREFIX}/lib )
+ENDIF()
+
+# Set up the bin dir
+SET( BIN_DIR $ENV{bindir} )
+IF( NOT BIN_DIR )
+ SET( BIN_DIR ${CMAKE_INSTALL_BINDIR} )
+ENDIF()
+IF( NOT BIN_DIR )
SET( BIN_DIR ${PREFIX}/bin )
-ELSE()
- SET( LIB_DIR $ENV{libdir} )
- IF( NOT LIB_DIR )
- SET( LIB_DIR ${CMAKE_INSTALL_LIBDIR} )
- ENDIF()
- IF( NOT LIB_DIR )
- SET( LIB_DIR ${PREFIX}/lib )
- ENDIF()
ENDIF()
IF( ENABLE_PKG_CONFIGURE )
IF( WIN32 )
ADD_COMPILE_OPTIONS( /FIdali-windows-dependencies.h ) # Adds missing definitions.
ADD_COMPILE_OPTIONS( /vmg ) # Avoids a 'reinterpret_cast' compile error while compiling signals and callbacks.
+ ADD_COMPILE_OPTIONS( /wd4251 ) # Ignores warning C4251: "'identifier' : class 'type' needs to have dll-interface to be used by clients of class 'type2'"
ELSE()
# Set up compiler flags and warnings
ADD_COMPILE_OPTIONS( -std=c++11 )
SET(ENABLE_COVERAGE ON)
SET(COVERAGE --coverage)
ENDIF()
+
+ IF( NOT ${ENABLE_EXPORTALL} )
+ ADD_COMPILE_OPTIONS( "-fvisibility=hidden" )
+ ENDIF( NOT ${ENABLE_EXPORTALL} )
ENDIF()
INCLUDE_DIRECTORIES(
- ${SYSTEM_INCLUDE_DIR}
${ROOT_SRC_DIR}
${DALICORE_INCLUDE_DIRS}
${DALIADAPTOR_INCLUDE_DIRS}
+ ${VCPKG_INCLUDE_DIR}
+ ${INCLUDE_DIR}
)
SET(SOURCE_DIR "${ROOT_SRC_DIR}/dali")
FIND_PACKAGE( jpeg REQUIRED )
FIND_LIBRARY( TURBO_JPEG_LIBRARY NAMES turbojpeg )
- FIND_PACKAGE( fontconfig REQUIRED )
+ FIND_PACKAGE( unofficial-fontconfig REQUIRED )
FIND_PACKAGE( freetype REQUIRED )
FIND_PACKAGE( harfbuzz REQUIRED )
FIND_LIBRARY( FRIBIDI_LIBRARY NAMES fribidi )
CLEAN_DIRECT_OUPUT 1
)
-# Install the library so file and symlinks
IF( INSTALL_CMAKE_MODULES )
+ IF( ENABLE_DEBUG )
+ SET( BIN_DIR "${BIN_DIR}/debug" )
+ SET( LIB_DIR "${LIB_DIR}/debug" )
+ ENDIF()
+
+ # Install the library files.
INSTALL( TARGETS ${name}
EXPORT ${name}-targets
LIBRARY DESTINATION ${LIB_DIR}
RUNTIME DESTINATION ${BIN_DIR}
)
+ # Install the cmake modules.
INSTALL(
EXPORT ${name}-targets
NAMESPACE ${name}::
include(\${CMAKE_CURRENT_LIST_DIR}/${name}-targets.cmake)
")
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${name}-config.cmake DESTINATION share/${name})
+
+ # Install the pdb file.
+ IF( ENABLE_DEBUG )
+ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/Debug/${name}.pdb DESTINATION ${BIN_DIR} )
+ ENDIF()
ELSE()
+ # Install the library so file and symlinks
INSTALL( TARGETS ${name} DESTINATION ${LIB_DIR} )
ENDIF()
MESSAGE( STATUS "Configure automated tests: " ${CONFIGURE_AUTOMATED_TESTS} )
MESSAGE( STATUS "CXXFLAGS: " ${CMAKE_CXX_FLAGS} )
MESSAGE( STATUS "LDFLAGS: " ${CMAKE_SHARED_LINKER_FLAGS_INIT}${CMAKE_SHARED_LINKER_FLAGS} )
+
+MESSAGE( " Folder INSTALL_SHARE_DIR : [" ${INSTALL_SHARE_DIR} "]" )
+MESSAGE( " Folder DALI_IMAGE_DIR : [" ${DALI_IMAGE_DIR} "]" )
+MESSAGE( " Folder DALI_STYLE_DIR : [" ${DALI_STYLE_DIR} "]" )
+MESSAGE( " Folder DALI_STYLE_IMAGE_DIR : [" ${DALI_STYLE_IMAGE_DIR} "]" )
+MESSAGE( " Folder DALI_SOUND_DIR : [" ${DALI_SOUND_DIR} "]" )
+MESSAGE( " Folder DALI_DATA_READ_ONLY_DIR : [" ${DALI_DATA_READ_ONLY_DIR} "]" )
const std::string AssetManager::GetDaliImagePath()
{
+ /**
+ * @note DALI_IMAGE_DIR is a macro that can be defined either with a file system path or zero.
+ * If it's defined as zero then the value is retrieved from an environment variable
+ * named DALI_IMAGE_DIR.
+ */
return (nullptr == DALI_IMAGE_DIR) ? EnvironmentVariable::GetEnvironmentVariable(TOKEN_STRING(DALI_IMAGE_DIR)) : DALI_IMAGE_DIR;
}
const std::string AssetManager::GetDaliSoundPath()
{
+ /**
+ * @note DALI_SOUND_DIR is a macro that can be defined either with a file system path or zero.
+ * If it's defined as zero then the value is retrieved from an environment variable
+ * named DALI_SOUND_DIR.
+ */
return (nullptr == DALI_SOUND_DIR) ? EnvironmentVariable::GetEnvironmentVariable(TOKEN_STRING(DALI_SOUND_DIR)) : DALI_SOUND_DIR;
}
const std::string AssetManager::GetDaliStylePath()
{
+ /**
+ * @note DALI_STYLE_DIR is a macro that can be defined either with a file system path or zero.
+ * If it's defined as zero then the value is retrieved from an environment variable
+ * named DALI_STYLE_DIR.
+ */
return (nullptr == DALI_STYLE_DIR) ? EnvironmentVariable::GetEnvironmentVariable(TOKEN_STRING(DALI_STYLE_DIR)) : DALI_STYLE_DIR;
}
const std::string AssetManager::GetDaliStyleImagePath()
{
+ /**
+ * @note DALI_STYLE_IMAGE_DIR is a macro that can be defined either with a file system path or zero.
+ * If it's defined as zero then the value is retrieved from an environment variable
+ * named DALI_STYLE_IMAGE_DIR.
+ */
return (nullptr == DALI_STYLE_IMAGE_DIR) ? EnvironmentVariable::GetEnvironmentVariable(TOKEN_STRING(DALI_STYLE_IMAGE_DIR)) : DALI_STYLE_IMAGE_DIR;
}
const std::string AssetManager::GetDaliDataReadOnlyPath()
{
+ /**
+ * @note DALI_DATA_READ_ONLY_DIR is a macro that can be defined either with a file system path or zero.
+ * If it's defined as zero then the value is retrieved from an environment variable
+ * named DALI_DATA_READ_ONLY_DIR.
+ */
return (nullptr == DALI_DATA_READ_ONLY_DIR) ? EnvironmentVariable::GetEnvironmentVariable(TOKEN_STRING(DALI_DATA_READ_ONLY_DIR)) : DALI_DATA_READ_ONLY_DIR;
}
namespace Toolkit
{
+/**
+ * @brief Retrieves the file system path of the assets.
+ */
class AssetManager
{
public:
+ /**
+ * @return The file system path of the images.
+ */
static const std::string GetDaliImagePath();
+
+ /**
+ * @return The file system path of the sounds.
+ */
static const std::string GetDaliSoundPath();
+
+ /**
+ * @return The file system path of the styles.
+ */
static const std::string GetDaliStylePath();
+
+ /**
+ * @return The file system path of the images in the styles.
+ */
static const std::string GetDaliStyleImagePath();
+
+ /**
+ * @return The file system path of the DALi's read only data.
+ */
static const std::string GetDaliDataReadOnlyPath();
};
DALI_LOG_INFO( gTextureManagerLogFilter, Debug::Concise, "NotifyObservers() url:%s loadState:%s\n",
textureInfo.url.GetUrl().c_str(), GET_LOAD_STATE_STRING(textureInfo.loadState ) );
+ // It is possible for the observer to be deleted.
+ // Disconnect and remove the observer first.
+ observer->DestructionSignal().Disconnect( this, &TextureManager::ObserverDestroyed );
+
+ info->observerList.Erase( info->observerList.begin() );
+
if( info->loadPixelBuffer )
{
observer->LoadComplete( success, info->pixelBuffer, info->url, info->preMultiplied );
info->preMultiplied );
}
- observer->DestructionSignal().Disconnect( this, &TextureManager::ObserverDestroyed );
-
// Get the textureInfo from the container again as it may have been invalidated.
int textureInfoIndex = GetCacheIndexFromId( textureId );
if( textureInfoIndex == INVALID_CACHE_INDEX)
break; // texture has been removed - can stop.
}
info = &mTextureInfoContainer[ textureInfoIndex ];
-
- // remove the observer that was just triggered if it's still in the list
- for( TextureInfo::ObserverListType::Iterator j = info->observerList.Begin(); j != info->observerList.End(); ++j )
- {
- if( *j == observer )
- {
- info->observerList.Erase( j );
- break;
- }
- }
}
mQueueLoadFlag = false;
#include <dali-toolkit/public-api/enums.h>
#include <dali-toolkit/public-api/controls/control.h>
+#undef min
+#undef max
+
namespace Dali
{
const unsigned int TOOLKIT_MAJOR_VERSION = 1;
const unsigned int TOOLKIT_MINOR_VERSION = 9;
-const unsigned int TOOLKIT_MICRO_VERSION = 7;
+const unsigned int TOOLKIT_MICRO_VERSION = 8;
const char * const TOOLKIT_BUILD_DATE = __DATE__ " " __TIME__;
#ifdef DEBUG_ENABLED
},
"TextField":
{
- "pointSize":18,
- "primaryCursorColor":[0.0,0.72,0.9,1.0],
- "secondaryCursorColor":[0.0,0.72,0.9,1.0],
+ "pointSize":10,
+ "primaryCursorColor":[0.07,0.70,1.0,1.0],
+ "secondaryCursorColor":[0.07,0.70,1.0,1.0],
"cursorWidth":3,
"selectionHighlightColor":[0.75,0.96,1.0,1.0],
"grabHandleImage" : "{DALI_STYLE_IMAGE_DIR}cursor_handler_drop_center.png",
"selectionHandleImageLeft" : {"filename":"{DALI_STYLE_IMAGE_DIR}selection_handle_drop_left.png" },
"selectionHandleImageRight": {"filename":"{DALI_STYLE_IMAGE_DIR}selection_handle_drop_right.png" },
- "enableSelection":true
+ "enableSelection":true,
+ "textColor":[0.99,0.99,0.99,1.0],
+ "background": {
+ "visualType": "COLOR",
+ "mixColor":[0.0,0.0,0.0,1.0]
+ },
+ "textBackground":[0.0,0.0,0.0,1.0]
},
"TextFieldFontSize0":
Name: dali-toolkit
Summary: Dali 3D engine Toolkit
-Version: 1.9.7
+Version: 1.9.8
Release: 1
Group: System/Libraries
License: Apache-2.0 and BSD-3-Clause and MIT
projects / platform / core / uifw / dali-toolkit.git / commitdiff