From: David Steele Date: Fri, 8 Dec 2017 14:33:55 +0000 (+0000) Subject: [dali_1.3.3] Merge branch 'devel/master' X-Git-Tag: dali_1.9.8~5^2~118 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=841cec182d26fa3b89d7a353fb0b5dde194779d0;hp=14a48afd7d9b5ba7bd8c8ebc69b214be8310613a [dali_1.3.3] Merge branch 'devel/master' Change-Id: I569ff9763c98f8eca5f5c97f71a5b70f7aca5a7d --- diff --git a/build/tizen/dali-toolkit/Makefile.am b/build/tizen/dali-toolkit/Makefile.am index 35534a0..542d064 100644 --- a/build/tizen/dali-toolkit/Makefile.am +++ b/build/tizen/dali-toolkit/Makefile.am @@ -151,6 +151,7 @@ develapitransitioneffectsdir = $(develapidir)/transition-effects develapitoolbardir = $(develapicontrolsdir)/tool-bar develapitooltipdir = $(develapicontrolsdir)/tooltip develapitextselectionpopupdir = $(develapicontrolsdir)/text-controls +develapitextdir = $(develapidir)/text develapivisualfactorydir = $(develapidir)/visual-factory develapivisualsdir = $(develapidir)/visuals @@ -180,6 +181,7 @@ develapitoolbar_HEADERS = $(devel_api_tool_bar_header_files) develapitooltip_HEADERS = $(devel_api_tooltip_header_files) develapitransitioneffects_HEADERS = $(devel_api_transition_effects_header_files) develapitextselectionpopup_HEADERS = $(devel_api_text_controls_header_files) +develapitext_HEADERS = $(devel_api_text_header_files) # public api source publicapidir = $(topleveldir)/public-api diff --git a/dali-toolkit/devel-api/file.list b/dali-toolkit/devel-api/file.list index d515119..3f114bb 100644 --- a/dali-toolkit/devel-api/file.list +++ b/dali-toolkit/devel-api/file.list @@ -129,9 +129,13 @@ devel_api_super_blur_view_header_files = \ devel_api_text_controls_header_files = \ $(devel_api_src_dir)/controls/text-controls/text-editor-devel.h \ + $(devel_api_src_dir)/controls/text-controls/text-label-devel.h \ $(devel_api_src_dir)/controls/text-controls/text-selection-popup.h \ $(devel_api_src_dir)/controls/text-controls/text-selection-toolbar.h +devel_api_text_header_files = \ + $(devel_api_src_dir)/text/text-enumerations-devel.h + devel_api_tool_bar_header_files = \ $(devel_api_src_dir)/controls/tool-bar/tool-bar.h diff --git a/dali-toolkit/internal/text/multi-language-support-impl.cpp b/dali-toolkit/internal/text/multi-language-support-impl.cpp index e88a286..990d0ce 100644 --- a/dali-toolkit/internal/text/multi-language-support-impl.cpp +++ b/dali-toolkit/internal/text/multi-language-support-impl.cpp @@ -451,10 +451,6 @@ void MultilanguageSupport::ValidateFonts( const Vector& text, FontId previousFontId = 0u; bool isPreviousEmojiScript = false; - // Whether it's the first set of characters to be validated. - // Used in case the paragraph starts with characters common to all scripts. - bool isFirstSetToBeValidated = true; - CharacterIndex lastCharacter = startIndex + numberOfCharacters; for( Length index = startIndex; index < lastCharacter; ++index ) { @@ -705,12 +701,6 @@ void MultilanguageSupport::ValidateFonts( const Vector& text, } #endif - if( isFirstSetToBeValidated && !isCommonScript ) - { - currentFontRun.fontId = fontId; - isFirstSetToBeValidated = false; - } - // The font is now validated. if( ( fontId != currentFontRun.fontId ) || isNewParagraphCharacter ) @@ -728,11 +718,6 @@ void MultilanguageSupport::ValidateFonts( const Vector& text, currentFontRun.characterRun.characterIndex = currentFontRun.characterRun.characterIndex + currentFontRun.characterRun.numberOfCharacters; currentFontRun.characterRun.numberOfCharacters = 0u; currentFontRun.fontId = fontId; - - if( isNewParagraphCharacter ) - { - isFirstSetToBeValidated = true; - } } // Add one more character to the run. diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp index 1c15e22..d054cbc 100755 --- a/dali-toolkit/internal/text/text-controller.cpp +++ b/dali-toolkit/internal/text/text-controller.cpp @@ -3836,6 +3836,7 @@ void Controller::ClearFontData() mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | VALIDATE_FONTS | SHAPE_TEXT | + BIDI_INFO | GET_GLYPH_METRICS | LAYOUT | UPDATE_LAYOUT_SIZE | diff --git a/dali-toolkit/public-api/dali-toolkit-version.cpp b/dali-toolkit/public-api/dali-toolkit-version.cpp index e1226ce..6ed8280 100644 --- a/dali-toolkit/public-api/dali-toolkit-version.cpp +++ b/dali-toolkit/public-api/dali-toolkit-version.cpp @@ -31,7 +31,7 @@ namespace Toolkit const unsigned int TOOLKIT_MAJOR_VERSION = 1; const unsigned int TOOLKIT_MINOR_VERSION = 3; -const unsigned int TOOLKIT_MICRO_VERSION = 2; +const unsigned int TOOLKIT_MICRO_VERSION = 3; const char * const TOOLKIT_BUILD_DATE = __DATE__ " " __TIME__; #ifdef DEBUG_ENABLED diff --git a/dali-toolkit/styles/1920x1080/images/cursor_handler_drop_center.png b/dali-toolkit/styles/1920x1080/images/cursor_handler_drop_center.png index 15c937a..244096f 100644 Binary files a/dali-toolkit/styles/1920x1080/images/cursor_handler_drop_center.png and b/dali-toolkit/styles/1920x1080/images/cursor_handler_drop_center.png differ diff --git a/dali-toolkit/styles/1920x1080/images/selection_handle_drop_left.png b/dali-toolkit/styles/1920x1080/images/selection_handle_drop_left.png index 149becb..244096f 100644 Binary files a/dali-toolkit/styles/1920x1080/images/selection_handle_drop_left.png and b/dali-toolkit/styles/1920x1080/images/selection_handle_drop_left.png differ diff --git a/dali-toolkit/styles/1920x1080/images/selection_handle_drop_right.png b/dali-toolkit/styles/1920x1080/images/selection_handle_drop_right.png index 75035bc..244096f 100644 Binary files a/dali-toolkit/styles/1920x1080/images/selection_handle_drop_right.png and b/dali-toolkit/styles/1920x1080/images/selection_handle_drop_right.png differ diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec index 4cbdb9e..b1b4cef 100644 --- a/packaging/dali-toolkit.spec +++ b/packaging/dali-toolkit.spec @@ -1,6 +1,6 @@ Name: dali-toolkit Summary: Dali 3D engine Toolkit -Version: 1.3.2 +Version: 1.3.3 Release: 1 Group: System/Libraries License: Apache-2.0 and BSD-3-Clause and MIT