From: Kimmo Hoikka Date: Mon, 21 Sep 2015 15:09:38 +0000 (-0700) Subject: Merge "Changed ImageView to utilise ImageRenderer." into devel/master X-Git-Tag: dali_1.1.4~14 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=172678a60aceeb2a60e5d4e5a3c613f8f3c492a9;hp=018b3b5ba7512694a9b95494493f2ae0477f2746 Merge "Changed ImageView to utilise ImageRenderer." into devel/master --- diff --git a/dali-toolkit/devel-api/controls/text-controls/text-selection-toolbar.h b/dali-toolkit/devel-api/controls/text-controls/text-selection-toolbar.h index 2fbf611..5a510d7 100644 --- a/dali-toolkit/devel-api/controls/text-controls/text-selection-toolbar.h +++ b/dali-toolkit/devel-api/controls/text-controls/text-selection-toolbar.h @@ -62,7 +62,8 @@ public: { enum { - MAX_SIZE = PROPERTY_START_INDEX ///< name "max-size", The maximum size the Popup can be, type VECTOR2 + MAX_SIZE = PROPERTY_START_INDEX, ///< name "max-size", The maximum size the Popup can be, type VECTOR2 + ENABLE_OVERSHOOT, ///< name "enable-overshoot", Whether the overshoot image is enabled, type BOOLEAN }; }; diff --git a/dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.cpp index eb6efe4..e26614d 100644 --- a/dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.cpp @@ -52,6 +52,7 @@ BaseHandle Create() DALI_TYPE_REGISTRATION_BEGIN( Toolkit::TextSelectionToolbar, Toolkit::Control, Create ); DALI_PROPERTY_REGISTRATION( Toolkit, TextSelectionToolbar, "max-size", VECTOR2, MAX_SIZE ) +DALI_PROPERTY_REGISTRATION( Toolkit, TextSelectionToolbar, "enable-overshoot", BOOLEAN, ENABLE_OVERSHOOT ) DALI_TYPE_REGISTRATION_END() @@ -87,7 +88,11 @@ void TextSelectionToolbar::SetProperty( BaseObject* object, Property::Index inde impl.SetPopupMaxSize( value.Get< Vector2 >() ); break; } - + case Toolkit::TextSelectionToolbar::Property::ENABLE_OVERSHOOT: + { + impl.mScrollView.SetOvershootEnabled( value.Get< bool >() ); + break; + } } // switch } // TextSelectionToolbar } @@ -109,6 +114,11 @@ Property::Value TextSelectionToolbar::GetProperty( BaseObject* object, Property: value = impl.GetPopupMaxSize(); break; } + case Toolkit::TextSelectionToolbar::Property::ENABLE_OVERSHOOT: + { + value = impl.mScrollView.IsOvershootEnabled(); + break; + } } // switch } return value; @@ -166,22 +176,24 @@ const Dali::Vector2& TextSelectionToolbar::GetPopupMaxSize() const return mMaxSize; } -void TextSelectionToolbar::SetUpScrollView( Toolkit::ScrollView& scrollView ) +void TextSelectionToolbar::SetUpScrollView() { - scrollView.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::ALL_DIMENSIONS ); - scrollView.SetParentOrigin( ParentOrigin::CENTER_LEFT ); - scrollView.SetAnchorPoint( AnchorPoint::CENTER_LEFT ); + mScrollView.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::ALL_DIMENSIONS ); + mScrollView.SetParentOrigin( ParentOrigin::CENTER_LEFT ); + mScrollView.SetAnchorPoint( AnchorPoint::CENTER_LEFT ); - scrollView.SetScrollingDirection( PanGestureDetector::DIRECTION_HORIZONTAL, Degree( 40.0f ) ); - scrollView.SetAxisAutoLock( true ); - scrollView.ScrollStartedSignal().Connect( this, &TextSelectionToolbar::OnScrollStarted ); - scrollView.ScrollCompletedSignal().Connect( this, &TextSelectionToolbar::OnScrollCompleted ); + mScrollView.SetScrollingDirection( PanGestureDetector::DIRECTION_HORIZONTAL, Degree( 40.0f ) ); + mScrollView.SetAxisAutoLock( true ); + mScrollView.ScrollStartedSignal().Connect( this, &TextSelectionToolbar::OnScrollStarted ); + mScrollView.ScrollCompletedSignal().Connect( this, &TextSelectionToolbar::OnScrollCompleted ); mRulerX = new DefaultRuler(); // IntrusivePtr which is unreferenced when ScrollView is destroyed. RulerPtr rulerY = new DefaultRuler(); // IntrusivePtr which is unreferenced when ScrollView is destroyed. rulerY->Disable(); - scrollView.SetRulerY( rulerY ); + mScrollView.SetRulerY( rulerY ); + + mScrollView.SetOvershootEnabled( true ); } void TextSelectionToolbar::SetUp() @@ -201,7 +213,7 @@ void TextSelectionToolbar::SetUp() stencil.SetParentOrigin( ParentOrigin::CENTER ); mScrollView = Toolkit::ScrollView::New(); - SetUpScrollView( mScrollView ); + SetUpScrollView(); // Toolbar must start with at least one option, adding further options with increase it's size mTableOfButtons = Dali::Toolkit::TableView::New( 1, 1 ); diff --git a/dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.h b/dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.h index 7309781..29d25db 100644 --- a/dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.h +++ b/dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.h @@ -120,9 +120,8 @@ private: // From Control /** * @brief Set up scrollview to scroll Toolbar horizontally - * @param[out] scrollView scrollview to setup */ - void SetUpScrollView( Toolkit::ScrollView& scrollView ); + void SetUpScrollView(); /** * @brief Set up the parts that make the Toolbar diff --git a/dali-toolkit/internal/text/multi-language-support-impl.cpp b/dali-toolkit/internal/text/multi-language-support-impl.cpp index 8e55537..37cf040 100644 --- a/dali-toolkit/internal/text/multi-language-support-impl.cpp +++ b/dali-toolkit/internal/text/multi-language-support-impl.cpp @@ -428,6 +428,7 @@ void MultilanguageSupport::ValidateFonts( const Vector& text, // Whether the font being validated is a default one not set by the user. const bool isDefault = ( 0u == fontId ); + FontId preferredFont = fontId; DALI_LOG_INFO( gLogFilter, Debug::Verbose, @@ -525,8 +526,8 @@ void MultilanguageSupport::ValidateFonts( const Vector& text, // Emojis are present in many monochrome fonts; prefer color by default. bool preferColor = ( TextAbstraction::EMOJI == script ); - // Find a default font. - fontId = fontClient.FindDefaultFont( character, pointSize, preferColor ); + // Find a fallback-font. + fontId = fontClient.FindFallbackFont( preferredFont, character, pointSize, preferColor ); // If the system does not support a suitable font, fallback to Latin if( 0u == fontId ) diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp index f9979df..a1283fb 100644 --- a/dali-toolkit/internal/text/text-controller.cpp +++ b/dali-toolkit/internal/text/text-controller.cpp @@ -404,11 +404,10 @@ void Controller::UpdateAfterFontChange( std::string& newDefaultFont ) { DALI_LOG_INFO( gLogFilter, Debug::Concise, "Controller::UpdateAfterFontChange"); - ClearFontData(); - if ( !mImpl->mUserDefinedFontFamily ) // If user defined font then should not update when system font changes { DALI_LOG_INFO( gLogFilter, Debug::Concise, "Controller::UpdateAfterFontChange newDefaultFont(%s)\n", newDefaultFont.c_str() ); + ClearFontData(); mImpl->mFontDefaults->mFontDescription.family = newDefaultFont; mImpl->UpdateModel( ALL_OPERATIONS ); mImpl->QueueModifyEvent( ModifyEvent::TEXT_REPLACED ); diff --git a/dali-toolkit/public-api/controls/buttons/button.h b/dali-toolkit/public-api/controls/buttons/button.h index f5c2701..34ea28f 100644 --- a/dali-toolkit/public-api/controls/buttons/button.h +++ b/dali-toolkit/public-api/controls/buttons/button.h @@ -326,31 +326,46 @@ public: // Deprecated API /** - * @deprecated Sets the label with an actor. + * @brief Sets the label with an actor. + * + * @deprecated DALi 1.0.50 + * * @param[in] label The actor to use as a label */ void SetLabel( Actor label ); /** - * @deprecated Sets the button image. + * @brief Sets the button image. + * + * @deprecated DALi 1.0.50 + * * @param[in] image The button image. */ void SetButtonImage( Image image ); /** - * @deprecated Sets the selected image. + * @brief Sets the selected image. + * + * @deprecated DALi 1.0.50 + * * @param[in] image The selected image. */ void SetSelectedImage( Image image ); /** - * @deprecated Gets the button image. + * @brief Gets the button image. + * + * @deprecated DALi 1.0.50 + * * @return An actor with the button image. */ Actor GetButtonImage() const; /** - * @deprecated Gets the selected image. + * @brief Gets the selected image. + * + * @deprecated DALi 1.0.50 + * * @return An actor with the selected image. */ Actor GetSelectedImage() const; diff --git a/dali-toolkit/public-api/controls/buttons/push-button.h b/dali-toolkit/public-api/controls/buttons/push-button.h index 8ebbf58..313d7d0 100644 --- a/dali-toolkit/public-api/controls/buttons/push-button.h +++ b/dali-toolkit/public-api/controls/buttons/push-button.h @@ -126,7 +126,10 @@ public: using Button::SetButtonImage; /** - * @deprecated Sets the unselected image with an Actor. + * @brief Sets the unselected image with an Actor. + * + * @deprecated DALi 1.0.50 + * * @param[in] image The Actor to use. */ void SetButtonImage( Actor image ); @@ -134,7 +137,10 @@ public: using Button::SetBackgroundImage; /** - * @deprecated Sets the background image with an Actor. + * @brief Sets the background image with an Actor. + * + * @deprecated DALi 1.0.50 + * * @param[in] image The Actor to use. */ void SetBackgroundImage( Actor image ); @@ -142,7 +148,10 @@ public: using Button::SetSelectedImage; /** - * @deprecated Sets the selected image with an Actor. + * @brief Sets the selected image with an Actor. + * + * @deprecated DALi 1.0.50 + * * @param[in] image The Actor to use. */ void SetSelectedImage( Actor image ); @@ -150,7 +159,10 @@ public: using Button::SetSelectedBackgroundImage; /** - * @deprecated Sets the selected background image with an Actor. + * @brief Sets the selected background image with an Actor. + * + * @deprecated DALi 1.0.50 + * * @param[in] image The Actor to use. */ void SetSelectedBackgroundImage( Actor image ); @@ -158,7 +170,10 @@ public: using Button::SetDisabledBackgroundImage; /** - * @deprecated Sets the disabled background image with an Actor. + * @brief Sets the disabled background image with an Actor. + * + * @deprecated DALi 1.0.50 + * * @param[in] image The Actor to use. */ void SetDisabledBackgroundImage( Actor image ); @@ -166,7 +181,10 @@ public: using Button::SetDisabledImage; /** - * @deprecated Sets the disabled image with an Actor. + * @brief Sets the disabled image with an Actor. + * + * @deprecated DALi 1.0.50 + * * @param[in] image The Actor to use. */ void SetDisabledImage( Actor image ); @@ -174,7 +192,10 @@ public: using Button::SetDisabledSelectedImage; /** - * @deprecated Sets the disabled selected image with an Actor. + * @brief Sets the disabled selected image with an Actor. + * + * @deprecated DALi 1.0.50 + * * @param[in] image The Actor to use. */ void SetDisabledSelectedImage( Actor image ); diff --git a/dali-toolkit/public-api/dali-toolkit-version.cpp b/dali-toolkit/public-api/dali-toolkit-version.cpp index 56709e4..44b947a 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 = 1; -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/480x800/dali-toolkit-default-theme.json b/dali-toolkit/styles/480x800/dali-toolkit-default-theme.json index 35531e4..ad05fea 100644 --- a/dali-toolkit/styles/480x800/dali-toolkit-default-theme.json +++ b/dali-toolkit/styles/480x800/dali-toolkit-default-theme.json @@ -113,6 +113,10 @@ distributing this software or its derivatives. "font-style":"{\"weight\":\"light\"}" } }, + "textselectiontoolbar": + { + "enable-overshoot":true + }, "scrollview": { "overshoot-effect-color":"B018" diff --git a/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json b/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json index 935744f..8a0fc66 100644 --- a/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json +++ b/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json @@ -113,6 +113,10 @@ distributing this software or its derivatives. "font-style":"{\"weight\":\"light\"}" } }, + "textselectiontoolbar": + { + "enable-overshoot":true + }, "scrollview": { "overshoot-effect-color":"B018" diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec index 5ae4f93..5340ef9 100644 --- a/packaging/dali-toolkit.spec +++ b/packaging/dali-toolkit.spec @@ -1,6 +1,6 @@ Name: dali-toolkit Summary: The OpenGLES Canvas Core Library Toolkit -Version: 1.1.2 +Version: 1.1.3 Release: 1 Group: System/Libraries License: Apache-2.0, BSD-2.0, MIT