From cb92c9b7cb2d3ff05a688a4bd4af87c07f87084e Mon Sep 17 00:00:00 2001 From: Sunghyun kim Date: Mon, 3 Sep 2018 11:33:11 +0900 Subject: [PATCH] Revert "[Tizen] Add codes for Dali Windows Backend" This reverts commit f2608c9be345a239eac3693feb084d51d2a7af11. Change-Id: Ie56bd865e45d2eff41881103958de9e4dbb9f5b5 --- CMakeLists.txt | 321 --------------------- .../devel-api/controls/control-wrapper-impl.cpp | 5 - .../devel-api/layouting/layout-controller.h | 2 +- .../devel-api/layouting/layout-group-impl.h | 0 dali-toolkit/devel-api/layouting/layout-group.h | 2 +- .../devel-api/layouting/layout-item-impl.h | 0 dali-toolkit/devel-api/layouting/layout-item.h | 2 +- .../devel-api/layouting/layout-parent-impl.h | 0 dali-toolkit/devel-api/layouting/linear-layout.h | 2 +- dali-toolkit/devel-api/layouting/measure-spec.h | 1 - dali-toolkit/devel-api/layouting/measured-size.h | 2 +- dali-toolkit/devel-api/layouting/vbox-layout.h | 0 dali-toolkit/internal/builder/builder-impl.h | 12 +- dali-toolkit/internal/builder/builder-signals.cpp | 2 +- .../controls/scrollable/item-view/item-view-impl.h | 2 +- .../scrollable/scroll-view/scroll-view-impl.cpp | 4 +- .../internal/layouting/linear-layout-impl.cpp | 15 +- .../internal/layouting/vbox-layout-impl.cpp | 6 +- .../visuals/animated-image/animated-image-visual.h | 2 +- .../internal/visuals/texture-manager-impl.h | 6 +- dali-toolkit/public-api/dali-toolkit-common.h | 10 - 21 files changed, 29 insertions(+), 367 deletions(-) delete mode 100755 CMakeLists.txt mode change 100755 => 100644 dali-toolkit/devel-api/layouting/layout-controller.h mode change 100755 => 100644 dali-toolkit/devel-api/layouting/layout-group-impl.h mode change 100755 => 100644 dali-toolkit/devel-api/layouting/layout-group.h mode change 100755 => 100644 dali-toolkit/devel-api/layouting/layout-item-impl.h mode change 100755 => 100644 dali-toolkit/devel-api/layouting/layout-item.h mode change 100755 => 100644 dali-toolkit/devel-api/layouting/layout-parent-impl.h mode change 100755 => 100644 dali-toolkit/devel-api/layouting/linear-layout.h mode change 100755 => 100644 dali-toolkit/devel-api/layouting/measure-spec.h mode change 100755 => 100644 dali-toolkit/devel-api/layouting/measured-size.h mode change 100755 => 100644 dali-toolkit/devel-api/layouting/vbox-layout.h mode change 100755 => 100644 dali-toolkit/internal/builder/builder-signals.cpp mode change 100755 => 100644 dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp mode change 100755 => 100644 dali-toolkit/internal/layouting/linear-layout-impl.cpp mode change 100755 => 100644 dali-toolkit/internal/layouting/vbox-layout-impl.cpp mode change 100755 => 100644 dali-toolkit/internal/visuals/animated-image/animated-image-visual.h mode change 100755 => 100644 dali-toolkit/internal/visuals/texture-manager-impl.h diff --git a/CMakeLists.txt b/CMakeLists.txt deleted file mode 100755 index 5942b13..0000000 --- a/CMakeLists.txt +++ /dev/null @@ -1,321 +0,0 @@ -cmake_minimum_required(VERSION 3.11) - -PROJECT (dali-toolkit) - -ADD_DEFINITIONS( --DDALI_ENV="../../dali-env" --DDALI_DATA_READ_ONLY_DIR=DALI_ENV"/opt/share/dali" --DDALI_IMAGE_DIR=DALI_ENV"/opt/share/dali/toolkit/images/" --DDALI_STYLE_DIR=DALI_ENV"/opt/share/dali/toolkit/styles/" --DDALI_SOUND_DIR=DALI_ENV"/opt/share/dali/toolkit/sounds/" --DDALI_STYLE_IMAGE_DIR=DALI_ENV"/opt/share/dali/toolkit/styles/images/" --DCURL_STATICLIB=0 -/DBUILDING_DALI_TOOLKIT -/vmg -/NODEFAULTLIB:"libcmt.lib" -/FI"../windows-dependencies/ExInclude/PreprocessorDefinitions.h" -/FI"../windows-dependencies/ExInclude/ToolKitPreDefine.h" -/MP -/Gz -) - -#head file path -INCLUDE_DIRECTORIES( -./ -../dali-core -../dali-adaptor -../windows-dependencies/ExInclude -../dali-env/opt/include -) - -#devel-api -SET( devel_api_src_dir dali-toolkit/devel-api ) - -SET ( SOURCES ${SOURCES} - ${devel_api_src_dir}/builder/builder.cpp - ${devel_api_src_dir}/builder/json-parser.cpp - ${devel_api_src_dir}/builder/tree-node.cpp - ${devel_api_src_dir}/controls/control-devel.cpp - ${devel_api_src_dir}/controls/control-wrapper.cpp - ${devel_api_src_dir}/controls/control-wrapper-impl.cpp - ${devel_api_src_dir}/controls/bloom-view/bloom-view.cpp - ${devel_api_src_dir}/controls/bubble-effect/bubble-emitter.cpp - ${devel_api_src_dir}/controls/buttons/toggle-button.cpp - ${devel_api_src_dir}/controls/effects-view/effects-view.cpp - ${devel_api_src_dir}/controls/magnifier/magnifier.cpp - ${devel_api_src_dir}/controls/navigation-view/navigation-view.cpp - ${devel_api_src_dir}/controls/page-turn-view/page-turn-landscape-view.cpp - ${devel_api_src_dir}/controls/page-turn-view/page-turn-portrait-view.cpp - ${devel_api_src_dir}/controls/page-turn-view/page-turn-view.cpp - ${devel_api_src_dir}/controls/popup/confirmation-popup.cpp - ${devel_api_src_dir}/controls/popup/popup.cpp - ${devel_api_src_dir}/controls/shadow-view/shadow-view.cpp - ${devel_api_src_dir}/controls/super-blur-view/super-blur-view.cpp - ${devel_api_src_dir}/controls/text-controls/text-editor-devel.cpp - ${devel_api_src_dir}/controls/text-controls/text-field-devel.cpp - ${devel_api_src_dir}/controls/text-controls/text-selection-popup.cpp - ${devel_api_src_dir}/controls/text-controls/text-selection-toolbar.cpp - ${devel_api_src_dir}/controls/tool-bar/tool-bar.cpp - ${devel_api_src_dir}/focus-manager/keyinput-focus-manager.cpp - ${devel_api_src_dir}/focus-manager/keyboard-focus-manager-devel.cpp - ${devel_api_src_dir}/image-loader/async-image-loader-devel.cpp - ${devel_api_src_dir}/image-loader/atlas-upload-observer.cpp - ${devel_api_src_dir}/image-loader/image-atlas.cpp - ${devel_api_src_dir}/image-loader/texture-manager.cpp - ${devel_api_src_dir}/layouting/vbox-layout.cpp - ${devel_api_src_dir}/layouting/layout-item-impl.cpp - ${devel_api_src_dir}/layouting/layout-item.cpp - ${devel_api_src_dir}/layouting/layout-group-impl.cpp - ${devel_api_src_dir}/layouting/layout-group.cpp - ${devel_api_src_dir}/layouting/layout-controller.cpp - ${devel_api_src_dir}/layouting/linear-layout.cpp - ${devel_api_src_dir}/scripting/script.cpp - ${devel_api_src_dir}/styling/style-manager-devel.cpp - ${devel_api_src_dir}/transition-effects/cube-transition-cross-effect.cpp - ${devel_api_src_dir}/transition-effects/cube-transition-effect.cpp - ${devel_api_src_dir}/transition-effects/cube-transition-fold-effect.cpp - ${devel_api_src_dir}/transition-effects/cube-transition-wave-effect.cpp - ${devel_api_src_dir}/visual-factory/transition-data.cpp - ${devel_api_src_dir}/visual-factory/visual-factory.cpp - ${devel_api_src_dir}/visual-factory/visual-base.cpp - ${devel_api_src_dir}/controls/gaussian-blur-view/gaussian-blur-view.cpp -) - -#internal -SET(internal_src_dir dali-toolkit/internal ) - -SET( SOURCES ${SOURCES} - ${internal_src_dir}/builder/builder-animations.cpp - ${internal_src_dir}/builder/builder-impl.cpp - ${internal_src_dir}/builder/builder-impl-debug.cpp - ${internal_src_dir}/builder/builder-set-property.cpp - ${internal_src_dir}/builder/builder-signals.cpp - ${internal_src_dir}/builder/json-parser-state.cpp - ${internal_src_dir}/builder/json-parser-impl.cpp - ${internal_src_dir}/builder/style.cpp - ${internal_src_dir}/builder/tree-node-manipulator.cpp - ${internal_src_dir}/builder/replacement.cpp - ${internal_src_dir}/layouting/vbox-layout-impl.cpp - ${internal_src_dir}/layouting/layout-item-data-impl.cpp - ${internal_src_dir}/layouting/layout-group-data-impl.cpp - ${internal_src_dir}/layouting/layout-controller-impl.cpp - ${internal_src_dir}/layouting/layout-controller-debug.cpp - ${internal_src_dir}/layouting/linear-layout-impl.cpp - ${internal_src_dir}/visuals/animated-image/animated-image-visual.cpp - ${internal_src_dir}/visuals/animated-image/image-cache.cpp - ${internal_src_dir}/visuals/animated-image/fixed-image-cache.cpp - ${internal_src_dir}/visuals/animated-image/rolling-image-cache.cpp - ${internal_src_dir}/visuals/animated-image/rolling-gif-image-cache.cpp - ${internal_src_dir}/visuals/border/border-visual.cpp - ${internal_src_dir}/visuals/color/color-visual.cpp - ${internal_src_dir}/visuals/gradient/gradient-visual.cpp - ${internal_src_dir}/visuals/gradient/gradient.cpp - ${internal_src_dir}/visuals/gradient/linear-gradient.cpp - ${internal_src_dir}/visuals/gradient/radial-gradient.cpp - ${internal_src_dir}/visuals/animated-gradient/animated-gradient-visual.cpp - ${internal_src_dir}/visuals/image-atlas-manager.cpp - ${internal_src_dir}/visuals/image/image-visual.cpp - ${internal_src_dir}/visuals/mesh/mesh-visual.cpp - ${internal_src_dir}/visuals/npatch-loader.cpp - ${internal_src_dir}/visuals/npatch/npatch-visual.cpp - ${internal_src_dir}/visuals/primitive/primitive-visual.cpp - ${internal_src_dir}/visuals/svg/svg-rasterize-thread.cpp - ${internal_src_dir}/visuals/svg/svg-visual.cpp - ${internal_src_dir}/visuals/text/text-visual.cpp - ${internal_src_dir}/visuals/transition-data-impl.cpp - ${internal_src_dir}/visuals/texture-manager-impl.cpp - ${internal_src_dir}/visuals/texture-upload-observer.cpp - ${internal_src_dir}/visuals/visual-base-data-impl.cpp - ${internal_src_dir}/visuals/visual-base-impl.cpp - ${internal_src_dir}/visuals/visual-factory-cache.cpp - ${internal_src_dir}/visuals/visual-factory-impl.cpp - ${internal_src_dir}/visuals/visual-string-constants.cpp - ${internal_src_dir}/visuals/visual-url.cpp - ${internal_src_dir}/visuals/wireframe/wireframe-visual.cpp - ${internal_src_dir}/controls/alignment/alignment-impl.cpp - ${internal_src_dir}/controls/bloom-view/bloom-view-impl.cpp - ${internal_src_dir}/controls/bubble-effect/bubble-emitter-impl.cpp - ${internal_src_dir}/controls/bubble-effect/bubble-renderer.cpp - ${internal_src_dir}/controls/buttons/button-impl.cpp - ${internal_src_dir}/controls/buttons/check-box-button-impl.cpp - ${internal_src_dir}/controls/buttons/push-button-impl.cpp - ${internal_src_dir}/controls/buttons/radio-button-impl.cpp - ${internal_src_dir}/controls/buttons/toggle-button-impl.cpp - ${internal_src_dir}/controls/control/control-data-impl.cpp - ${internal_src_dir}/controls/control/control-debug.cpp - ${internal_src_dir}/controls/effects-view/effects-view-impl.cpp - ${internal_src_dir}/controls/flex-container/flex-container-impl.cpp - ${internal_src_dir}/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp - ${internal_src_dir}/controls/image-view/image-view-impl.cpp - ${internal_src_dir}/controls/magnifier/magnifier-impl.cpp - ${internal_src_dir}/controls/navigation-view/navigation-view-impl.cpp - ${internal_src_dir}/controls/popup/confirmation-popup-impl.cpp - ${internal_src_dir}/controls/model3d-view/model3d-view-impl.cpp - ${internal_src_dir}/controls/model3d-view/obj-loader.cpp - ${internal_src_dir}/controls/popup/popup-impl.cpp - ${internal_src_dir}/controls/page-turn-view/page-turn-portrait-view-impl.cpp - ${internal_src_dir}/controls/page-turn-view/page-turn-effect.cpp - ${internal_src_dir}/controls/page-turn-view/page-turn-landscape-view-impl.cpp - ${internal_src_dir}/controls/page-turn-view/page-turn-view-impl.cpp - ${internal_src_dir}/controls/progress-bar/progress-bar-impl.cpp - ${internal_src_dir}/controls/scroll-bar/scroll-bar-impl.cpp - ${internal_src_dir}/controls/scrollable/bouncing-effect-actor.cpp - ${internal_src_dir}/controls/scrollable/item-view/depth-layout.cpp - ${internal_src_dir}/controls/scrollable/item-view/grid-layout.cpp - ${internal_src_dir}/controls/scrollable/item-view/item-view-impl.cpp - ${internal_src_dir}/controls/scrollable/item-view/spiral-layout.cpp - ${internal_src_dir}/controls/scrollable/scrollable-impl.cpp - ${internal_src_dir}/controls/scrollable/scroll-view/scroll-base-impl.cpp - ${internal_src_dir}/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.cpp - ${internal_src_dir}/controls/scrollable/scroll-view/scroll-view-effect-impl.cpp - ${internal_src_dir}/controls/scrollable/scroll-view/scroll-view-impl.cpp - ${internal_src_dir}/controls/scrollable/scroll-view/scroll-view-page-path-effect-impl.cpp - ${internal_src_dir}/controls/shadow-view/shadow-view-impl.cpp - ${internal_src_dir}/controls/slider/slider-impl.cpp - ${internal_src_dir}/controls/super-blur-view/super-blur-view-impl.cpp - ${internal_src_dir}/controls/table-view/table-view-impl.cpp - ${internal_src_dir}/controls/text-controls/text-editor-impl.cpp - ${internal_src_dir}/controls/text-controls/text-field-impl.cpp - ${internal_src_dir}/controls/text-controls/text-label-impl.cpp - ${internal_src_dir}/controls/text-controls/text-selection-popup-impl.cpp - ${internal_src_dir}/controls/text-controls/text-selection-toolbar-impl.cpp - ${internal_src_dir}/controls/tool-bar/tool-bar-impl.cpp - ${internal_src_dir}/controls/tooltip/tooltip.cpp - ${internal_src_dir}/controls/video-view/video-view-impl.cpp - ${internal_src_dir}/accessibility-manager/accessibility-manager-impl.cpp - ${internal_src_dir}/feedback/feedback-style.cpp - ${internal_src_dir}/focus-manager/keyboard-focus-manager-impl.cpp - ${internal_src_dir}/focus-manager/keyinput-focus-manager-impl.cpp - ${internal_src_dir}/helpers/color-conversion.cpp - ${internal_src_dir}/helpers/property-helper.cpp - ${internal_src_dir}/filters/blur-two-pass-filter.cpp - ${internal_src_dir}/filters/emboss-filter.cpp - ${internal_src_dir}/filters/image-filter.cpp - ${internal_src_dir}/filters/spread-filter.cpp - ${internal_src_dir}/image-loader/async-image-loader-impl.cpp - ${internal_src_dir}/image-loader/atlas-packer.cpp - ${internal_src_dir}/image-loader/image-atlas-impl.cpp - ${internal_src_dir}/image-loader/image-load-thread.cpp - ${internal_src_dir}/styling/style-manager-impl.cpp - ${internal_src_dir}/text/bidirectional-support.cpp - ${internal_src_dir}/text/character-set-conversion.cpp - ${internal_src_dir}/text/color-segmentation.cpp - ${internal_src_dir}/text/cursor-helper-functions.cpp - ${internal_src_dir}/text/glyph-metrics-helper.cpp - ${internal_src_dir}/text/logical-model-impl.cpp - ${internal_src_dir}/text/markup-processor.cpp - ${internal_src_dir}/text/markup-processor-color.cpp - ${internal_src_dir}/text/markup-processor-font.cpp - ${internal_src_dir}/text/markup-processor-helper-functions.cpp - ${internal_src_dir}/text/multi-language-support.cpp - ${internal_src_dir}/text/hidden-text.cpp - ${internal_src_dir}/text/property-string-parser.cpp - ${internal_src_dir}/text/segmentation.cpp - ${internal_src_dir}/text/shaper.cpp - ${internal_src_dir}/text/text-enumerations-impl.cpp - ${internal_src_dir}/text/text-controller.cpp - ${internal_src_dir}/text/text-controller-impl.cpp - ${internal_src_dir}/text/text-effects-style.cpp - ${internal_src_dir}/text/text-font-style.cpp - ${internal_src_dir}/text/text-io.cpp - ${internal_src_dir}/text/text-model.cpp - ${internal_src_dir}/text/text-scroller.cpp - ${internal_src_dir}/text/text-vertical-scroller.cpp - ${internal_src_dir}/text/text-view.cpp - ${internal_src_dir}/text/text-view-interface.cpp - ${internal_src_dir}/text/visual-model-impl.cpp - ${internal_src_dir}/text/decorator/text-decorator.cpp - ${internal_src_dir}/text/layouts/layout-engine.cpp - ${internal_src_dir}/text/multi-language-helper-functions.cpp - ${internal_src_dir}/text/multi-language-support-impl.cpp - ${internal_src_dir}/text/rendering/text-backend.cpp - ${internal_src_dir}/text/rendering/text-renderer.cpp - ${internal_src_dir}/text/rendering/atlas/text-atlas-renderer.cpp - ${internal_src_dir}/text/rendering/atlas/atlas-glyph-manager.cpp - ${internal_src_dir}/text/rendering/atlas/atlas-glyph-manager-impl.cpp - ${internal_src_dir}/text/rendering/atlas/atlas-manager.cpp - ${internal_src_dir}/text/rendering/atlas/atlas-manager-impl.cpp - ${internal_src_dir}/text/rendering/atlas/atlas-mesh-factory.cpp - ${internal_src_dir}/text/rendering/text-backend-impl.cpp - ${internal_src_dir}/text/rendering/text-typesetter.cpp - ${internal_src_dir}/text/rendering/view-model.cpp - ${internal_src_dir}/transition-effects/cube-transition-effect-impl.cpp - ${internal_src_dir}/transition-effects/cube-transition-cross-effect-impl.cpp - ${internal_src_dir}/transition-effects/cube-transition-fold-effect-impl.cpp - ${internal_src_dir}/transition-effects/cube-transition-wave-effect-impl.cpp - ${internal_src_dir}/scripting/script-impl.cpp - ${internal_src_dir}/scripting/script-plugin-proxy.cpp - ${internal_src_dir}/text/xhtml-entities.cpp -) - -#public-api -SET( public_api_src_dir dali-toolkit/public-api ) - -SET( SOURCES ${SOURCES} - ${public_api_src_dir}/controls/control-impl.cpp - ${public_api_src_dir}/controls/control.cpp - ${public_api_src_dir}/controls/alignment/alignment.cpp - ${public_api_src_dir}/controls/buttons/button.cpp - ${public_api_src_dir}/controls/buttons/check-box-button.cpp - ${public_api_src_dir}/controls/buttons/push-button.cpp - ${public_api_src_dir}/controls/buttons/radio-button.cpp - ${public_api_src_dir}/controls/flex-container/flex-container.cpp - ${public_api_src_dir}/controls/image-view/image-view.cpp - ${public_api_src_dir}/controls/model3d-view/model3d-view.cpp - ${public_api_src_dir}/controls/progress-bar/progress-bar.cpp - ${public_api_src_dir}/controls/scroll-bar/scroll-bar.cpp - ${public_api_src_dir}/controls/scrollable/item-view/default-item-layout.cpp - ${public_api_src_dir}/controls/scrollable/item-view/item-layout.cpp - ${public_api_src_dir}/controls/scrollable/item-view/item-view.cpp - ${public_api_src_dir}/controls/scrollable/scroll-view/scroll-view-constraints.cpp - ${public_api_src_dir}/controls/scrollable/scroll-view/scroll-view-effect.cpp - ${public_api_src_dir}/controls/scrollable/scroll-view/scroll-view-page-path-effect.cpp - ${public_api_src_dir}/controls/scrollable/scroll-view/scroll-view.cpp - ${public_api_src_dir}/controls/scrollable/scrollable.cpp - ${public_api_src_dir}/controls/slider/slider.cpp - ${public_api_src_dir}/controls/table-view/table-view.cpp - ${public_api_src_dir}/controls/text-controls/text-editor.cpp - ${public_api_src_dir}/controls/text-controls/text-label.cpp - ${public_api_src_dir}/controls/text-controls/text-field.cpp - ${public_api_src_dir}/controls/video-view/video-view.cpp - ${public_api_src_dir}/image-loader/async-image-loader.cpp - ${public_api_src_dir}/image-loader/sync-image-loader.cpp - ${public_api_src_dir}/styling/style-manager.cpp - ${public_api_src_dir}/accessibility-manager/accessibility-manager.cpp - ${public_api_src_dir}/focus-manager/keyboard-focus-manager.cpp - ${public_api_src_dir}/dali-toolkit-version.cpp - ${public_api_src_dir}/enums.cpp -) - -link_directories( -../windows-dependencies/ExLib -../bin -) - -SET( SOURCES ${SOURCES} - dali-toolkit/third-party/nanosvg/nanosvg.cc - dali-toolkit/third-party/nanosvg/nanosvgrast.cc - dali-toolkit/third-party/yoga/Yoga.cpp - dali-toolkit/third-party/yoga/YGStyle.cpp - dali-toolkit/third-party/yoga/YGNodePrint.cpp - dali-toolkit/third-party/yoga/YGNode.cpp - dali-toolkit/third-party/yoga/YGLayout.cpp - dali-toolkit/third-party/yoga/YGFloatOptional.cpp - dali-toolkit/third-party/yoga/YGEnums.cpp - dali-toolkit/third-party/yoga/YGConfig.cpp - dali-toolkit/third-party/yoga/Utils.cpp -) -set(LIBRARY_OUTPUT_PATH ../../../bin) - -ADD_LIBRARY(dali-toolkit SHARED ${SOURCES}) - -target_link_libraries(dali-toolkit dali-core.lib) -target_link_libraries(dali-toolkit dali-adaptor.lib) -target_link_libraries(dali-toolkit dlfcn.lib) -target_link_libraries(dali-toolkit WindowsPlatform.lib) - -add_dependencies(dali-toolkit dali-core) -add_dependencies(dali-toolkit dali-adaptor) - -#add link library -#TARGET_LINK_LIBRARIES(${FS_BUILD_BINARY_PREFIX}sqrt ${LIBRARIES}) \ No newline at end of file diff --git a/dali-toolkit/devel-api/controls/control-wrapper-impl.cpp b/dali-toolkit/devel-api/controls/control-wrapper-impl.cpp index c5c2d0b..37def2b 100755 --- a/dali-toolkit/devel-api/controls/control-wrapper-impl.cpp +++ b/dali-toolkit/devel-api/controls/control-wrapper-impl.cpp @@ -166,11 +166,6 @@ 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/devel-api/layouting/layout-controller.h b/dali-toolkit/devel-api/layouting/layout-controller.h old mode 100755 new mode 100644 index 2741829..fe955a4 --- a/dali-toolkit/devel-api/layouting/layout-controller.h +++ b/dali-toolkit/devel-api/layouting/layout-controller.h @@ -17,7 +17,7 @@ */ #include -#include +#include #include #include #include diff --git a/dali-toolkit/devel-api/layouting/layout-group-impl.h b/dali-toolkit/devel-api/layouting/layout-group-impl.h old mode 100755 new mode 100644 diff --git a/dali-toolkit/devel-api/layouting/layout-group.h b/dali-toolkit/devel-api/layouting/layout-group.h old mode 100755 new mode 100644 index b8249e2..9d0e684 --- a/dali-toolkit/devel-api/layouting/layout-group.h +++ b/dali-toolkit/devel-api/layouting/layout-group.h @@ -17,9 +17,9 @@ */ #include +#include #include #include -#include #include #include diff --git a/dali-toolkit/devel-api/layouting/layout-item-impl.h b/dali-toolkit/devel-api/layouting/layout-item-impl.h old mode 100755 new mode 100644 diff --git a/dali-toolkit/devel-api/layouting/layout-item.h b/dali-toolkit/devel-api/layouting/layout-item.h old mode 100755 new mode 100644 index fc69e6d..5b042c6 --- a/dali-toolkit/devel-api/layouting/layout-item.h +++ b/dali-toolkit/devel-api/layouting/layout-item.h @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include #include diff --git a/dali-toolkit/devel-api/layouting/layout-parent-impl.h b/dali-toolkit/devel-api/layouting/layout-parent-impl.h old mode 100755 new mode 100644 diff --git a/dali-toolkit/devel-api/layouting/linear-layout.h b/dali-toolkit/devel-api/layouting/linear-layout.h old mode 100755 new mode 100644 index 34c20f8..07924db --- a/dali-toolkit/devel-api/layouting/linear-layout.h +++ b/dali-toolkit/devel-api/layouting/linear-layout.h @@ -17,8 +17,8 @@ * limitations under the License. */ +#include #include -#include #include #include #include diff --git a/dali-toolkit/devel-api/layouting/measure-spec.h b/dali-toolkit/devel-api/layouting/measure-spec.h old mode 100755 new mode 100644 index cc24dc2..04c4d01 --- a/dali-toolkit/devel-api/layouting/measure-spec.h +++ b/dali-toolkit/devel-api/layouting/measure-spec.h @@ -17,7 +17,6 @@ * limitations under the License. */ -#include #include #include #include diff --git a/dali-toolkit/devel-api/layouting/measured-size.h b/dali-toolkit/devel-api/layouting/measured-size.h old mode 100755 new mode 100644 index e426a29..4acdd70 --- a/dali-toolkit/devel-api/layouting/measured-size.h +++ b/dali-toolkit/devel-api/layouting/measured-size.h @@ -17,7 +17,7 @@ * limitations under the License. */ -#include +#include #include #include diff --git a/dali-toolkit/devel-api/layouting/vbox-layout.h b/dali-toolkit/devel-api/layouting/vbox-layout.h old mode 100755 new mode 100644 diff --git a/dali-toolkit/internal/builder/builder-impl.h b/dali-toolkit/internal/builder/builder-impl.h index f2bc15a..692e0d8 100755 --- a/dali-toolkit/internal/builder/builder-impl.h +++ b/dali-toolkit/internal/builder/builder-impl.h @@ -37,16 +37,16 @@ #include // Warning messages usually displayed -#define DALI_SCRIPT_WARNING(format, ...) \ - DALI_LOG_WARNING("Script:" format, ## __VA_ARGS__) +#define DALI_SCRIPT_WARNING(format, args...) \ + DALI_LOG_WARNING("Script:" format, ## args) // Info messages are usually debug build -#define DALI_SCRIPT_INFO(format, ...) \ - DALI_LOG_INFO(Dali::Toolkit::Internal::gFilterScript, Debug::General, "Script:" format, ## __VA_ARGS__) +#define DALI_SCRIPT_INFO(format, args...) \ + DALI_LOG_INFO(Dali::Toolkit::Internal::gFilterScript, Debug::General, "Script:" format, ## args) // Info Verbose need to be swiched on in gFilterScript filter constructor (by default set to General) -#define DALI_SCRIPT_VERBOSE(format, ...) \ - DALI_LOG_INFO(Dali::Toolkit::Internal::gFilterScript, Debug::Verbose, "Script:" format, ## __VA_ARGS__) +#define DALI_SCRIPT_VERBOSE(format, args...) \ + DALI_LOG_INFO(Dali::Toolkit::Internal::gFilterScript, Debug::Verbose, "Script:" format, ## args) namespace Dali { diff --git a/dali-toolkit/internal/builder/builder-signals.cpp b/dali-toolkit/internal/builder/builder-signals.cpp old mode 100755 new mode 100644 index 9138e9b..55809bd --- 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 void DeterminePropertyFromNode( const TreeNode& node, Property::Value& value ); +extern bool DeterminePropertyFromNode( const TreeNode& node, Property::Value& value ); } } } 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 3f8444f..1bb4d2a 100755 --- 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 : 4; + Dali::Gesture::State mGestureState : 3; 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 100755 new mode 100644 index bb83e7d..163c248 --- 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, ...) Dali::Integration::Log::LogMessage(Dali::Integration::Log::DebugInfo, "%s:%d " format "\n", __PRETTY_FUNCTION__, __LINE__, ## __VA_ARGS__) +#define DALI_LOG_SCROLL_STATE(format, args...) Dali::Integration::Log::LogMessage(Dali::Integration::Log::DebugInfo, "%s:%d " format "\n", __PRETTY_FUNCTION__, __LINE__, ## args) #else -#define DALI_LOG_SCROLL_STATE(format, ...) +#define DALI_LOG_SCROLL_STATE(format, args...) #endif // TODO: Change to two class system: diff --git a/dali-toolkit/internal/layouting/linear-layout-impl.cpp b/dali-toolkit/internal/layouting/linear-layout-impl.cpp old mode 100755 new mode 100644 index 8d8f63b..c85c5fe --- a/dali-toolkit/internal/layouting/linear-layout-impl.cpp +++ b/dali-toolkit/internal/layouting/linear-layout-impl.cpp @@ -298,7 +298,7 @@ void LinearLayout::LayoutHorizontal( LayoutLength left, LayoutLength top, Layout auto height = bottom - top; // Space available for child - auto childSpace = height - (int)padding.top - (int)padding.bottom; + auto childSpace = height - padding.top - padding.bottom; auto count = GetChildCount(); @@ -360,25 +360,24 @@ void LinearLayout::LayoutHorizontal( LayoutLength left, LayoutLength top, Layout { case Dali::Toolkit::LinearLayout::Alignment::TOP: { - childTop = LayoutLength( padding.top ) + (int)childMargin.top; + childTop = LayoutLength( padding.top ) + childMargin.top; break; } case Dali::Toolkit::LinearLayout::Alignment::BOTTOM: { - childTop = height - (int)padding.bottom - childHeight - (int)childMargin.bottom; + childTop = height - padding.bottom - childHeight - childMargin.bottom; break; } case Dali::Toolkit::LinearLayout::Alignment::CENTER_VERTICAL: default: { - childTop = LayoutLength( padding.top ) + (int)( ( childSpace - childHeight ) / 2 ) + (int)childMargin.top - (int)childMargin.bottom; + childTop = LayoutLength( padding.top ) + ( ( childSpace - childHeight ) / 2 ) + childMargin.top - childMargin.bottom; break; } } - childLeft += childMargin.start; childLayout->Layout( childLeft, childTop, childLeft + childWidth, childTop + childHeight ); - childLeft += childWidth + (int)childMargin.end + mCellPadding.width; + childLeft += childWidth + childMargin.end + mCellPadding.width; } } } @@ -509,7 +508,7 @@ void LinearLayout::LayoutVertical( LayoutLength left, LayoutLength top, LayoutLe auto width = right - left; // Space available for child - auto childSpace = width - (int)padding.start - (int)padding.end; + auto childSpace = width - padding.start - padding.end; auto count = GetChildCount(); switch ( mAlignment & VERTICAL_ALIGNMENT_MASK ) @@ -565,7 +564,7 @@ void LinearLayout::LayoutVertical( LayoutLength left, LayoutLength top, LayoutLe } } childLayout->Layout( childLeft, childTop, childLeft + childWidth, childTop + childHeight ); - childTop += childHeight + (int)childMargin.bottom + mCellPadding.height; + childTop += childHeight + childMargin.bottom + mCellPadding.height; } } } diff --git a/dali-toolkit/internal/layouting/vbox-layout-impl.cpp b/dali-toolkit/internal/layouting/vbox-layout-impl.cpp old mode 100755 new mode 100644 index 7e33107..22fba16 --- a/dali-toolkit/internal/layouting/vbox-layout-impl.cpp +++ b/dali-toolkit/internal/layouting/vbox-layout-impl.cpp @@ -233,7 +233,7 @@ void VboxLayout::OnLayout( bool changed, LayoutLength left, LayoutLength top, La auto width = right - left; // Space available for child - auto childSpace = width - (int)padding.start - (int)padding.end; + auto childSpace = width - padding.start - padding.end; auto count = GetChildCount(); for( unsigned int childIndex = 0; childIndex < count; childIndex++) @@ -248,10 +248,10 @@ void VboxLayout::OnLayout( bool changed, LayoutLength left, LayoutLength top, La auto childMargin = childLayout->GetMargin(); childTop += childMargin.top; - childLeft = ( childSpace - childWidth ) / 2 + (int)childMargin.start - (int)childMargin.end; + childLeft = ( childSpace - childWidth ) / 2 + childMargin.start - childMargin.end; childLayout->Layout( childLeft, childTop, childLeft + childWidth, childTop + childHeight ); - childTop += childHeight + (int)childMargin.bottom + mCellPadding.height; + childTop += childHeight + childMargin.bottom + mCellPadding.height; } } } 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 100755 new mode 100644 index dcd48ce..b5fbb2e --- a/dali-toolkit/internal/visuals/animated-image/animated-image-visual.h +++ b/dali-toolkit/internal/visuals/animated-image/animated-image-visual.h @@ -264,7 +264,7 @@ private: Dali::WrapMode::Type mWrapModeU:3; Dali::WrapMode::Type mWrapModeV:3; - DevelAnimatedImageVisual::Action::Type mActionStatus:3; + DevelAnimatedImageVisual::Action::Type mActionStatus:2; 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 100755 new mode 100644 index 6df17c6..59d191e --- a/dali-toolkit/internal/visuals/texture-manager-impl.h +++ b/dali-toolkit/internal/visuals/texture-manager-impl.h @@ -482,12 +482,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:4; ///< The load state showing the load progress of the Texture + LoadState loadState:3; ///< 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:2; ///< CPU storage / GPU upload; + StorageType storageType:1; ///< CPU storage / GPU upload; bool loadSynchronously:1; ///< True if synchronous loading was requested - UseAtlas useAtlas:2; ///< USE_ATLAS if an atlas was requested. + UseAtlas useAtlas:1; ///< 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 d16ef81..56f3927 100755 --- a/dali-toolkit/public-api/dali-toolkit-common.h +++ b/dali-toolkit/public-api/dali-toolkit-common.h @@ -38,18 +38,8 @@ # 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 -- 2.7.4