Merge "Do not request relayout when a control background color is changed" into devel...

diff --git a/CMakeLists.txt b/CMakeLists.txt
deleted file mode 100755 (executable)
index 4d45c64..0000000
--- a/CMakeLists.txt
+++ /dev/null
@@ -1,306 +0,0 @@
-cmake_minimum_required(VERSION 3.11)\r
-\r
-PROJECT (dali-toolkit)\r
-\r
-ADD_DEFINITIONS(\r
--DDALI_ENV="../../dali-env"\r
--DDALI_DATA_READ_ONLY_DIR=DALI_ENV"/opt/share/dali"\r
--DDALI_IMAGE_DIR=DALI_ENV"/opt/share/dali/toolkit/images/"\r
--DDALI_STYLE_DIR=DALI_ENV"/opt/share/dali/toolkit/styles/"\r
--DDALI_SOUND_DIR=DALI_ENV"/opt/share/dali/toolkit/sounds/"\r
--DDALI_STYLE_IMAGE_DIR=DALI_ENV"/opt/share/dali/toolkit/styles/images/"\r
--DCURL_STATICLIB=0\r
-/DBUILDING_DALI_TOOLKIT\r
-/vmg\r
-/NODEFAULTLIB:"libcmt.lib"\r
-/FI"../windows-dependencies/ExInclude/PreprocessorDefinitions.h"\r
-/FI"../windows-dependencies/ExInclude/ToolKitPreDefine.h"\r
-/MP\r
-/Gz\r
-)\r
-\r
-#head file path\r
-INCLUDE_DIRECTORIES(\r
-./\r
-../dali-core\r
-../dali-adaptor\r
-../windows-dependencies/ExInclude\r
-../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}/accessibility-manager/accessibility-manager.cpp\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}/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/image-visual-shader-factory.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}/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}/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
-../windows-dependencies/ExLib\r
-../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/yoga/Yoga.cpp\r
-  dali-toolkit/third-party/yoga/YGStyle.cpp\r
-  dali-toolkit/third-party/yoga/YGNodePrint.cpp\r
-  dali-toolkit/third-party/yoga/YGNode.cpp\r
-  dali-toolkit/third-party/yoga/YGLayout.cpp\r
-  dali-toolkit/third-party/yoga/YGFloatOptional.cpp\r
-  dali-toolkit/third-party/yoga/YGEnums.cpp\r
-  dali-toolkit/third-party/yoga/YGConfig.cpp\r
-  dali-toolkit/third-party/yoga/Utils.cpp\r
-)\r
-set(LIBRARY_OUTPUT_PATH ../../../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
-target_link_libraries(dali-toolkit WindowsPlatform.lib)\r
-\r
-add_dependencies(dali-toolkit dali-core)\r
-add_dependencies(dali-toolkit dali-adaptor)\r
-\r
-#add link library\r
-#TARGET_LINK_LIBRARIES(${FS_BUILD_BINARY_PREFIX}sqrt ${LIBRARIES})\r

diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Cursor.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Cursor.cpp
index 647b9e8..2ab84e7 100755 (executable)
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Cursor.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Cursor.cpp
@@ -414,7 +414,7 @@ int UtcDaliGetClosestCursorIndex(void)
                                       CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP };
   CharacterIndex logicalIndex04[] = {    0,  5u,  6u, 11u, 11u,
                                        12u, 16u, 17u, 21u, 21u,
-                                       22u, 25u, 30u, 32u, 35u, 33u, 40u,
+                                       22u, 25u, 31u, 32u, 35u, 34u, 40u,
                                        41u };
   bool isCharacterHit04[] = { false, true, true, true, false,
                               false, true, true, true, false,
@@ -453,7 +453,7 @@ int UtcDaliGetClosestCursorIndex(void)
                                       CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP };
   CharacterIndex logicalIndex05[] = {    0,  10u,  19u,  28u,  39u,  44u,
                                        45u,  49u,  59u,  66u,  78u,  87u,
-                                       89u,  96u, 107u, 115u, 124u, 133u,
+                                       89u,  96u, 106u, 115u, 124u, 133u,
                                       134u, 145u, 154u, 162u, 171u, 179u,
                                       180u, 184u, 191u, 203u, 212u,
                                       221u, 222u, 233u, 240u, 251u, 265u };

diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Layout.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Layout.cpp
index 763a5ac..05226d4 100755 (executable)
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Layout.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Layout.cpp
@@ -199,7 +199,7 @@ bool LayoutTextTest( const LayoutTextData& data )
   {
     const Vector2& position = *( glyphPositions.Begin() + index );
 
-    if( fabsf( position.x - *( data.positions + 2u * index ) ) > Math::MACHINE_EPSILON_1000 )
+    if( fabsf( std::round( position.x ) - *( data.positions + 2u * index ) ) > Math::MACHINE_EPSILON_1000 )
     {
       std::cout << "  Different position for glyph " << index << " x : " << position.x << ", expected : " << *( data.positions + 2u * index ) << std::endl;
       return false;

diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-ViewModel.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-ViewModel.cpp
index 07779ea..f243f08 100755 (executable)
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-ViewModel.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-ViewModel.cpp
@@ -583,13 +583,13 @@ int UtcDaliTextViewModelElideText02(void)
   Size textSize00( 100.f, 100.f );
 
   Size textSize01( 80.f, 100.f );
-  float positions01[] = { 0.f, 8.f, 17.f, 27.f, 35.f, 43.f, 47.f, 58.f, 64.0f };
+  float positions01[] = { 0.f, 8.f, 16.f, 26.f, 34.f, 43.f, 47.f, 58.f, 64.0f };
 
   Size textSize02( 80.f, 100.f );
-  float positions02[] = { 69.f, 63.f, 58.f, 49.f, 45.f, 41.f, 32.f, 23.f, 8.f };
+  float positions02[] = { 69.f, 63.f, 58.f, 50.f, 45.f, 41.f, 32.f, 23.f, 9.f };
 
   Size textSize03( 80.f, 100.f );
-  float positions03[] = { 55.f, 48.f, 44.f, 42.f, 36.f, 29.f, 26.f, 20.f, 13.f, 8.f, 4.f, 6.f };
+  float positions03[] = { 54.f, 47.f, 44.f, 41.f, 36.f, 29.f, 25.f, 20.f, 13.f, 8.f, 4.f, 6.f };
 
   Size textSize04( 80.f, 10.f );
   float positions04[] = { 2.f };

diff --git a/dali-toolkit/internal/text/layouts/layout-engine.cpp b/dali-toolkit/internal/text/layouts/layout-engine.cpp
index fb63d96..e13c842 100755 (executable)
--- a/dali-toolkit/internal/text/layouts/layout-engine.cpp
+++ b/dali-toolkit/internal/text/layouts/layout-engine.cpp
@@ -670,7 +670,7 @@ struct Engine::Impl
       const GlyphInfo& glyph = *( glyphsBuffer + i );
       Vector2& position = *( glyphPositionsBuffer + i );
 
-      position.x = std::roundf( penX + glyph.xBearing );
+      position.x = penX + glyph.xBearing;
       position.y = -glyph.yBearing;
 
       penX += ( glyph.advance + interGlyphExtraAdvance );
@@ -732,7 +732,7 @@ struct Engine::Impl
         const GlyphInfo& glyph = *( glyphsBuffer + glyphIndex );
         Vector2& position = *( glyphPositionsBuffer + glyphIndex - layoutParameters.startGlyphIndex );
 
-        position.x = std::round( penX + glyph.xBearing );
+        position.x = penX + glyph.xBearing;
         position.y = -glyph.yBearing;
 
        penX += ( glyph.advance + layoutParameters.interGlyphExtraAdvance );

diff --git a/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.cpp b/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 3fd324d..a972810
--- a/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.cpp
+++ b/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.cpp
@@ -41,6 +41,8 @@ namespace Internal
 AtlasGlyphManager::AtlasGlyphManager()
 {
   mAtlasManager = Dali::Toolkit::AtlasManager::New();
+  mSampler = Sampler::New();
+  mSampler.SetFilterMode( FilterMode::NEAREST, FilterMode::NEAREST );
 }
 
 void AtlasGlyphManager::Add( const Text::GlyphInfo& glyph,
@@ -58,6 +60,7 @@ void AtlasGlyphManager::Add( const Text::GlyphInfo& glyph,
     Dali::Texture atlas = mAtlasManager.GetAtlasContainer( slot.mAtlasId );
     TextureSet textureSet = TextureSet::New();
     textureSet.SetTexture( 0u, atlas );
+    textureSet.SetSampler( 0u, mSampler);
     mAtlasManager.SetTextures( slot.mAtlasId, textureSet );
   }
 

diff --git a/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.h b/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.h
old mode 100644 (file)
new mode 100755 (executable)
index 3d2613e..e78b095
--- a/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.h
+++ b/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.h
@@ -134,6 +134,7 @@ private:
   Dali::Toolkit::AtlasManager mAtlasManager;          ///> Atlas Manager created by GlyphManager
   std::vector< FontGlyphRecord > mFontGlyphRecords;
   Toolkit::AtlasGlyphManager::Metrics mMetrics;       ///> Metrics to pass back on GlyphManager status
+  Sampler mSampler;
 };
 
 } // namespace Internal