[Tizen] Add codes for Dali Windows Backend

This reverts commit a7e5f33b07154daf0e9f51462beeb347566c79c0.

Change-Id: If21b76fdde3467cc8da1ea588f7b3ddac59dcfe7

diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100755 (executable)
index 0000000..291e168
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,300 @@
+cmake_minimum_required(VERSION 3.11)\r
+\r
+if (WIN32)\r
+\r
+PROJECT (dali-toolkit)\r
+\r
+ADD_DEFINITIONS(\r
+-DSTYLE_DIR="${dali_SOURCE_DIR}/dali-env/opt/share/com.samsung.dali-demo/res/style/"\r
+-DDALI_DATA_READ_ONLY_DIR="${dali_SOURCE_DIR}/dali-env/opt/share/dali"\r
+-DDALI_IMAGE_DIR=DALI_DATA_READ_ONLY_DIR"/toolkit/images/"\r
+-DDALI_STYLE_DIR="${dali_SOURCE_DIR}/dali-env/opt/share/dali/toolkit/styles/"\r
+-DDALI_SOUND_DIR=DALI_DATA_READ_ONLY_DIR"/toolkit/sounds/"\r
+-DDALI_STYLE_IMAGE_DIR=DALI_DATA_READ_ONLY_DIR"/toolkit/styles/images/"\r
+-DAPPLICATION_RESOURCE_PATH="${dali_SOURCE_DIR}/dali-env/opt/share/com.samsung.dali-demo/res"\r
+-DCURL_STATICLIB=0\r
+/DBUILDING_DALI_TOOLKIT\r
+/vmg\r
+/NODEFAULTLIB:"libcmt.lib"\r
+/FI"${dali_SOURCE_DIR}/dali-adaptor/dali-windows-backend/ExInclude/PreprocessorDefinitions.h"\r
+/FI"${dali_SOURCE_DIR}/dali-adaptor/dali-windows-backend/ExInclude/ToolKitPreDefine.h"\r
+/MP\r
+)\r
+\r
+#head file path\r
+INCLUDE_DIRECTORIES(  \r
+./\r
+${dali_SOURCE_DIR}/dali-core\r
+${dali_SOURCE_DIR}/dali-adaptor\r
+${dali_SOURCE_DIR}/dali-adaptor/dali-windows-backend/ExInclude\r
+${dali_SOURCE_DIR}/dali-env/opt/include\r
+)\r
+\r
+#devel-api\r
+SET( devel_api_src_dir dali-toolkit/devel-api )\r
+\r
+SET ( SOURCES ${SOURCES}\r
+  ${devel_api_src_dir}/builder/builder.cpp\r
+  ${devel_api_src_dir}/builder/json-parser.cpp\r
+  ${devel_api_src_dir}/builder/tree-node.cpp\r
+  ${devel_api_src_dir}/controls/control-devel.cpp\r
+  ${devel_api_src_dir}/controls/control-wrapper.cpp\r
+  ${devel_api_src_dir}/controls/control-wrapper-impl.cpp\r
+  ${devel_api_src_dir}/controls/bloom-view/bloom-view.cpp\r
+  ${devel_api_src_dir}/controls/bubble-effect/bubble-emitter.cpp\r
+  ${devel_api_src_dir}/controls/buttons/toggle-button.cpp\r
+  ${devel_api_src_dir}/controls/effects-view/effects-view.cpp\r
+  ${devel_api_src_dir}/controls/magnifier/magnifier.cpp\r
+  ${devel_api_src_dir}/controls/navigation-view/navigation-view.cpp\r
+  ${devel_api_src_dir}/controls/page-turn-view/page-turn-landscape-view.cpp\r
+  ${devel_api_src_dir}/controls/page-turn-view/page-turn-portrait-view.cpp\r
+  ${devel_api_src_dir}/controls/page-turn-view/page-turn-view.cpp\r
+  ${devel_api_src_dir}/controls/popup/confirmation-popup.cpp\r
+  ${devel_api_src_dir}/controls/popup/popup.cpp\r
+  ${devel_api_src_dir}/controls/shadow-view/shadow-view.cpp\r
+  ${devel_api_src_dir}/controls/super-blur-view/super-blur-view.cpp\r
+  ${devel_api_src_dir}/controls/text-controls/text-editor-devel.cpp\r
+  ${devel_api_src_dir}/controls/text-controls/text-field-devel.cpp\r
+  ${devel_api_src_dir}/controls/text-controls/text-selection-popup.cpp\r
+  ${devel_api_src_dir}/controls/text-controls/text-selection-toolbar.cpp\r
+  ${devel_api_src_dir}/controls/tool-bar/tool-bar.cpp\r
+  ${devel_api_src_dir}/focus-manager/keyinput-focus-manager.cpp\r
+  ${devel_api_src_dir}/focus-manager/keyboard-focus-manager-devel.cpp\r
+  ${devel_api_src_dir}/image-loader/async-image-loader-devel.cpp\r
+  ${devel_api_src_dir}/image-loader/atlas-upload-observer.cpp\r
+  ${devel_api_src_dir}/image-loader/image-atlas.cpp\r
+  ${devel_api_src_dir}/image-loader/texture-manager.cpp\r
+  ${devel_api_src_dir}/scripting/script.cpp\r
+  ${devel_api_src_dir}/styling/style-manager-devel.cpp\r
+  ${devel_api_src_dir}/transition-effects/cube-transition-cross-effect.cpp\r
+  ${devel_api_src_dir}/transition-effects/cube-transition-effect.cpp\r
+  ${devel_api_src_dir}/transition-effects/cube-transition-fold-effect.cpp\r
+  ${devel_api_src_dir}/transition-effects/cube-transition-wave-effect.cpp\r
+  ${devel_api_src_dir}/visual-factory/transition-data.cpp\r
+  ${devel_api_src_dir}/visual-factory/visual-factory.cpp\r
+  ${devel_api_src_dir}/visual-factory/visual-base.cpp\r
+  ${devel_api_src_dir}/controls/gaussian-blur-view/gaussian-blur-view.cpp\r
+)\r
+\r
+#internal\r
+SET(internal_src_dir dali-toolkit/internal )\r
+\r
+SET( SOURCES ${SOURCES}\r
+   ${internal_src_dir}/builder/builder-animations.cpp\r
+   ${internal_src_dir}/builder/builder-impl.cpp\r
+   ${internal_src_dir}/builder/builder-impl-debug.cpp\r
+   ${internal_src_dir}/builder/builder-set-property.cpp\r
+   ${internal_src_dir}/builder/builder-signals.cpp\r
+   ${internal_src_dir}/builder/json-parser-state.cpp\r
+   ${internal_src_dir}/builder/json-parser-impl.cpp\r
+   ${internal_src_dir}/builder/style.cpp\r
+   ${internal_src_dir}/builder/tree-node-manipulator.cpp\r
+   ${internal_src_dir}/builder/replacement.cpp\r
+   ${internal_src_dir}/visuals/animated-image/animated-image-visual.cpp\r
+   ${internal_src_dir}/visuals/animated-image/image-cache.cpp\r
+   ${internal_src_dir}/visuals/animated-image/fixed-image-cache.cpp\r
+   ${internal_src_dir}/visuals/animated-image/rolling-image-cache.cpp\r
+   ${internal_src_dir}/visuals/animated-image/rolling-gif-image-cache.cpp\r
+   ${internal_src_dir}/visuals/border/border-visual.cpp\r
+   ${internal_src_dir}/visuals/color/color-visual.cpp\r
+   ${internal_src_dir}/visuals/gradient/gradient-visual.cpp\r
+   ${internal_src_dir}/visuals/gradient/gradient.cpp\r
+   ${internal_src_dir}/visuals/gradient/linear-gradient.cpp\r
+   ${internal_src_dir}/visuals/gradient/radial-gradient.cpp\r
+   ${internal_src_dir}/visuals/animated-gradient/animated-gradient-visual.cpp\r
+   ${internal_src_dir}/visuals/image-atlas-manager.cpp\r
+   ${internal_src_dir}/visuals/image/image-visual.cpp\r
+   ${internal_src_dir}/visuals/mesh/mesh-visual.cpp\r
+   ${internal_src_dir}/visuals/npatch-loader.cpp\r
+   ${internal_src_dir}/visuals/npatch/npatch-visual.cpp\r
+   ${internal_src_dir}/visuals/primitive/primitive-visual.cpp\r
+   ${internal_src_dir}/visuals/svg/svg-rasterize-thread.cpp\r
+   ${internal_src_dir}/visuals/svg/svg-visual.cpp\r
+   ${internal_src_dir}/visuals/text/text-visual.cpp\r
+   ${internal_src_dir}/visuals/transition-data-impl.cpp\r
+   ${internal_src_dir}/visuals/texture-manager-impl.cpp\r
+   ${internal_src_dir}/visuals/texture-upload-observer.cpp\r
+   ${internal_src_dir}/visuals/visual-base-data-impl.cpp\r
+   ${internal_src_dir}/visuals/visual-base-impl.cpp\r
+   ${internal_src_dir}/visuals/visual-factory-cache.cpp\r
+   ${internal_src_dir}/visuals/visual-factory-impl.cpp\r
+   ${internal_src_dir}/visuals/visual-string-constants.cpp\r
+   ${internal_src_dir}/visuals/visual-url.cpp\r
+   ${internal_src_dir}/visuals/wireframe/wireframe-visual.cpp\r
+   ${internal_src_dir}/controls/alignment/alignment-impl.cpp\r
+   ${internal_src_dir}/controls/bloom-view/bloom-view-impl.cpp\r
+   ${internal_src_dir}/controls/bubble-effect/bubble-emitter-impl.cpp\r
+   ${internal_src_dir}/controls/bubble-effect/bubble-renderer.cpp\r
+   ${internal_src_dir}/controls/buttons/button-impl.cpp\r
+   ${internal_src_dir}/controls/buttons/check-box-button-impl.cpp\r
+   ${internal_src_dir}/controls/buttons/push-button-impl.cpp\r
+   ${internal_src_dir}/controls/buttons/radio-button-impl.cpp\r
+   ${internal_src_dir}/controls/buttons/toggle-button-impl.cpp\r
+   ${internal_src_dir}/controls/control/control-data-impl.cpp\r
+   ${internal_src_dir}/controls/control/control-debug.cpp\r
+   ${internal_src_dir}/controls/effects-view/effects-view-impl.cpp\r
+   ${internal_src_dir}/controls/flex-container/flex-container-impl.cpp\r
+   ${internal_src_dir}/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp\r
+   ${internal_src_dir}/controls/image-view/image-view-impl.cpp\r
+   ${internal_src_dir}/controls/magnifier/magnifier-impl.cpp\r
+   ${internal_src_dir}/controls/navigation-view/navigation-view-impl.cpp\r
+   ${internal_src_dir}/controls/popup/confirmation-popup-impl.cpp\r
+   ${internal_src_dir}/controls/model3d-view/model3d-view-impl.cpp\r
+   ${internal_src_dir}/controls/model3d-view/obj-loader.cpp\r
+   ${internal_src_dir}/controls/popup/popup-impl.cpp\r
+   ${internal_src_dir}/controls/page-turn-view/page-turn-portrait-view-impl.cpp\r
+   ${internal_src_dir}/controls/page-turn-view/page-turn-effect.cpp\r
+   ${internal_src_dir}/controls/page-turn-view/page-turn-landscape-view-impl.cpp\r
+   ${internal_src_dir}/controls/page-turn-view/page-turn-view-impl.cpp\r
+   ${internal_src_dir}/controls/progress-bar/progress-bar-impl.cpp\r
+   ${internal_src_dir}/controls/scroll-bar/scroll-bar-impl.cpp\r
+   ${internal_src_dir}/controls/scrollable/bouncing-effect-actor.cpp\r
+   ${internal_src_dir}/controls/scrollable/item-view/depth-layout.cpp\r
+   ${internal_src_dir}/controls/scrollable/item-view/grid-layout.cpp\r
+   ${internal_src_dir}/controls/scrollable/item-view/item-view-impl.cpp\r
+   ${internal_src_dir}/controls/scrollable/item-view/spiral-layout.cpp\r
+   ${internal_src_dir}/controls/scrollable/scrollable-impl.cpp\r
+   ${internal_src_dir}/controls/scrollable/scroll-view/scroll-base-impl.cpp\r
+   ${internal_src_dir}/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.cpp\r
+   ${internal_src_dir}/controls/scrollable/scroll-view/scroll-view-effect-impl.cpp\r
+   ${internal_src_dir}/controls/scrollable/scroll-view/scroll-view-impl.cpp\r
+   ${internal_src_dir}/controls/scrollable/scroll-view/scroll-view-page-path-effect-impl.cpp\r
+   ${internal_src_dir}/controls/shadow-view/shadow-view-impl.cpp\r
+   ${internal_src_dir}/controls/slider/slider-impl.cpp\r
+   ${internal_src_dir}/controls/super-blur-view/super-blur-view-impl.cpp\r
+   ${internal_src_dir}/controls/table-view/table-view-impl.cpp\r
+   ${internal_src_dir}/controls/text-controls/text-editor-impl.cpp\r
+   ${internal_src_dir}/controls/text-controls/text-field-impl.cpp\r
+   ${internal_src_dir}/controls/text-controls/text-label-impl.cpp\r
+   ${internal_src_dir}/controls/text-controls/text-selection-popup-impl.cpp\r
+   ${internal_src_dir}/controls/text-controls/text-selection-toolbar-impl.cpp\r
+   ${internal_src_dir}/controls/tool-bar/tool-bar-impl.cpp\r
+   ${internal_src_dir}/controls/tooltip/tooltip.cpp\r
+   ${internal_src_dir}/controls/video-view/video-view-impl.cpp\r
+   ${internal_src_dir}/accessibility-manager/accessibility-manager-impl.cpp\r
+   ${internal_src_dir}/feedback/feedback-style.cpp\r
+   ${internal_src_dir}/focus-manager/keyboard-focus-manager-impl.cpp\r
+   ${internal_src_dir}/focus-manager/keyinput-focus-manager-impl.cpp\r
+   ${internal_src_dir}/helpers/color-conversion.cpp\r
+   ${internal_src_dir}/helpers/property-helper.cpp\r
+   ${internal_src_dir}/filters/blur-two-pass-filter.cpp\r
+   ${internal_src_dir}/filters/emboss-filter.cpp\r
+   ${internal_src_dir}/filters/image-filter.cpp\r
+   ${internal_src_dir}/filters/spread-filter.cpp\r
+   ${internal_src_dir}/image-loader/async-image-loader-impl.cpp\r
+   ${internal_src_dir}/image-loader/atlas-packer.cpp\r
+   ${internal_src_dir}/image-loader/image-atlas-impl.cpp\r
+   ${internal_src_dir}/image-loader/image-load-thread.cpp\r
+   ${internal_src_dir}/styling/style-manager-impl.cpp\r
+   ${internal_src_dir}/text/bidirectional-support.cpp\r
+   ${internal_src_dir}/text/character-set-conversion.cpp\r
+   ${internal_src_dir}/text/color-segmentation.cpp\r
+   ${internal_src_dir}/text/cursor-helper-functions.cpp\r
+   ${internal_src_dir}/text/glyph-metrics-helper.cpp\r
+   ${internal_src_dir}/text/logical-model-impl.cpp\r
+   ${internal_src_dir}/text/markup-processor.cpp\r
+   ${internal_src_dir}/text/markup-processor-color.cpp\r
+   ${internal_src_dir}/text/markup-processor-font.cpp\r
+   ${internal_src_dir}/text/markup-processor-helper-functions.cpp\r
+   ${internal_src_dir}/text/multi-language-support.cpp\r
+   ${internal_src_dir}/text/hidden-text.cpp\r
+   ${internal_src_dir}/text/property-string-parser.cpp\r
+   ${internal_src_dir}/text/segmentation.cpp\r
+   ${internal_src_dir}/text/shaper.cpp\r
+   ${internal_src_dir}/text/text-enumerations-impl.cpp\r
+   ${internal_src_dir}/text/text-controller.cpp\r
+   ${internal_src_dir}/text/text-controller-impl.cpp\r
+   ${internal_src_dir}/text/text-effects-style.cpp\r
+   ${internal_src_dir}/text/text-font-style.cpp\r
+   ${internal_src_dir}/text/text-io.cpp\r
+   ${internal_src_dir}/text/text-model.cpp\r
+   ${internal_src_dir}/text/text-scroller.cpp\r
+   ${internal_src_dir}/text/text-vertical-scroller.cpp\r
+   ${internal_src_dir}/text/text-view.cpp\r
+   ${internal_src_dir}/text/text-view-interface.cpp\r
+   ${internal_src_dir}/text/visual-model-impl.cpp\r
+   ${internal_src_dir}/text/decorator/text-decorator.cpp\r
+   ${internal_src_dir}/text/layouts/layout-engine.cpp\r
+   ${internal_src_dir}/text/multi-language-helper-functions.cpp\r
+   ${internal_src_dir}/text/multi-language-support-impl.cpp\r
+   ${internal_src_dir}/text/rendering/text-backend.cpp\r
+   ${internal_src_dir}/text/rendering/text-renderer.cpp\r
+   ${internal_src_dir}/text/rendering/atlas/text-atlas-renderer.cpp\r
+   ${internal_src_dir}/text/rendering/atlas/atlas-glyph-manager.cpp\r
+   ${internal_src_dir}/text/rendering/atlas/atlas-glyph-manager-impl.cpp\r
+   ${internal_src_dir}/text/rendering/atlas/atlas-manager.cpp\r
+   ${internal_src_dir}/text/rendering/atlas/atlas-manager-impl.cpp\r
+   ${internal_src_dir}/text/rendering/atlas/atlas-mesh-factory.cpp\r
+   ${internal_src_dir}/text/rendering/text-backend-impl.cpp\r
+   ${internal_src_dir}/text/rendering/text-typesetter.cpp\r
+   ${internal_src_dir}/text/rendering/view-model.cpp\r
+   ${internal_src_dir}/transition-effects/cube-transition-effect-impl.cpp\r
+   ${internal_src_dir}/transition-effects/cube-transition-cross-effect-impl.cpp\r
+   ${internal_src_dir}/transition-effects/cube-transition-fold-effect-impl.cpp\r
+   ${internal_src_dir}/transition-effects/cube-transition-wave-effect-impl.cpp\r
+   ${internal_src_dir}/scripting/script-impl.cpp\r
+   ${internal_src_dir}/scripting/script-plugin-proxy.cpp\r
+   ${internal_src_dir}/text/xhtml-entities.cpp\r
+)\r
+\r
+#public-api\r
+SET( public_api_src_dir dali-toolkit/public-api )\r
+\r
+SET( SOURCES ${SOURCES}\r
+  ${public_api_src_dir}/controls/control-impl.cpp\r
+  ${public_api_src_dir}/controls/control.cpp\r
+  ${public_api_src_dir}/controls/alignment/alignment.cpp\r
+  ${public_api_src_dir}/controls/buttons/button.cpp\r
+  ${public_api_src_dir}/controls/buttons/check-box-button.cpp\r
+  ${public_api_src_dir}/controls/buttons/push-button.cpp\r
+  ${public_api_src_dir}/controls/buttons/radio-button.cpp\r
+  ${public_api_src_dir}/controls/flex-container/flex-container.cpp\r
+  ${public_api_src_dir}/controls/image-view/image-view.cpp\r
+  ${public_api_src_dir}/controls/model3d-view/model3d-view.cpp\r
+  ${public_api_src_dir}/controls/progress-bar/progress-bar.cpp\r
+  ${public_api_src_dir}/controls/scroll-bar/scroll-bar.cpp\r
+  ${public_api_src_dir}/controls/scrollable/item-view/default-item-layout.cpp\r
+  ${public_api_src_dir}/controls/scrollable/item-view/item-layout.cpp\r
+  ${public_api_src_dir}/controls/scrollable/item-view/item-view.cpp\r
+  ${public_api_src_dir}/controls/scrollable/scroll-view/scroll-view-constraints.cpp\r
+  ${public_api_src_dir}/controls/scrollable/scroll-view/scroll-view-effect.cpp\r
+  ${public_api_src_dir}/controls/scrollable/scroll-view/scroll-view-page-path-effect.cpp\r
+  ${public_api_src_dir}/controls/scrollable/scroll-view/scroll-view.cpp\r
+  ${public_api_src_dir}/controls/scrollable/scrollable.cpp\r
+  ${public_api_src_dir}/controls/slider/slider.cpp\r
+  ${public_api_src_dir}/controls/table-view/table-view.cpp\r
+  ${public_api_src_dir}/controls/text-controls/text-editor.cpp\r
+  ${public_api_src_dir}/controls/text-controls/text-label.cpp\r
+  ${public_api_src_dir}/controls/text-controls/text-field.cpp\r
+  ${public_api_src_dir}/controls/video-view/video-view.cpp\r
+  ${public_api_src_dir}/image-loader/async-image-loader.cpp\r
+  ${public_api_src_dir}/image-loader/sync-image-loader.cpp\r
+  ${public_api_src_dir}/styling/style-manager.cpp\r
+  ${public_api_src_dir}/accessibility-manager/accessibility-manager.cpp\r
+  ${public_api_src_dir}/focus-manager/keyboard-focus-manager.cpp\r
+  ${public_api_src_dir}/dali-toolkit-version.cpp\r
+  ${public_api_src_dir}/enums.cpp\r
+)\r
+\r
+link_directories(\r
+${dali_SOURCE_DIR}/dali-adaptor/dali-windows-backend/ExLib\r
+${dali_SOURCE_DIR}/bin\r
+)\r
+\r
+SET( SOURCES ${SOURCES}\r
+  dali-toolkit/third-party/nanosvg/nanosvg.cc\r
+  dali-toolkit/third-party/nanosvg/nanosvgrast.cc\r
+  dali-toolkit/third-party/facebook-flexbox/layout.c\r
+)\r
+set(LIBRARY_OUTPUT_PATH ${dali_SOURCE_DIR}/bin)\r
+\r
+ADD_LIBRARY(dali-toolkit SHARED ${SOURCES})\r
+\r
+target_link_libraries(dali-toolkit dali-core.lib)\r
+target_link_libraries(dali-toolkit dali-adaptor.lib)\r
+target_link_libraries(dali-toolkit dlfcn.lib)\r
+\r
+endif()\r
+\r
+#add link library  \r
+#TARGET_LINK_LIBRARIES(${FS_BUILD_BINARY_PREFIX}sqrt ${LIBRARIES})
\ No newline at end of file

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.h
index 6b8b236..a1a2a6b 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.h
@@ -24,7 +24,7 @@
 #include "test-gl-sync-abstraction.h"
 #include "test-gl-abstraction.h"
 #include "test-render-controller.h"
