{
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
};
};
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()
impl.SetPopupMaxSize( value.Get< Vector2 >() );
break;
}
-
+ case Toolkit::TextSelectionToolbar::Property::ENABLE_OVERSHOOT:
+ {
+ impl.mScrollView.SetOvershootEnabled( value.Get< bool >() );
+ break;
+ }
} // switch
} // TextSelectionToolbar
}
value = impl.GetPopupMaxSize();
break;
}
+ case Toolkit::TextSelectionToolbar::Property::ENABLE_OVERSHOOT:
+ {
+ value = impl.mScrollView.IsOvershootEnabled();
+ break;
+ }
} // switch
}
return value;
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()
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 );
/**
* @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
// 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,
// 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 )
{
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 );
// 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;
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 );
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 );
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 );
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 );
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 );
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 );
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 );
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
"font-style":"{\"weight\":\"light\"}"
}
},
+ "textselectiontoolbar":
+ {
+ "enable-overshoot":true
+ },
"scrollview":
{
"overshoot-effect-color":"B018"
"font-style":"{\"weight\":\"light\"}"
}
},
+ "textselectiontoolbar":
+ {
+ "enable-overshoot":true
+ },
"scrollview":
{
"overshoot-effect-color":"B018"
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