-#include <dali/public-api/common/dali-common.h>
+#include <dali-toolkit/public-api/dali-toolkit-common.h>
 #include <dali/integration-api/resource-policies.h>
 #include <dali/integration-api/trace.h>
 

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gesture-manager.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gesture-manager.h
index 6fddd30..e96b7ea 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gesture-manager.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gesture-manager.h
@@ -20,7 +20,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/integration-api/gesture-manager.h>
-#include <dali/public-api/common/dali-common.h>
+#include <dali-toolkit/public-api/dali-toolkit-common.h>
 
 namespace Dali
 {

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-render-controller.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-render-controller.h
index 7c785f1..172681f 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-render-controller.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-render-controller.h
@@ -19,7 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali/public-api/common/dali-common.h>
+#include <dali-toolkit/public-api/dali-toolkit-common.h>
 #include <dali/integration-api/render-controller.h>
 
 namespace Dali

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard.h
index aa13ef0..eb4e43a 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard.h
@@ -24,7 +24,7 @@
 #include <dali/public-api/math/rect.h>
 #include <dali/public-api/object/base-handle.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali DALI_CORE_API
 {
 
 namespace Internal DALI_INTERNAL

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-input-method-context.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-input-method-context.h
old mode 100755 (executable)
new mode 100644 (file)
index cb4e085..d3ce56b
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-input-method-context.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-input-method-context.h
@@ -25,7 +25,7 @@
 #include <dali/devel-api/adaptor-framework/input-method-options.h>
 #include <dali/public-api/events/key-event.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali DALI_CORE_API
 {
 
 namespace Internal DALI_INTERNAL

diff --git a/dali-toolkit/devel-api/controls/control-wrapper-impl.cpp b/dali-toolkit/devel-api/controls/control-wrapper-impl.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 37def2b..c5c2d0b
--- a/dali-toolkit/devel-api/controls/control-wrapper-impl.cpp
+++ b/dali-toolkit/devel-api/controls/control-wrapper-impl.cpp
@@ -166,6 +166,11 @@ Dali::Animation ControlWrapper::CreateTransition( const Toolkit::TransitionData&
   return DevelControl::CreateTransition( *this, handle );
 }
 
+void ControlWrapper::EmitKeyInputFocusSignal( bool focusGained )
+{
+  Control::EmitKeyInputFocusSignal( focusGained );
+}
+
 void ControlWrapper::ApplyThemeStyle()
 {
   Toolkit::StyleManager styleManager = StyleManager::Get();

diff --git a/dali-toolkit/internal/builder/builder-impl.h b/dali-toolkit/internal/builder/builder-impl.h
old mode 100755 (executable)
new mode 100644 (file)
index 692e0d8..f2bc15a
--- a/dali-toolkit/internal/builder/builder-impl.h
+++ b/dali-toolkit/internal/builder/builder-impl.h
@@ -37,16 +37,16 @@
 #include <dali-toolkit/internal/builder/style.h>
 
 // Warning messages usually displayed
-#define DALI_SCRIPT_WARNING(format, args...) \
-  DALI_LOG_WARNING("Script:" format, ## args)
+#define DALI_SCRIPT_WARNING(format, ...) \
+  DALI_LOG_WARNING("Script:" format, ## __VA_ARGS__)
 
 // Info messages are usually debug build
-#define DALI_SCRIPT_INFO(format, args...) \
-  DALI_LOG_INFO(Dali::Toolkit::Internal::gFilterScript, Debug::General, "Script:" format, ## args)
+#define DALI_SCRIPT_INFO(format, ...) \
+  DALI_LOG_INFO(Dali::Toolkit::Internal::gFilterScript, Debug::General, "Script:" format, ## __VA_ARGS__)
 
 // Info Verbose need to be swiched on in gFilterScript filter constructor (by default set to General)
-#define DALI_SCRIPT_VERBOSE(format, args...) \
-  DALI_LOG_INFO(Dali::Toolkit::Internal::gFilterScript, Debug::Verbose, "Script:" format, ## args)
+#define DALI_SCRIPT_VERBOSE(format, ...) \
+  DALI_LOG_INFO(Dali::Toolkit::Internal::gFilterScript, Debug::Verbose, "Script:" format, ## __VA_ARGS__)
 
 namespace Dali
 {

diff --git a/dali-toolkit/internal/builder/builder-signals.cpp b/dali-toolkit/internal/builder/builder-signals.cpp
index 55809bd..9138e9b 100644 (file)
--- a/dali-toolkit/internal/builder/builder-signals.cpp
+++ b/dali-toolkit/internal/builder/builder-signals.cpp
@@ -35,7 +35,7 @@ namespace Toolkit
 namespace Internal
 {
 extern Animation CreateAnimation( const TreeNode& child, Dali::Toolkit::Internal::Builder* const builder  );
-extern bool DeterminePropertyFromNode( const TreeNode& node, Property::Value& value );
+extern void DeterminePropertyFromNode( const TreeNode& node, Property::Value& value );
 }
 }
 }

diff --git a/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp b/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp
old mode 100644 (file)
new mode 100755 (executable)
index d4c46ea..efac274
--- a/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp
+++ b/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp
@@ -24,6 +24,8 @@
 #include <dali/public-api/rendering/texture.h>
 #include <dali/public-api/rendering/shader.h>
 
+#include <dali/public-api/math/random.h>
+
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/controls/bubble-effect/bubble-effect.h>
 #include <dali-toolkit/internal/controls/bubble-effect/bubble-renderer.h>
@@ -47,18 +49,6 @@ struct Vertex
   Dali::Vector2 textureCoord;
 };
 
-/**
- * Return a random value between the given interval.
- * @param[in] f0 The low bound
- * @param[in] f1 The up bound
- * @param[in] seed The seed to genergate random number
- * @return A random value between the given interval
- */
-float RandomRange(float f0, float f1, unsigned int& seed)
-{
-  return f0 + (rand_r( &seed ) & 0xfff) * (f1-f0) * (1.0f/4095.0f);
-}
-
 const char* VERTEX_SHADER = DALI_COMPOSE_SHADER(
   attribute mediump vec2 aPosition;\n
   attribute mediump vec2 aTexCoord;\n
@@ -161,7 +151,6 @@ BubbleEmitter::BubbleEmitter( const Vector2& movementArea,
   mDensity( 5 ),
   mTotalNumOfBubble( maximumNumberOfBubble ),
   mCurrentBubble( 0 ),
-  mRandomSeed( 0 ),
   mRenderTaskRunning(false)
 {
   // Calculate how many shaders are required
@@ -181,8 +170,6 @@ BubbleEmitter::BubbleEmitter( const Vector2& movementArea,
     mNumBubblePerRenderer = mTotalNumOfBubble;
     mNumRenderer = 1;
   }
-
-  mRandomSeed = time( NULL );
 }
 
 BubbleEmitter::~BubbleEmitter()
@@ -367,7 +354,7 @@ Geometry BubbleEmitter::CreateGeometry( unsigned int numOfPatch )
 
   for(unsigned int i = 0; i < numOfPatch; i++)
   {
-    float halfSize = RandomRange(mBubbleSizeRange.x, mBubbleSizeRange.y, mRandomSeed) * 0.5f;
+    float halfSize = Random::Range( mBubbleSizeRange.x, mBubbleSizeRange.y ) * 0.5f;
 
     float index = static_cast<float>( i );
     vertexData.PushBack( Vertex( index, Vector2(-halfSize,-halfSize),Vector2(0.f,0.f) ) );
@@ -405,7 +392,7 @@ void BubbleEmitter::SetBubbleParameter( BubbleRenderer& bubbleRenderer, unsigned
 
   int halfRange = displacement.x / 2;
   // for the y coordinate, always negative, so bubbles always go upwards
-  Vector2 randomVec( rand_r( &mRandomSeed ) % static_cast<int>(displacement.x) - halfRange, -rand_r( &mRandomSeed ) % static_cast<int>(displacement.y) );
+  Vector2 randomVec( rand() % static_cast<int>( displacement.x ) - halfRange, -rand() % static_cast<int>( displacement.y ) );
   dir.Normalize();
   randomVec.x -= dir.x*halfRange;
   randomVec.y *= 1.0f - fabsf(dir.x)*0.33f;

diff --git a/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h b/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h
old mode 100644 (file)
new mode 100755 (executable)
index e6879ae..8c04c6e
--- a/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h
+++ b/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h
@@ -170,7 +170,6 @@ private:
   unsigned int                mDensity;             ///< How many bubbles will emit at each time, they are controlled by same uniforms in the shader.
   unsigned int                mTotalNumOfBubble;    ///< mNumBubblePerShader*mNumShader.
   unsigned int                mCurrentBubble;       ///< Keep track of the index for the newly emitted bubble
-  unsigned int                mRandomSeed;          ///< Seed to generate random number.
 
   bool                        mRenderTaskRunning;   ///< If the background render task is currently running
 

diff --git a/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h b/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h
index 1bb4d2a..3f8444f 100755 (executable)
--- a/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h
+++ b/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h
@@ -634,7 +634,7 @@ private:
   float mScrollSpeed;
   float mScrollOvershoot;
 
-  Dali::Gesture::State mGestureState    : 3;
+  Dali::Gesture::State mGestureState    : 4;
   bool mAnimatingOvershootOn            : 1;        ///< Whether we are currently animating overshoot to 1.0f/-1.0f (on) or to 0.0f (off)
   bool mAnimateOvershootOff             : 1;        ///< Whether we are currently animating overshoot to 1.0f/-1.0f (on) or to 0.0f (off)
   bool mAnchoringEnabled                : 1;

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 163c248..bb83e7d
--- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
+++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
@@ -41,9 +41,9 @@
 //#define ENABLED_SCROLL_STATE_LOGGING
 
 #ifdef ENABLED_SCROLL_STATE_LOGGING
-#define DALI_LOG_SCROLL_STATE(format, args...) Dali::Integration::Log::LogMessage(Dali::Integration::Log::DebugInfo, "%s:%d " format "\n", __PRETTY_FUNCTION__, __LINE__, ## args)
+#define DALI_LOG_SCROLL_STATE(format, ...) Dali::Integration::Log::LogMessage(Dali::Integration::Log::DebugInfo, "%s:%d " format "\n", __PRETTY_FUNCTION__, __LINE__, ## __VA_ARGS__)
 #else
-#define DALI_LOG_SCROLL_STATE(format, args...)
+#define DALI_LOG_SCROLL_STATE(format, ...)
 #endif
 
 // TODO: Change to two class system:

diff --git a/dali-toolkit/internal/image-loader/atlas-packer.cpp b/dali-toolkit/internal/image-loader/atlas-packer.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 26ad3e0..40723cf
--- a/dali-toolkit/internal/image-loader/atlas-packer.cpp
+++ b/dali-toolkit/internal/image-loader/atlas-packer.cpp
@@ -36,7 +36,7 @@ namespace
 
 bool ApproximatelyEqual( uint32_t a, uint32_t b  )
 {
-  return abs( a-b ) <= 1;
+  return abs( ( a-b ) ) <= 1;
 }
 
 uint16_t MaxDimension( const Uint16Pair& dimensions )

diff --git a/dali-toolkit/internal/visuals/animated-image/animated-image-visual.h b/dali-toolkit/internal/visuals/animated-image/animated-image-visual.h
old mode 100644 (file)
new mode 100755 (executable)
index 0db9154..3fad1fc
--- a/dali-toolkit/internal/visuals/animated-image/animated-image-visual.h
+++ b/dali-toolkit/internal/visuals/animated-image/animated-image-visual.h
@@ -258,7 +258,7 @@ private:
 
   Dali::WrapMode::Type mWrapModeU:3;
   Dali::WrapMode::Type mWrapModeV:3;
-  DevelAnimatedImageVisual::Action::Type mActionStatus:2;
+  DevelAnimatedImageVisual::Action::Type mActionStatus:3;
   bool mStartFirstFrame:1;
 };
 

diff --git a/dali-toolkit/internal/visuals/texture-manager-impl.h b/dali-toolkit/internal/visuals/texture-manager-impl.h
old mode 100644 (file)
new mode 100755 (executable)
index e56fec4..ded2c23
--- a/dali-toolkit/internal/visuals/texture-manager-impl.h
+++ b/dali-toolkit/internal/visuals/texture-manager-impl.h
@@ -478,12 +478,12 @@ private:
     TextureManager::TextureHash hash; ///< The hash used to cache this Texture
     float scaleFactor;             ///< The scale factor to apply to the Texture when masking
     int16_t referenceCount;        ///< The reference count of clients using this Texture
-    LoadState loadState:3;         ///< The load state showing the load progress of the Texture
+    LoadState loadState:4;         ///< The load state showing the load progress of the Texture
     FittingMode::Type fittingMode:2; ///< The requested FittingMode
     Dali::SamplingMode::Type samplingMode:3; ///< The requested SamplingMode
-    StorageType storageType:1;     ///< CPU storage / GPU upload;
+    StorageType storageType:2;     ///< CPU storage / GPU upload;
     bool loadSynchronously:1;      ///< True if synchronous loading was requested
-    UseAtlas useAtlas:1;           ///< USE_ATLAS if an atlas was requested.
+    UseAtlas useAtlas:2;           ///< USE_ATLAS if an atlas was requested.
                                    ///< This is updated to false if atlas is not used
     bool cropToMask:1;             ///< true if the image should be cropped to the mask size.
     bool orientationCorrection:1;  ///< true if the image should be rotated to match exif orientation data

diff --git a/dali-toolkit/public-api/dali-toolkit-common.h b/dali-toolkit/public-api/dali-toolkit-common.h
index 56f3927..d16ef81 100755 (executable)
--- a/dali-toolkit/public-api/dali-toolkit-common.h
+++ b/dali-toolkit/public-api/dali-toolkit-common.h
@@ -38,8 +38,18 @@
 #    define DALI_TOOLKIT_API __attribute__ ((visibility ("default")))
 #  endif
 #else
+#ifdef WIN32
+#ifdef BUILDING_DALI_TOOLKIT
+/** Visibility attribute to hide declarations */
+#  define DALI_TOOLKIT_API __declspec(dllexport)
+#else
+/** Visibility attribute to hide declarations */
+#  define DALI_TOOLKIT_API __declspec(dllimport)
+#endif
+#else
 /** Visibility attribute to show declarations */
 #  define DALI_TOOLKIT_API
 #endif
+#endif
 
 #endif // DALI_TOOLKIT_COMMON_H