/*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include <dali/integration-api/debug.h>
#include <dali/public-api/actors/layer.h>
#include <dali/public-api/adaptor-framework/timer.h>
-#include <dali/public-api/common/stage.h>
-#include <dali/public-api/events/touch-data.h>
+#include <dali/devel-api/common/stage.h>
+#include <dali/public-api/events/touch-event.h>
#include <dali/public-api/events/pan-gesture.h>
-#include <dali/public-api/images/resource-image.h>
#include <dali/public-api/object/property-notification.h>
#include <dali/public-api/rendering/geometry.h>
#include <dali/public-api/rendering/renderer.h>
+#include <dali/devel-api/adaptor-framework/image-loading.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/image-view/image-view.h>
{
const char* VERTEX_SHADER = MAKE_SHADER(
attribute mediump vec2 aPosition;
-uniform mediump mat4 uMvpMatrix;
+uniform highp mat4 uMvpMatrix;
void main()
{
{
const Dali::Vector3 DEFAULT_GRAB_HANDLE_RELATIVE_SIZE( 1.25f, 1.5f, 1.0f );
const Dali::Vector3 DEFAULT_SELECTION_HANDLE_RELATIVE_SIZE( 1.25f, 1.5f, 1.0f );
+const Dali::Vector3 ACTIVE_LAYER_ANCHOR_POINT( 0.5f, 0.5f, 0.5f );
const Dali::Vector4 LIGHT_BLUE( 0.75f, 0.96f, 1.f, 1.f ); // The text highlight color. TODO: due some problems, maybe with the blending function in the text clipping, the color is fully opaque.
const float CURSOR_WIDTH = 1.f; ///< The cursor's width in pixels.
-/**
- * structure to hold coordinates of each quad, which will make up the mesh.
- */
-struct QuadCoordinates
-{
- /**
- * Default constructor
- */
- QuadCoordinates()
- {
- }
-
- /**
- * Constructor
- * @param[in] x1 left co-ordinate
- * @param[in] y1 top co-ordinate
- * @param[in] x2 right co-ordinate
- * @param[in] y2 bottom co-ordinate
- */
- QuadCoordinates(float x1, float y1, float x2, float y2)
- : min(x1, y1),
- max(x2, y2)
- {
- }
-
- Dali::Vector2 min; ///< top-left (minimum) position of quad
- Dali::Vector2 max; ///< bottom-right (maximum) position of quad
-};
+const float POPUP_PADDING = 2.f; ///< Padding space between the highlight box and the text's popup.
-typedef std::vector<QuadCoordinates> QuadContainer;
+typedef Dali::Vector<Dali::Vector4> QuadContainer;
/**
* @brief Takes a bounding rectangle in the local coordinates of an actor and returns the world coordinates Bounding Box.
: color( Dali::Color::BLACK ),
position(),
cursorHeight( 0.0f ),
- lineHeight( 0.0f )
+ lineHeight( 0.0f ),
+ glyphOffset( 0.0f )
{
}
Vector2 position;
float cursorHeight;
float lineHeight;
+ float glyphOffset;
};
struct HandleImpl
grabDisplacementX( 0.f ),
grabDisplacementY( 0.f ),
active( false ),
- visible( false ),
+ horizontallyVisible( false ),
+ verticallyVisible( false ),
pressed( false ),
verticallyFlippedPreferred( false ),
horizontallyFlipped( false ),
- verticallyFlipped( false )
+ verticallyFlipped( false ),
+ verticallyFlippedOnTouch( false )
{
}
float lineHeight; ///< Not the handle height
float grabDisplacementX;
float grabDisplacementY;
- bool active : 1;
- bool visible : 1;
- bool pressed : 1;
+ bool active : 1;
+ bool horizontallyVisible : 1;
+ bool verticallyVisible : 1;
+ bool pressed : 1;
bool verticallyFlippedPreferred : 1; ///< Whether the handle is preferred to be vertically flipped.
bool horizontallyFlipped : 1; ///< Whether the handle has been horizontally flipped.
bool verticallyFlipped : 1; ///< Whether the handle has been vertically flipped.
+ bool verticallyFlippedOnTouch : 1; ///< Whether the handle is vertically flipped on touch.
};
struct PopupImpl
mBoundingBox(),
mHighlightColor( LIGHT_BLUE ),
mHighlightPosition( Vector2::ZERO ),
+ mHighlightSize( Vector2::ZERO ),
+ mControlSize( Vector2::ZERO ),
+ mHighlightOutlineOffset( 0.f ),
mActiveCursor( ACTIVE_CURSOR_NONE ),
mCursorBlinkInterval( CURSOR_BLINK_INTERVAL ),
mCursorBlinkDuration( 0.0f ),
mCursorWidth( CURSOR_WIDTH ),
mHandleScrolling( HANDLE_TYPE_COUNT ),
+ mHandleReleased( HANDLE_TYPE_COUNT ),
mScrollDirection( SCROLL_NONE ),
mScrollThreshold( SCROLL_THRESHOLD ),
mScrollSpeed( SCROLL_SPEED ),
mIsHandlePreviouslyCrossed( false ),
mNotifyEndOfScroll( false ),
mHorizontalScrollingEnabled( false ),
- mVerticalScrollingEnabled( false )
+ mVerticalScrollingEnabled( false ),
+ mSmoothHandlePanEnabled( false ),
+ mIsHighlightBoxActive( false )
{
mQuadVertexFormat[ "aPosition" ] = Property::VECTOR2;
mHighlightShader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER );
if( mPrimaryCursor )
{
const CursorImpl& cursor = mCursor[PRIMARY_CURSOR];
- mPrimaryCursorVisible = ( ( cursor.position.x + mCursorWidth <= mControlSize.width ) &&
- ( cursor.position.x >= 0.f ) &&
- ( cursor.position.y + cursor.cursorHeight <= mControlSize.height ) &&
- ( cursor.position.y >= 0.f ) );
+ mPrimaryCursorVisible = ( ( mControlSize.width - ( cursor.position.x + mCursorWidth ) > -Math::MACHINE_EPSILON_1000 ) &&
+ ( cursor.position.x > -Math::MACHINE_EPSILON_1000 ) &&
+ ( mControlSize.height - ( cursor.position.y + cursor.cursorHeight ) > -Math::MACHINE_EPSILON_1000 ) &&
+ ( cursor.position.y > -Math::MACHINE_EPSILON_1000 ) );
if( mPrimaryCursorVisible )
{
- mPrimaryCursor.SetPosition( cursor.position.x,
- cursor.position.y );
- mPrimaryCursor.SetSize( Size( mCursorWidth, cursor.cursorHeight ) );
+ mPrimaryCursor.SetProperty( Actor::Property::POSITION, Vector2( cursor.position.x,
+ cursor.position.y ) );
+ mPrimaryCursor.SetProperty( Actor::Property::SIZE, Size( mCursorWidth, cursor.cursorHeight ) );
}
- mPrimaryCursor.SetVisible( mPrimaryCursorVisible && mCursorBlinkStatus );
+ mPrimaryCursor.SetProperty( Actor::Property::VISIBLE, mPrimaryCursorVisible && mCursorBlinkStatus );
}
if( mSecondaryCursor )
{
const CursorImpl& cursor = mCursor[SECONDARY_CURSOR];
- mSecondaryCursorVisible = ( ( cursor.position.x + mCursorWidth <= mControlSize.width ) &&
- ( cursor.position.x >= 0.f ) &&
- ( cursor.position.y + cursor.cursorHeight <= mControlSize.height ) &&
- ( cursor.position.y >= 0.f ) );
+ mSecondaryCursorVisible = ( ( mControlSize.width - ( cursor.position.x + mCursorWidth ) > -Math::MACHINE_EPSILON_1000 ) &&
+ ( cursor.position.x > -Math::MACHINE_EPSILON_1000 ) &&
+ ( mControlSize.height - ( cursor.position.y + cursor.cursorHeight ) > -Math::MACHINE_EPSILON_1000 ) &&
+ ( cursor.position.y > -Math::MACHINE_EPSILON_1000 ) );
if( mSecondaryCursorVisible )
{
- mSecondaryCursor.SetPosition( cursor.position.x,
- cursor.position.y );
- mSecondaryCursor.SetSize( Size( mCursorWidth, cursor.cursorHeight ) );
+ mSecondaryCursor.SetProperty( Actor::Property::POSITION, Vector2( cursor.position.x,
+ cursor.position.y ) );
+ mSecondaryCursor.SetProperty( Actor::Property::SIZE, Size( mCursorWidth, cursor.cursorHeight ) );
}
- mSecondaryCursor.SetVisible( mSecondaryCursorVisible && mCursorBlinkStatus );
+ mSecondaryCursor.SetProperty( Actor::Property::VISIBLE, mSecondaryCursorVisible && mCursorBlinkStatus );
}
// Show or hide the grab handle
HandleImpl& grabHandle = mHandle[GRAB_HANDLE];
bool newGrabHandlePosition = false;
+ grabHandle.horizontallyVisible = false;
+ grabHandle.verticallyVisible = false;
if( grabHandle.active )
{
- const bool isVisible = ( ( grabHandle.position.x + floor( 0.5f * mCursorWidth ) <= mControlSize.width ) &&
- ( grabHandle.position.x >= 0.f ) &&
- ( grabHandle.position.y <= mControlSize.height - grabHandle.lineHeight ) &&
- ( grabHandle.position.y >= 0.f ) );
+ grabHandle.horizontallyVisible = ( ( mControlSize.width - ( grabHandle.position.x + floor( 0.5f * mCursorWidth ) ) > -Math::MACHINE_EPSILON_1000 ) &&
+ ( grabHandle.position.x > -Math::MACHINE_EPSILON_1000 ) );
+ grabHandle.verticallyVisible = ( ( ( mControlSize.height - grabHandle.lineHeight ) - grabHandle.position.y > -Math::MACHINE_EPSILON_1000 ) &&
+ ( grabHandle.position.y > -Math::MACHINE_EPSILON_1000 ) );
+ const bool isVisible = grabHandle.horizontallyVisible && grabHandle.verticallyVisible;
if( isVisible )
{
CreateGrabHandle();
if( grabHandle.actor )
{
- grabHandle.actor.SetVisible( isVisible );
+ grabHandle.actor.SetProperty( Actor::Property::VISIBLE, isVisible );
}
}
else if( grabHandle.actor )
HandleImpl& secondary = mHandle[ RIGHT_SELECTION_HANDLE ];
bool newPrimaryHandlePosition = false;
bool newSecondaryHandlePosition = false;
+
+ primary.horizontallyVisible = ( ( mControlSize.width - primary.position.x > -Math::MACHINE_EPSILON_1000 ) &&
+ ( primary.position.x > -Math::MACHINE_EPSILON_1000 ) );
+ primary.verticallyVisible = ( ( ( mControlSize.height - primary.lineHeight ) - primary.position.y > -Math::MACHINE_EPSILON_1000 ) &&
+ ( primary.position.y + ( primary.verticallyFlipped ? 0.f : primary.lineHeight ) > -Math::MACHINE_EPSILON_1000 ) );
+ secondary.horizontallyVisible = ( ( mControlSize.width - secondary.position.x > -Math::MACHINE_EPSILON_1000 ) &&
+ ( secondary.position.x > -Math::MACHINE_EPSILON_1000 ) );
+ secondary.verticallyVisible = ( ( ( mControlSize.height - secondary.lineHeight ) - secondary.position.y > -Math::MACHINE_EPSILON_1000 ) &&
+ ( secondary.position.y + ( secondary.verticallyFlipped ? 0.f : secondary.lineHeight ) > -Math::MACHINE_EPSILON_1000 ) );
+
+ const bool primaryVisible = primary.horizontallyVisible && primary.verticallyVisible;
+ const bool secondaryVisible = secondary.horizontallyVisible && secondary.verticallyVisible;
+
if( primary.active || secondary.active )
{
- const bool isPrimaryVisible = ( ( primary.position.x <= mControlSize.width ) &&
- ( primary.position.x >= 0.f ) &&
- ( primary.position.y <= mControlSize.height - primary.lineHeight ) &&
- ( primary.position.y >= 0.f ) );
- const bool isSecondaryVisible = ( ( secondary.position.x <= mControlSize.width ) &&
- ( secondary.position.x >= 0.f ) &&
- ( secondary.position.y <= mControlSize.height - secondary.lineHeight ) &&
- ( secondary.position.y >= 0.f ) );
-
- if( isPrimaryVisible || isSecondaryVisible )
+ if( primaryVisible || secondaryVisible )
{
CreateSelectionHandles();
- if( isPrimaryVisible )
+ if( primaryVisible )
{
SetSelectionHandlePosition( LEFT_SELECTION_HANDLE );
newPrimaryHandlePosition = true;
}
- if( isSecondaryVisible )
+ if( secondaryVisible )
{
SetSelectionHandlePosition( RIGHT_SELECTION_HANDLE );
if( primary.actor )
{
- primary.actor.SetVisible( isPrimaryVisible );
+ primary.actor.SetProperty( Actor::Property::VISIBLE, primaryVisible );
}
if( secondary.actor )
{
- secondary.actor.SetVisible( isSecondaryVisible );
+ secondary.actor.SetProperty( Actor::Property::VISIBLE, secondaryVisible );
}
- CreateHighlight();
- UpdateHighlight();
}
else
{
{
secondary.actor.Unparent();
}
+ }
+
+ if( mIsHighlightBoxActive )
+ {
+ CreateHighlight();
+ UpdateHighlight();
+ }
+ else
+ {
if( mHighlightActor )
{
mHighlightActor.Unparent();
SetupActiveLayerPropertyNotifications();
}
- if( mActiveCopyPastePopup )
+ if( mActiveCopyPastePopup &&
+ ( primaryVisible || secondaryVisible ) )
{
ShowPopup();
mPopupSetNewPosition = true;
void ShowPopup()
{
- if ( !mCopyPastePopup.actor )
+ if( !mCopyPastePopup.actor )
{
return;
}
mCopyPastePopup.actor.ShowPopup();
}
- void DeterminePositionPopup()
+ float CalculateVerticalPopUpPosition( float halfHeight, bool preferBelow )
+ {
+ float yPosition = 0.f;
+
+ const HandleImpl& primaryHandle = mHandle[LEFT_SELECTION_HANDLE];
+ const HandleImpl& secondaryHandle = mHandle[RIGHT_SELECTION_HANDLE];
+ const HandleImpl& grabHandle = mHandle[GRAB_HANDLE];
+
+ if( primaryHandle.active || secondaryHandle.active )
+ {
+ // The origin of the decorator's coordinate system in world coords.
+ const Vector3 originWorldCoords = mActiveLayer.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ) - mActiveLayer.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ) * ACTIVE_LAYER_ANCHOR_POINT;
+
+ if( preferBelow )
+ {
+ // Find out if there is enough space for the popup at the bottom.
+ const float primaryBelowY = primaryHandle.position.y + primaryHandle.lineHeight + primaryHandle.size.height;
+ const float secondaryBelowY = secondaryHandle.position.y + secondaryHandle.lineHeight + secondaryHandle.size.height;
+
+ float maxY = std::max( primaryBelowY, secondaryBelowY );
+
+ yPosition = halfHeight + maxY;
+
+ if( originWorldCoords.y + yPosition + halfHeight > mBoundingBox.w )
+ {
+ // Does not fit below.
+
+ // Try to fit first below the non active handle. Otherwise above the active handle.
+ if( RIGHT_SELECTION_HANDLE == mHandleReleased )
+ {
+ if( primaryBelowY < secondaryBelowY )
+ {
+ yPosition = halfHeight + primaryBelowY;
+ }
+ else
+ {
+ yPosition = primaryHandle.position.y - primaryHandle.size.height - halfHeight;
+ }
+ }
+ else if( LEFT_SELECTION_HANDLE == mHandleReleased )
+ {
+ if( secondaryBelowY < primaryBelowY )
+ {
+ yPosition = halfHeight + secondaryBelowY;
+ }
+ else
+ {
+ yPosition = secondaryHandle.position.y - secondaryHandle.size.height - halfHeight;
+ }
+ }
+
+ // Check the handle is whithin the decoration box.
+ if( originWorldCoords.y + yPosition < mBoundingBox.y )
+ {
+ yPosition = mBoundingBox.y - originWorldCoords.y + halfHeight;
+ }
+
+ if( originWorldCoords.y + yPosition > mBoundingBox.w )
+ {
+ yPosition = mBoundingBox.w - originWorldCoords.y - halfHeight;
+ }
+ }
+ } // preferBelow
+ else
+ {
+ // Find out if there is enough space for the popup at the top.
+ const float primaryTopY = primaryHandle.position.y - primaryHandle.size.height;
+ const float secondaryTopY = secondaryHandle.position.y - secondaryHandle.size.height;
+
+ float minY = std::min( primaryTopY, secondaryTopY );
+
+ yPosition = -halfHeight + minY;
+ } // !preferBelow
+ } // ( primaryHandle.active || secondaryHandle.active )
+ else if( grabHandle.active )
+ {
+ if( preferBelow )
+ {
+ yPosition = halfHeight + grabHandle.lineHeight + grabHandle.size.height + grabHandle.position.y;
+ }
+ else
+ {
+ yPosition = -halfHeight + grabHandle.position.y - POPUP_PADDING;
+ }
+ }
+
+ return yPosition;
+ }
+
+ void ConstrainPopupPosition( const Vector3& popupHalfSize )
+ {
+ // Check if the popup is within the boundaries of the decoration box.
+
+ // Check first the horizontal dimension. If is not within the boundaries, it calculates the offset.
+
+ // The origin of the decorator's coordinate system in world coords.
+ const Vector3 originWorldCoords = mActiveLayer.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ) - mActiveLayer.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ) * ACTIVE_LAYER_ANCHOR_POINT;
+
+ // The popup's position in world coords.
+ Vector3 popupPositionWorldCoords = originWorldCoords + mCopyPastePopup.position;
+
+ if( popupPositionWorldCoords.x - popupHalfSize.width < mBoundingBox.x )
+ {
+ mCopyPastePopup.position.x += mBoundingBox.x - ( popupPositionWorldCoords.x - popupHalfSize.width );
+ }
+ else if( popupPositionWorldCoords.x + popupHalfSize.width > mBoundingBox.z )
+ {
+ mCopyPastePopup.position.x += mBoundingBox.z - ( popupPositionWorldCoords.x + popupHalfSize.width );
+ }
+
+ // Check the vertical dimension. If the popup doesn't fit above the handles, it looks for a valid position below.
+ if( popupPositionWorldCoords.y - popupHalfSize.height < mBoundingBox.y )
+ {
+ mCopyPastePopup.position.y = CalculateVerticalPopUpPosition( popupHalfSize.height, true ); // true -> prefer to set the popup's position below.
+ }
+ }
+
+ void SetPopupPosition( Actor actor )
{
if( !mActiveCopyPastePopup )
{
}
// Retrieves the popup's size after relayout.
- const Vector3 popupSize = Vector3( mCopyPastePopup.actor.GetRelayoutSize( Dimension::WIDTH ), mCopyPastePopup.actor.GetRelayoutSize( Dimension::HEIGHT ), 0.0f );
+ const Vector3 popupSize( mCopyPastePopup.actor.GetRelayoutSize( Dimension::WIDTH ), mCopyPastePopup.actor.GetRelayoutSize( Dimension::HEIGHT ), 0.0f );
+ const Vector3 popupHalfSize = popupSize * 0.5f;
if( mPopupSetNewPosition )
{
const HandleImpl& primaryHandle = mHandle[LEFT_SELECTION_HANDLE];
const HandleImpl& secondaryHandle = mHandle[RIGHT_SELECTION_HANDLE];
- const CursorImpl& cursor = mCursor[PRIMARY_CURSOR];
+ const HandleImpl& grabHandle = mHandle[GRAB_HANDLE];
if( primaryHandle.active || secondaryHandle.active )
{
- // Calculates the popup's position if selection handles are active.
const float minHandleXPosition = std::min( primaryHandle.position.x, secondaryHandle.position.x );
const float maxHandleXPosition = std::max( primaryHandle.position.x, secondaryHandle.position.x );
- const float maxHandleHeight = std::max( primaryHandle.size.height, secondaryHandle.size.height );
mCopyPastePopup.position.x = minHandleXPosition + ( ( maxHandleXPosition - minHandleXPosition ) * 0.5f );
- mCopyPastePopup.position.y = -0.5f * popupSize.height - maxHandleHeight + std::min( primaryHandle.position.y, secondaryHandle.position.y );
+
+ const float primaryY = -popupHalfSize.height + primaryHandle.position.y - ( primaryHandle.verticallyFlipped ? primaryHandle.size.height : POPUP_PADDING );
+ const float secondaryY = -popupHalfSize.height + secondaryHandle.position.y - ( secondaryHandle.verticallyFlipped ? secondaryHandle.size.height : POPUP_PADDING );
+
+ mCopyPastePopup.position.y = std::min( primaryY, secondaryY );
}
- else
+ else if( grabHandle.active )
{
- // Calculates the popup's position if the grab handle is active.
- const HandleImpl& grabHandle = mHandle[GRAB_HANDLE];
- if( grabHandle.verticallyFlipped )
- {
- mCopyPastePopup.position = Vector3( cursor.position.x, -0.5f * popupSize.height - grabHandle.size.height + cursor.position.y, 0.0f );
- }
- else
- {
- mCopyPastePopup.position = Vector3( cursor.position.x, -0.5f * popupSize.height + cursor.position.y, 0.0f );
- }
- }
- }
+ mCopyPastePopup.position.x = grabHandle.position.x;
- // Checks if there is enough space above the text control. If not it places the popup under it.
- GetConstrainedPopupPosition( mCopyPastePopup.position, popupSize * AnchorPoint::CENTER, mActiveLayer, mBoundingBox );
+ mCopyPastePopup.position.y = -popupHalfSize.height + grabHandle.position.y - ( grabHandle.verticallyFlipped ? grabHandle.size.height : POPUP_PADDING );
+ }
+ } // mPopupSetNewPosition
- SetUpPopupPositionNotifications();
+ // It may change the popup's position to fit within the decoration box.
+ ConstrainPopupPosition( popupHalfSize );
- mCopyPastePopup.actor.SetPosition( mCopyPastePopup.position );
- mPopupSetNewPosition = false;
- }
+ SetUpPopupPositionNotifications( popupHalfSize );
- void PopupRelayoutComplete( Actor actor )
- {
- // Size negotiation for CopyPastePopup complete so can get the size and constrain position within bounding box.
+ // Prevent pixel mis-alignment by rounding down.
+ mCopyPastePopup.position.x = floorf( mCopyPastePopup.position.x );
+ mCopyPastePopup.position.y = floorf( mCopyPastePopup.position.y );
- DeterminePositionPopup();
+ mCopyPastePopup.actor.SetProperty( Actor::Property::POSITION, mCopyPastePopup.position );
+ mPopupSetNewPosition = false;
}
void CreateCursor( Control& cursor, const Vector4& color )
{
cursor = Control::New();
cursor.SetBackgroundColor( color );
- cursor.SetParentOrigin( ParentOrigin::TOP_LEFT );
- cursor.SetAnchorPoint( AnchorPoint::TOP_LEFT );
+ cursor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
+ cursor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
}
// Add or Remove cursor(s) from parent
{
CreateCursor( mPrimaryCursor, mCursor[PRIMARY_CURSOR].color );
#ifdef DECORATOR_DEBUG
- mPrimaryCursor.SetName( "PrimaryCursorActor" );
+ mPrimaryCursor.SetProperty( Dali::Actor::Property::NAME, "PrimaryCursorActor" );
#endif
}
{
CreateCursor( mSecondaryCursor, mCursor[SECONDARY_CURSOR].color );
#ifdef DECORATOR_DEBUG
- mSecondaryCursor.SetName( "SecondaryCursorActor" );
+ mSecondaryCursor.SetProperty( Dali::Actor::Property::NAME, "SecondaryCursorActor" );
#endif
}
// Cursor blinking
if ( mPrimaryCursor )
{
- mPrimaryCursor.SetVisible( mPrimaryCursorVisible && mCursorBlinkStatus );
+ mPrimaryCursor.SetProperty( Actor::Property::VISIBLE, mPrimaryCursorVisible && mCursorBlinkStatus );
}
if ( mSecondaryCursor )
{
- mSecondaryCursor.SetVisible( mSecondaryCursorVisible && mCursorBlinkStatus );
+ mSecondaryCursor.SetProperty( Actor::Property::VISIBLE, mSecondaryCursorVisible && mCursorBlinkStatus );
}
mCursorBlinkStatus = !mCursorBlinkStatus;
{
if( !mActiveLayer )
{
- mActiveLayer = Layer::New();
+ mActiveLayer = Actor::New();
#ifdef DECORATOR_DEBUG
- mActiveLayer.SetName ( "ActiveLayerActor" );
+ mActiveLayer.SetProperty( Actor::Property::NAME, "ActiveLayerActor" );
#endif
- mActiveLayer.SetParentOrigin( ParentOrigin::CENTER );
+ mActiveLayer.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
mActiveLayer.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
// Add the active layer telling the controller it doesn't need clipping.
{
if( handle.markerActor )
{
- handle.markerActor.SetSize( 0, handle.lineHeight );
+ handle.markerActor.SetProperty( Actor::Property::SIZE, Vector2( 0, handle.lineHeight ) );
}
}
HandleImpl& grabHandle = mHandle[GRAB_HANDLE];
if( !grabHandle.actor )
{
- if( mHandleImages[GRAB_HANDLE][HANDLE_IMAGE_RELEASED] )
+ if( mHandleImages[GRAB_HANDLE][HANDLE_IMAGE_RELEASED].size() )
{
grabHandle.actor = ImageView::New( mHandleImages[GRAB_HANDLE][HANDLE_IMAGE_RELEASED] );
GetImpl( grabHandle.actor).SetDepthIndex( DepthIndex::DECORATION );
- grabHandle.actor.SetAnchorPoint( AnchorPoint::TOP_CENTER );
+ grabHandle.actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_CENTER );
// Area that Grab handle responds to, larger than actual handle so easier to move
#ifdef DECORATOR_DEBUG
- grabHandle.actor.SetName( "GrabHandleActor" );
+ grabHandle.actor.SetProperty( Dali::Actor::Property::NAME, "GrabHandleActor" );
if ( Dali::Internal::gLogFilter->IsEnabledFor( Debug::Verbose ) )
{
grabHandle.grabArea = Control::New();
Toolkit::Control control = Toolkit::Control::DownCast( grabHandle.grabArea );
control.SetBackgroundColor( Vector4( 1.0f, 1.0f, 1.0f, 0.5f ) );
- grabHandle.grabArea.SetName( "GrabArea" );
+ grabHandle.grabArea.SetProperty( Dali::Actor::Property::NAME, "GrabArea" );
}
else
{
grabHandle.grabArea = Actor::New();
- grabHandle.grabArea.SetName( "GrabArea" );
+ grabHandle.grabArea.SetProperty( Dali::Actor::Property::NAME, "GrabArea" );
}
#else
grabHandle.grabArea = Actor::New();
#endif
- grabHandle.grabArea.SetParentOrigin( ParentOrigin::TOP_CENTER );
- grabHandle.grabArea.SetAnchorPoint( AnchorPoint::TOP_CENTER );
+ grabHandle.grabArea.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_CENTER );
+ grabHandle.grabArea.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_CENTER );
grabHandle.grabArea.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS );
- grabHandle.grabArea.SetSizeModeFactor( DEFAULT_GRAB_HANDLE_RELATIVE_SIZE );
+ grabHandle.grabArea.SetProperty( Actor::Property::SIZE_MODE_FACTOR, DEFAULT_GRAB_HANDLE_RELATIVE_SIZE );
grabHandle.actor.Add( grabHandle.grabArea );
- grabHandle.actor.SetColor( mHandleColor );
+ grabHandle.actor.SetProperty( Actor::Property::COLOR, mHandleColor );
- grabHandle.grabArea.TouchSignal().Connect( this, &Decorator::Impl::OnGrabHandleTouched );
+ grabHandle.grabArea.TouchedSignal().Connect( this, &Decorator::Impl::OnGrabHandleTouched );
// The grab handle's actor is attached to the tap and long press detectors in order to consume these events.
// Note that no callbacks are connected to any signal emitted by the tap and long press detectors.
}
}
- void CreateHandleMarker( HandleImpl& handle, Image& image, HandleType handleType )
+ void CreateHandleMarker( HandleImpl& handle, const std::string& image, HandleType handleType )
{
- if( image )
+ if( image.size() )
{
handle.markerActor = ImageView::New( image );
- handle.markerActor.SetColor( mHandleColor );
+ handle.markerActor.SetProperty( Actor::Property::COLOR, mHandleColor );
handle.actor.Add( handle.markerActor );
handle.markerActor.SetResizePolicy ( ResizePolicy::FIXED, Dimension::HEIGHT );
if( LEFT_SELECTION_HANDLE == handleType )
{
- handle.markerActor.SetAnchorPoint( AnchorPoint::BOTTOM_RIGHT );
- handle.markerActor.SetParentOrigin( ParentOrigin::TOP_RIGHT );
+ handle.markerActor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_RIGHT );
+ handle.markerActor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_RIGHT );
}
else if( RIGHT_SELECTION_HANDLE == handleType )
{
- handle.markerActor.SetAnchorPoint( AnchorPoint::BOTTOM_LEFT );
- handle.markerActor.SetParentOrigin( ParentOrigin::TOP_LEFT );
+ handle.markerActor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_LEFT );
+ handle.markerActor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
}
}
}
HandleImpl& primary = mHandle[ LEFT_SELECTION_HANDLE ];
if( !primary.actor )
{
- if( mHandleImages[LEFT_SELECTION_HANDLE][HANDLE_IMAGE_RELEASED] )
+ if( mHandleImages[LEFT_SELECTION_HANDLE][HANDLE_IMAGE_RELEASED].size() )
{
primary.actor = ImageView::New( mHandleImages[LEFT_SELECTION_HANDLE][HANDLE_IMAGE_RELEASED] );
#ifdef DECORATOR_DEBUG
- primary.actor.SetName("SelectionHandleOne");
+ primary.actor.SetProperty( Dali::Actor::Property::NAME,"SelectionHandleOne");
#endif
- primary.actor.SetAnchorPoint( AnchorPoint::TOP_RIGHT ); // Change to BOTTOM_RIGHT if Look'n'Feel requires handle above text.
+ primary.actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_RIGHT ); // Change to BOTTOM_RIGHT if Look'n'Feel requires handle above text.
GetImpl( primary.actor ).SetDepthIndex( DepthIndex::DECORATION );
- primary.actor.SetColor( mHandleColor );
+ primary.actor.SetProperty( Actor::Property::COLOR, mHandleColor );
primary.grabArea = Actor::New(); // Area that Grab handle responds to, larger than actual handle so easier to move
#ifdef DECORATOR_DEBUG
- primary.grabArea.SetName("SelectionHandleOneGrabArea");
+ primary.grabArea.SetProperty( Dali::Actor::Property::NAME,"SelectionHandleOneGrabArea");
#endif
primary.grabArea.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS );
- primary.grabArea.SetParentOrigin( ParentOrigin::TOP_CENTER );
- primary.grabArea.SetAnchorPoint( AnchorPoint::TOP_CENTER );
- primary.grabArea.SetSizeModeFactor( DEFAULT_SELECTION_HANDLE_RELATIVE_SIZE );
+ primary.grabArea.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_CENTER );
+ primary.grabArea.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_CENTER );
+ primary.grabArea.SetProperty( Actor::Property::SIZE_MODE_FACTOR, DEFAULT_SELECTION_HANDLE_RELATIVE_SIZE );
- primary.grabArea.TouchSignal().Connect( this, &Decorator::Impl::OnHandleOneTouched );
+ primary.grabArea.TouchedSignal().Connect( this, &Decorator::Impl::OnHandleOneTouched );
// The handle's actor is attached to the tap and long press detectors in order to consume these events.
// Note that no callbacks are connected to any signal emitted by the tap and long press detectors.
HandleImpl& secondary = mHandle[ RIGHT_SELECTION_HANDLE ];
if( !secondary.actor )
{
- if( mHandleImages[RIGHT_SELECTION_HANDLE][HANDLE_IMAGE_RELEASED] )
+ if( mHandleImages[RIGHT_SELECTION_HANDLE][HANDLE_IMAGE_RELEASED].size() )
{
secondary.actor = ImageView::New( mHandleImages[RIGHT_SELECTION_HANDLE][HANDLE_IMAGE_RELEASED] );
#ifdef DECORATOR_DEBUG
- secondary.actor.SetName("SelectionHandleTwo");
+ secondary.actor.SetProperty( Dali::Actor::Property::NAME,"SelectionHandleTwo");
#endif
- secondary.actor.SetAnchorPoint( AnchorPoint::TOP_LEFT ); // Change to BOTTOM_LEFT if Look'n'Feel requires handle above text.
+ secondary.actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); // Change to BOTTOM_LEFT if Look'n'Feel requires handle above text.
GetImpl( secondary.actor ).SetDepthIndex( DepthIndex::DECORATION );
- secondary.actor.SetColor( mHandleColor );
+ secondary.actor.SetProperty( Actor::Property::COLOR, mHandleColor );
secondary.grabArea = Actor::New(); // Area that Grab handle responds to, larger than actual handle so easier to move
#ifdef DECORATOR_DEBUG
- secondary.grabArea.SetName("SelectionHandleTwoGrabArea");
+ secondary.grabArea.SetProperty( Dali::Actor::Property::NAME,"SelectionHandleTwoGrabArea");
#endif
secondary.grabArea.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS );
- secondary.grabArea.SetParentOrigin( ParentOrigin::TOP_CENTER );
- secondary.grabArea.SetAnchorPoint( AnchorPoint::TOP_CENTER );
- secondary.grabArea.SetSizeModeFactor( DEFAULT_SELECTION_HANDLE_RELATIVE_SIZE );
+ secondary.grabArea.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_CENTER );
+ secondary.grabArea.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_CENTER );
+ secondary.grabArea.SetProperty( Actor::Property::SIZE_MODE_FACTOR, DEFAULT_SELECTION_HANDLE_RELATIVE_SIZE );
- secondary.grabArea.TouchSignal().Connect( this, &Decorator::Impl::OnHandleTwoTouched );
+ secondary.grabArea.TouchedSignal().Connect( this, &Decorator::Impl::OnHandleTwoTouched );
// The handle's actor is attached to the tap and long press detectors in order to consume these events.
// Note that no callbacks are connected to any signal emitted by the tap and long press detectors.
void CalculateHandleWorldCoordinates( HandleImpl& handle, Vector2& position )
{
// Gets the world position of the active layer. The active layer is where the handles are added.
- const Vector3 parentWorldPosition = mActiveLayer.GetCurrentWorldPosition();
+ const Vector3 parentWorldPosition = mActiveLayer.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION );
// The grab handle position in world coords.
// The active layer's world position is the center of the active layer. The origin of the
HandleImpl& grabHandle = mHandle[GRAB_HANDLE];
// Transforms the handle position into world coordinates.
- // @note This is not the same value as grabHandle.actor.GetCurrentWorldPosition()
+ // @note This is not the same value as grabHandle.actor.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION )
// as it's transforming the handle's position set by the text-controller and not
- // the final position set to the actor. Another difference is the GetCurrentWorldPosition()
+ // the final position set to the actor. Another difference is the.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION )
// retrieves the position of the center of the actor but the handle's position set
// by the text controller is not the center of the actor.
Vector2 grabHandleWorldPosition;
if( grabHandle.actor )
{
- grabHandle.actor.SetPosition( grabHandle.position.x + floor( 0.5f * mCursorWidth ) + ( mSmoothHandlePanEnabled ? grabHandle.grabDisplacementX : 0.f ),
- yLocalPosition + ( mSmoothHandlePanEnabled ? grabHandle.grabDisplacementY : 0.f ) );
+ grabHandle.actor.SetProperty( Actor::Property::POSITION, Vector2( grabHandle.position.x + floor( 0.5f * mCursorWidth ) + ( mSmoothHandlePanEnabled ? grabHandle.grabDisplacementX : 0.f ),
+ yLocalPosition + ( mSmoothHandlePanEnabled ? grabHandle.grabDisplacementY : 0.f ) ) );
}
}
HandleImpl& handle = mHandle[type];
// Transforms the handle position into world coordinates.
- // @note This is not the same value as handle.actor.GetCurrentWorldPosition()
+ // @note This is not the same value as handle.actor.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION )
// as it's transforming the handle's position set by the text-controller and not
- // the final position set to the actor. Another difference is the GetCurrentWorldPosition()
+ // the final position set to the actor. Another difference is the.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION )
// retrieves the position of the center of the actor but the handle's position set
// by the text controller is not the center of the actor.
Vector2 handleWorldPosition;
if( handle.actor && !handle.horizontallyFlipped )
{
// Change the anchor point to flip the image.
- handle.actor.SetAnchorPoint( isPrimaryHandle ? AnchorPoint::TOP_LEFT : AnchorPoint::TOP_RIGHT );
+ handle.actor.SetProperty( Actor::Property::ANCHOR_POINT, isPrimaryHandle ? AnchorPoint::TOP_LEFT : AnchorPoint::TOP_RIGHT );
handle.horizontallyFlipped = true;
}
if( handle.actor && handle.horizontallyFlipped )
{
// Reset the anchor point.
- handle.actor.SetAnchorPoint( isPrimaryHandle ? AnchorPoint::TOP_RIGHT : AnchorPoint::TOP_LEFT );
+ handle.actor.SetProperty( Actor::Property::ANCHOR_POINT, isPrimaryHandle ? AnchorPoint::TOP_RIGHT : AnchorPoint::TOP_LEFT );
handle.horizontallyFlipped = false;
}
if( handle.actor )
{
- handle.actor.SetPosition( handle.position.x + ( mSmoothHandlePanEnabled ? handle.grabDisplacementX : 0.f ),
- yLocalPosition + ( mSmoothHandlePanEnabled ? handle.grabDisplacementY : 0.f ) );
+ handle.actor.SetProperty( Actor::Property::POSITION, Vector2( handle.position.x + ( mSmoothHandlePanEnabled ? handle.grabDisplacementX : 0.f ),
+ yLocalPosition + ( mSmoothHandlePanEnabled ? handle.grabDisplacementY : 0.f ) ) );
}
}
// Chooses between the released or pressed image. It checks whether the pressed image exists.
if( handle.actor )
{
- const HandleImageType imageType = ( handle.pressed ? ( mHandleImages[type][HANDLE_IMAGE_PRESSED] ? HANDLE_IMAGE_PRESSED : HANDLE_IMAGE_RELEASED ) : HANDLE_IMAGE_RELEASED );
+ const HandleImageType imageType = ( handle.pressed ? ( mHandleImages[type][HANDLE_IMAGE_PRESSED].size() ? HANDLE_IMAGE_PRESSED : HANDLE_IMAGE_RELEASED ) : HANDLE_IMAGE_RELEASED );
handle.actor.SetImage( mHandleImages[type][imageType] );
}
{
if( handle.markerActor )
{
- const HandleImageType markerImageType = ( handle.pressed ? ( mHandleImages[markerType][HANDLE_IMAGE_PRESSED] ? HANDLE_IMAGE_PRESSED : HANDLE_IMAGE_RELEASED ) : HANDLE_IMAGE_RELEASED );
+ const HandleImageType markerImageType = ( handle.pressed ? ( mHandleImages[markerType][HANDLE_IMAGE_PRESSED].size() ? HANDLE_IMAGE_PRESSED : HANDLE_IMAGE_RELEASED ) : HANDLE_IMAGE_RELEASED );
handle.markerActor.SetImage( mHandleImages[markerType][markerImageType] );
}
}
// Whether to flip the handle vertically.
if( handle.actor )
{
- handle.actor.SetOrientation( handle.verticallyFlipped ? ANGLE_180 : ANGLE_0, Vector3::XAXIS );
+ handle.actor.SetProperty( Actor::Property::ORIENTATION, Quaternion( handle.verticallyFlipped ? ANGLE_180 : ANGLE_0, Vector3::XAXIS ) );
}
}
{
mHighlightActor = Actor::New();
-#ifdef DECORATOR_DEBUG
- mHighlightActor.SetName( "HighlightActor" );
-#endif
- mHighlightActor.SetParentOrigin( ParentOrigin::TOP_LEFT );
- mHighlightActor.SetAnchorPoint( AnchorPoint::TOP_LEFT );
- mHighlightActor.SetColor( mHighlightColor );
- mHighlightActor.SetColorMode( USE_OWN_COLOR );
+ mHighlightActor.SetProperty( Dali::Actor::Property::NAME, "HighlightActor" );
+ mHighlightActor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
+ mHighlightActor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+ mHighlightActor.SetProperty( Actor::Property::COLOR, mHighlightColor );
+ mHighlightActor.SetProperty( Actor::Property::COLOR_MODE, USE_OWN_COLOR );
}
// Add the highlight box telling the controller it needs clipping.
if ( mHighlightActor )
{
// Sets the position of the highlight actor inside the decorator.
- mHighlightActor.SetPosition( mHighlightPosition.x,
- mHighlightPosition.y );
+ mHighlightActor.SetProperty( Actor::Property::POSITION, Vector2( mHighlightPosition.x + mHighlightOutlineOffset,
+ mHighlightPosition.y + mHighlightOutlineOffset ) );
- const unsigned int numberOfQuads = mHighlightQuadList.size();
+ const unsigned int numberOfQuads = mHighlightQuadList.Count();
if( 0u != numberOfQuads )
{
// Set the size of the highlighted text to the actor.
- mHighlightActor.SetSize( mHighlightSize );
+ mHighlightActor.SetProperty( Actor::Property::SIZE, mHighlightSize );
// Used to translate the vertices given in decorator's coords to the mHighlightActor's local coords.
const float offsetX = mHighlightPosition.x + 0.5f * mHighlightSize.width;
unsigned int v = 0u;
// Traverse all quads.
- for( std::vector<QuadCoordinates>::iterator it = mHighlightQuadList.begin(),
- endIt = mHighlightQuadList.end();
+ for( Vector<Vector4>::ConstIterator it = mHighlightQuadList.Begin(),
+ endIt = mHighlightQuadList.End();
it != endIt;
++it, v += 4u )
{
- QuadCoordinates& quad = *it;
+ const Vector4& quad = *it;
Vector2 vertex;
// top-left (v+0)
- vertex.x = quad.min.x - offsetX;
- vertex.y = quad.min.y - offsetY;
+ vertex.x = quad.x - offsetX;
+ vertex.y = quad.y - offsetY;
vertices.PushBack( vertex );
// top-right (v+1)
- vertex.x = quad.max.x - offsetX;
- vertex.y = quad.min.y - offsetY;
+ vertex.x = quad.z - offsetX;
+ vertex.y = quad.y - offsetY;
vertices.PushBack( vertex );
// bottom-left (v+2)
- vertex.x = quad.min.x - offsetX;
- vertex.y = quad.max.y - offsetY;
+ vertex.x = quad.x - offsetX;
+ vertex.y = quad.w - offsetY;
vertices.PushBack( vertex );
// bottom-right (v+3)
- vertex.x = quad.max.x - offsetX;
- vertex.y = quad.max.y - offsetY;
+ vertex.x = quad.z - offsetX;
+ vertex.y = quad.w - offsetY;
vertices.PushBack( vertex );
// triangle A (3, 1, 0)
if( ! mQuadVertices )
{
- mQuadVertices = PropertyBuffer::New( mQuadVertexFormat );
+ mQuadVertices = VertexBuffer::New( mQuadVertexFormat );
}
mQuadVertices.SetData( &vertices[ 0 ], vertices.Size() );
}
}
- mHighlightQuadList.clear();
+ mHighlightQuadList.Clear();
if( mHighlightRenderer )
{
void DoPan( HandleImpl& handle, HandleType type, const PanGesture& gesture )
{
- if( Gesture::Started == gesture.state )
+ GestureState state = gesture.GetState();
+ if( GestureState::STARTED == state )
{
handle.grabDisplacementX = handle.grabDisplacementY = 0.f;
handle.globalPosition.y = handle.position.y;
}
- handle.grabDisplacementX += gesture.displacement.x;
- handle.grabDisplacementY += ( handle.verticallyFlipped ? -gesture.displacement.y : gesture.displacement.y );
+ const Vector2& displacement = gesture.GetDisplacement();
+ handle.grabDisplacementX += displacement.x;
+ handle.grabDisplacementY += ( handle.verticallyFlipped ? -displacement.y : displacement.y );
const float x = handle.globalPosition.x + handle.grabDisplacementX;
const float y = handle.globalPosition.y + handle.grabDisplacementY + 0.5f * handle.lineHeight;
- const float yVerticallyFlippedCorrected = y - ( handle.verticallyFlipped ? handle.lineHeight : 0.f );
+ const float yVerticallyFlippedCorrected = y - ( handle.verticallyFlippedOnTouch ? handle.lineHeight : 0.f );
- if( ( Gesture::Started == gesture.state ) ||
- ( Gesture::Continuing == gesture.state ) )
+ if( ( GestureState::STARTED == state ) ||
+ ( GestureState::CONTINUING == state ) )
{
Vector2 targetSize;
mController.GetTargetSize( targetSize );
mIsHandlePanning = true;
}
- else if( ( Gesture::Finished == gesture.state ) ||
- ( Gesture::Cancelled == gesture.state ) )
+ else if( ( GestureState::FINISHED == state ) ||
+ ( GestureState::CANCELLED == state ) )
{
if( mScrollTimer &&
( mScrollTimer.IsRunning() || mNotifyEndOfScroll ) )
}
}
- bool OnGrabHandleTouched( Actor actor, const TouchData& touch )
+ bool OnGrabHandleTouched( Actor actor, const TouchEvent& touch )
{
HandleImpl& grabHandle = mHandle[GRAB_HANDLE];
SetHandleImage( GRAB_HANDLE );
}
- // Consume to avoid pop-ups accidentally closing, when handle is outside of pop-up area
- return true;
+ return false;
}
- bool OnHandleOneTouched( Actor actor, const TouchData& touch )
+ bool OnHandleOneTouched( Actor actor, const TouchEvent& touch )
{
HandleImpl& primarySelectionHandle = mHandle[LEFT_SELECTION_HANDLE];
if( PointState::DOWN == state )
{
primarySelectionHandle.pressed = true;
+ primarySelectionHandle.verticallyFlippedOnTouch = primarySelectionHandle.verticallyFlipped;
}
else if( ( PointState::UP == state ) ||
( PointState::INTERRUPTED == state ) )
primarySelectionHandle.pressed = false;
mIsHandlePreviouslyCrossed = mIsHandleCurrentlyCrossed;
mIsHandlePanning = false;
+ mHandleReleased = LEFT_SELECTION_HANDLE;
}
SetHandleImage( LEFT_SELECTION_HANDLE );
}
- // Consume to avoid pop-ups accidentally closing, when handle is outside of pop-up area
- return true;
+ return false;
}
- bool OnHandleTwoTouched( Actor actor, const TouchData& touch )
+ bool OnHandleTwoTouched( Actor actor, const TouchEvent& touch )
{
HandleImpl& secondarySelectionHandle = mHandle[RIGHT_SELECTION_HANDLE];
if( PointState::DOWN == state )
{
secondarySelectionHandle.pressed = true;
+ secondarySelectionHandle.verticallyFlippedOnTouch = secondarySelectionHandle.verticallyFlipped;
}
else if( ( PointState::UP == state ) ||
( PointState::INTERRUPTED == state ) )
secondarySelectionHandle.pressed = false;
mIsHandlePreviouslyCrossed = mIsHandleCurrentlyCrossed;
mIsHandlePanning = false;
+ mHandleReleased = RIGHT_SELECTION_HANDLE;
}
SetHandleImage( RIGHT_SELECTION_HANDLE );
}
- // Consume to avoid pop-ups accidentally closing, when handle is outside of pop-up area
- return true;
+ return false;
}
void HandleResetPosition( PropertyNotification& source )
// Vertical notifications.
// Disconnect any previous connected callback.
- if( mVerticalLessThanNotification )
+ if( mHandleVerticalLessThanNotification )
{
- mVerticalLessThanNotification.NotifySignal().Disconnect( this, &Decorator::Impl::HandleResetPosition );
- mActiveLayer.RemovePropertyNotification( mVerticalLessThanNotification );
+ mHandleVerticalLessThanNotification.NotifySignal().Disconnect( this, &Decorator::Impl::HandleResetPosition );
+ mActiveLayer.RemovePropertyNotification( mHandleVerticalLessThanNotification );
}
- if( mVerticalGreaterThanNotification )
+ if( mHandleVerticalGreaterThanNotification )
{
- mVerticalGreaterThanNotification.NotifySignal().Disconnect( this, &Decorator::Impl::HandleResetPosition );
- mActiveLayer.RemovePropertyNotification( mVerticalGreaterThanNotification );
+ mHandleVerticalGreaterThanNotification.NotifySignal().Disconnect( this, &Decorator::Impl::HandleResetPosition );
+ mActiveLayer.RemovePropertyNotification( mHandleVerticalGreaterThanNotification );
}
const HandleImpl& grabHandle = mHandle[GRAB_HANDLE];
if( grabHandle.verticallyFlipped )
{
// The grab handle is vertically flipped. Never is going to exceed the bottom edje of the display.
- mVerticalGreaterThanNotification.Reset();
+ mHandleVerticalGreaterThanNotification.Reset();
// The vertical distance from the center of the active layer to the top edje of the display.
const float topHeight = 0.5f * mControlSize.height - grabHandle.position.y + grabHandle.size.height;
- mVerticalLessThanNotification = mActiveLayer.AddPropertyNotification( Actor::Property::WORLD_POSITION_Y,
- LessThanCondition( mBoundingBox.y + topHeight ) );
+ mHandleVerticalLessThanNotification = mActiveLayer.AddPropertyNotification( Actor::Property::WORLD_POSITION_Y,
+ LessThanCondition( mBoundingBox.y + topHeight ) );
// Notifies the change from false to true and from true to false.
- mVerticalLessThanNotification.SetNotifyMode( PropertyNotification::NotifyOnChanged );
+ mHandleVerticalLessThanNotification.SetNotifyMode( PropertyNotification::NOTIFY_ON_CHANGED );
// Connects the signals with the callbacks.
- mVerticalLessThanNotification.NotifySignal().Connect( this, &Decorator::Impl::HandleResetPosition );
+ mHandleVerticalLessThanNotification.NotifySignal().Connect( this, &Decorator::Impl::HandleResetPosition );
}
else
{
// The grab handle is not vertically flipped. Never is going to exceed the top edje of the display.
- mVerticalLessThanNotification.Reset();
+ mHandleVerticalLessThanNotification.Reset();
// The vertical distance from the center of the active layer to the bottom edje of the display.
const float bottomHeight = -0.5f * mControlSize.height + grabHandle.position.y + grabHandle.lineHeight + grabHandle.size.height;
- mVerticalGreaterThanNotification = mActiveLayer.AddPropertyNotification( Actor::Property::WORLD_POSITION_Y,
- GreaterThanCondition( mBoundingBox.w - bottomHeight ) );
+ mHandleVerticalGreaterThanNotification = mActiveLayer.AddPropertyNotification( Actor::Property::WORLD_POSITION_Y,
+ GreaterThanCondition( mBoundingBox.w - bottomHeight ) );
// Notifies the change from false to true and from true to false.
- mVerticalGreaterThanNotification.SetNotifyMode( PropertyNotification::NotifyOnChanged );
+ mHandleVerticalGreaterThanNotification.SetNotifyMode( PropertyNotification::NOTIFY_ON_CHANGED );
// Connects the signals with the callbacks.
- mVerticalGreaterThanNotification.NotifySignal().Connect( this, &Decorator::Impl::HandleResetPosition );
+ mHandleVerticalGreaterThanNotification.NotifySignal().Connect( this, &Decorator::Impl::HandleResetPosition );
}
}
else // The selection handles are active
if( primaryHandle.verticallyFlipped && secondaryHandle.verticallyFlipped )
{
// Both selection handles are vertically flipped. Never are going to exceed the bottom edje of the display.
- mVerticalGreaterThanNotification.Reset();
+ mHandleVerticalGreaterThanNotification.Reset();
// The vertical distance from the center of the active layer to the top edje of the display.
const float topHeight = 0.5f * mControlSize.height + std::max( -primaryHandle.position.y + primaryHandle.size.height, -secondaryHandle.position.y + secondaryHandle.size.height );
- mVerticalLessThanNotification = mActiveLayer.AddPropertyNotification( Actor::Property::WORLD_POSITION_Y,
- LessThanCondition( mBoundingBox.y + topHeight ) );
+ mHandleVerticalLessThanNotification = mActiveLayer.AddPropertyNotification( Actor::Property::WORLD_POSITION_Y,
+ LessThanCondition( mBoundingBox.y + topHeight ) );
// Notifies the change from false to true and from true to false.
- mVerticalLessThanNotification.SetNotifyMode( PropertyNotification::NotifyOnChanged );
+ mHandleVerticalLessThanNotification.SetNotifyMode( PropertyNotification::NOTIFY_ON_CHANGED );
// Connects the signals with the callbacks.
- mVerticalLessThanNotification.NotifySignal().Connect( this, &Decorator::Impl::HandleResetPosition );
+ mHandleVerticalLessThanNotification.NotifySignal().Connect( this, &Decorator::Impl::HandleResetPosition );
}
else if( !primaryHandle.verticallyFlipped && !secondaryHandle.verticallyFlipped )
{
// Both selection handles aren't vertically flipped. Never are going to exceed the top edje of the display.
- mVerticalLessThanNotification.Reset();
+ mHandleVerticalLessThanNotification.Reset();
// The vertical distance from the center of the active layer to the bottom edje of the display.
const float bottomHeight = -0.5f * mControlSize.height + std::max( primaryHandle.position.y + primaryHandle.lineHeight + primaryHandle.size.height,
secondaryHandle.position.y + secondaryHandle.lineHeight + secondaryHandle.size.height );
- mVerticalGreaterThanNotification = mActiveLayer.AddPropertyNotification( Actor::Property::WORLD_POSITION_Y,
- GreaterThanCondition( mBoundingBox.w - bottomHeight ) );
+ mHandleVerticalGreaterThanNotification = mActiveLayer.AddPropertyNotification( Actor::Property::WORLD_POSITION_Y,
+ GreaterThanCondition( mBoundingBox.w - bottomHeight ) );
// Notifies the change from false to true and from true to false.
- mVerticalGreaterThanNotification.SetNotifyMode( PropertyNotification::NotifyOnChanged );
+ mHandleVerticalGreaterThanNotification.SetNotifyMode( PropertyNotification::NOTIFY_ON_CHANGED );
// Connects the signals with the callbacks.
- mVerticalGreaterThanNotification.NotifySignal().Connect( this, &Decorator::Impl::HandleResetPosition );
+ mHandleVerticalGreaterThanNotification.NotifySignal().Connect( this, &Decorator::Impl::HandleResetPosition );
}
else
{
-primaryHandle.position.y + primaryHandle.size.height :
-secondaryHandle.position.y + secondaryHandle.size.height );
- mVerticalLessThanNotification = mActiveLayer.AddPropertyNotification( Actor::Property::WORLD_POSITION_Y,
- LessThanCondition( mBoundingBox.y + topHeight ) );
+ mHandleVerticalLessThanNotification = mActiveLayer.AddPropertyNotification( Actor::Property::WORLD_POSITION_Y,
+ LessThanCondition( mBoundingBox.y + topHeight ) );
// Notifies the change from false to true and from true to false.
- mVerticalLessThanNotification.SetNotifyMode( PropertyNotification::NotifyOnChanged );
+ mHandleVerticalLessThanNotification.SetNotifyMode( PropertyNotification::NOTIFY_ON_CHANGED );
// Connects the signals with the callbacks.
- mVerticalLessThanNotification.NotifySignal().Connect( this, &Decorator::Impl::HandleResetPosition );
+ mHandleVerticalLessThanNotification.NotifySignal().Connect( this, &Decorator::Impl::HandleResetPosition );
// The vertical distance from the center of the active layer to the bottom edje of the display.
const float bottomHeight = -0.5f * mControlSize.height + ( primaryHandle.verticallyFlipped ?
secondaryHandle.position.y + secondaryHandle.lineHeight + secondaryHandle.size.height :
primaryHandle.position.y + primaryHandle.lineHeight + primaryHandle.size.height );
- mVerticalGreaterThanNotification = mActiveLayer.AddPropertyNotification( Actor::Property::WORLD_POSITION_Y,
- GreaterThanCondition( mBoundingBox.w - bottomHeight ) );
+ mHandleVerticalGreaterThanNotification = mActiveLayer.AddPropertyNotification( Actor::Property::WORLD_POSITION_Y,
+ GreaterThanCondition( mBoundingBox.w - bottomHeight ) );
// Notifies the change from false to true and from true to false.
- mVerticalGreaterThanNotification.SetNotifyMode( PropertyNotification::NotifyOnChanged );
+ mHandleVerticalGreaterThanNotification.SetNotifyMode( PropertyNotification::NOTIFY_ON_CHANGED );
// Connects the signals with the callbacks.
- mVerticalGreaterThanNotification.NotifySignal().Connect( this, &Decorator::Impl::HandleResetPosition );
+ mHandleVerticalGreaterThanNotification.NotifySignal().Connect( this, &Decorator::Impl::HandleResetPosition );
}
}
// Horizontal notifications.
// Disconnect any previous connected callback.
- if( mHorizontalLessThanNotification )
+ if( mHandleHorizontalLessThanNotification )
{
- mHorizontalLessThanNotification.NotifySignal().Disconnect( this, &Decorator::Impl::HandleResetPosition );
- mActiveLayer.RemovePropertyNotification( mHorizontalLessThanNotification );
+ mHandleHorizontalLessThanNotification.NotifySignal().Disconnect( this, &Decorator::Impl::HandleResetPosition );
+ mActiveLayer.RemovePropertyNotification( mHandleHorizontalLessThanNotification );
}
- if( mHorizontalGreaterThanNotification )
+ if( mHandleHorizontalGreaterThanNotification )
{
- mHorizontalGreaterThanNotification.NotifySignal().Disconnect( this, &Decorator::Impl::HandleResetPosition );
- mActiveLayer.RemovePropertyNotification( mHorizontalGreaterThanNotification );
+ mHandleHorizontalGreaterThanNotification.NotifySignal().Disconnect( this, &Decorator::Impl::HandleResetPosition );
+ mActiveLayer.RemovePropertyNotification( mHandleHorizontalGreaterThanNotification );
}
if( primaryHandle.active || secondaryHandle.active )
const float leftWidth = 0.5f * mControlSize.width + std::max( -primaryHandle.position.x + primaryHandle.size.width,
-secondaryHandle.position.x + secondaryHandle.size.width );
- mHorizontalLessThanNotification = mActiveLayer.AddPropertyNotification( Actor::Property::WORLD_POSITION_X,
- LessThanCondition( mBoundingBox.x + leftWidth ) );
+ mHandleHorizontalLessThanNotification = mActiveLayer.AddPropertyNotification( Actor::Property::WORLD_POSITION_X,
+ LessThanCondition( mBoundingBox.x + leftWidth ) );
// Notifies the change from false to true and from true to false.
- mHorizontalLessThanNotification.SetNotifyMode( PropertyNotification::NotifyOnChanged );
+ mHandleHorizontalLessThanNotification.SetNotifyMode( PropertyNotification::NOTIFY_ON_CHANGED );
// Connects the signals with the callbacks.
- mHorizontalLessThanNotification.NotifySignal().Connect( this, &Decorator::Impl::HandleResetPosition );
+ mHandleHorizontalLessThanNotification.NotifySignal().Connect( this, &Decorator::Impl::HandleResetPosition );
// The horizontal distance from the center of the active layer to the right edje of the display.
const float rightWidth = -0.5f * mControlSize.width + std::max( primaryHandle.position.x + primaryHandle.size.width,
secondaryHandle.position.x + secondaryHandle.size.width );
- mHorizontalGreaterThanNotification = mActiveLayer.AddPropertyNotification( Actor::Property::WORLD_POSITION_X,
- GreaterThanCondition( mBoundingBox.z - rightWidth ) );
+ mHandleHorizontalGreaterThanNotification = mActiveLayer.AddPropertyNotification( Actor::Property::WORLD_POSITION_X,
+ GreaterThanCondition( mBoundingBox.z - rightWidth ) );
// Notifies the change from false to true and from true to false.
- mHorizontalGreaterThanNotification.SetNotifyMode( PropertyNotification::NotifyOnChanged );
+ mHandleHorizontalGreaterThanNotification.SetNotifyMode( PropertyNotification::NOTIFY_ON_CHANGED );
// Connects the signals with the callbacks.
- mHorizontalGreaterThanNotification.NotifySignal().Connect( this, &Decorator::Impl::HandleResetPosition );
+ mHandleHorizontalGreaterThanNotification.NotifySignal().Connect( this, &Decorator::Impl::HandleResetPosition );
}
}
// Popup
- float AlternatePopUpPositionRelativeToCursor()
+ float AlternatePopUpPositionRelativeToCursor( bool topBottom )
{
float alternativePosition = 0.0f;
- const float popupHeight = mCopyPastePopup.actor.GetRelayoutSize( Dimension::HEIGHT );
+ const float halfPopupHeight = 0.5f * mCopyPastePopup.actor.GetRelayoutSize( Dimension::HEIGHT );
const HandleImpl& primaryHandle = mHandle[LEFT_SELECTION_HANDLE];
const HandleImpl& secondaryHandle = mHandle[RIGHT_SELECTION_HANDLE];
if( primaryHandle.active || secondaryHandle.active )
{
- const float maxHandleHeight = std::max( primaryHandle.size.height, secondaryHandle.size.height );
- alternativePosition = 0.5f * popupHeight + cursor.lineHeight + maxHandleHeight + std::min( primaryHandle.position.y, secondaryHandle.position.y );
+ float handleY = 0.f;
+ float maxHandleHeight = 0.f;
+
+ const bool primaryVisible = primaryHandle.horizontallyVisible && primaryHandle.verticallyVisible;
+ const bool secondaryVisible = secondaryHandle.horizontallyVisible && secondaryHandle.verticallyVisible;
+
+ if( primaryVisible && secondaryVisible )
+ {
+ handleY = std::max( primaryHandle.position.y, secondaryHandle.position.y );
+ maxHandleHeight = std::max( primaryHandle.size.height, secondaryHandle.size.height );
+ }
+ else if( primaryVisible && !secondaryVisible )
+ {
+ handleY = primaryHandle.position.y;
+ maxHandleHeight = primaryHandle.size.height;
+ }
+ else if( !primaryVisible && secondaryVisible )
+ {
+ handleY = secondaryHandle.position.y;
+ maxHandleHeight = secondaryHandle.size.height;
+ }
+
+ alternativePosition = handleY + ( topBottom ? halfPopupHeight + maxHandleHeight + cursor.lineHeight : -halfPopupHeight - maxHandleHeight );
}
else
{
- alternativePosition = 0.5f * popupHeight + cursor.lineHeight + grabHandle.size.height + cursor.position.y;
+ alternativePosition = cursor.position.y + ( topBottom ? halfPopupHeight + grabHandle.size.height + cursor.lineHeight : -halfPopupHeight - grabHandle.size.height );
}
return alternativePosition;
}
- void PopUpLeavesVerticalBoundary( PropertyNotification& source )
+ void PopUpLeavesTopBoundary( PropertyNotification& source )
{
- float alternativeYPosition = 0.0f;
- // todo use AlternatePopUpPositionRelativeToSelectionHandles() if text is highlighted
- // if can't be positioned above, then position below row.
- alternativeYPosition = AlternatePopUpPositionRelativeToCursor();
+ const float popupHeight = mCopyPastePopup.actor.GetRelayoutSize( Dimension::HEIGHT );
- mCopyPastePopup.actor.SetY( alternativeYPosition );
+ // Sets the position of the popup below.
+ mCopyPastePopup.actor.SetProperty( Actor::Property::POSITION_Y, floorf( CalculateVerticalPopUpPosition( 0.5f * popupHeight, true ) ) );
}
- void SetUpPopupPositionNotifications()
+ void PopUpLeavesBottomBoundary( PropertyNotification& source )
{
- // Note Property notifications ignore any set anchor point so conditions must allow for this. Default is Top Left.
-
- // Exceeding vertical boundary
-
const float popupHeight = mCopyPastePopup.actor.GetRelayoutSize( Dimension::HEIGHT );
- PropertyNotification verticalExceedNotification = mCopyPastePopup.actor.AddPropertyNotification( Actor::Property::WORLD_POSITION_Y,
- OutsideCondition( mBoundingBox.y + popupHeight * 0.5f,
- mBoundingBox.w - popupHeight * 0.5f ) );
-
- verticalExceedNotification.NotifySignal().Connect( this, &Decorator::Impl::PopUpLeavesVerticalBoundary );
+ // Sets the position of the popup above.
+ mCopyPastePopup.actor.SetProperty( Actor::Property::POSITION_Y, floorf( CalculateVerticalPopUpPosition( 0.5f * popupHeight, false ) ) );
}
- void GetConstrainedPopupPosition( Vector3& requiredPopupPosition, const Vector3& popupDistanceFromAnchorPoint, Actor parent, const Vector4& boundingRectangleWorld )
+ void SetUpPopupPositionNotifications( const Vector3& popupHalfSize )
{
- DALI_ASSERT_DEBUG ( "Popup parent not on stage" && parent.OnStage() )
-
- // Parent must already by added to Stage for these Get calls to work
- const Vector3 parentWorldPositionLeftAnchor = parent.GetCurrentWorldPosition() - parent.GetCurrentSize() * parent.GetCurrentAnchorPoint();
- const Vector3 popupWorldPosition = parentWorldPositionLeftAnchor + requiredPopupPosition; // Parent World position plus popup local position gives World Position
-
- // Calculate distance to move popup (in local space) so fits within the boundary
- float xOffSetToKeepWithinBounds = 0.0f;
- if( popupWorldPosition.x - popupDistanceFromAnchorPoint.x < boundingRectangleWorld.x )
- {
- xOffSetToKeepWithinBounds = boundingRectangleWorld.x - ( popupWorldPosition.x - popupDistanceFromAnchorPoint.x );
- }
- else if( popupWorldPosition.x + popupDistanceFromAnchorPoint.x > boundingRectangleWorld.z )
+ // Disconnect any previous connected callback.
+ if( mPopupTopExceedNotification )
{
- xOffSetToKeepWithinBounds = boundingRectangleWorld.z - ( popupWorldPosition.x + popupDistanceFromAnchorPoint.x );
+ mPopupTopExceedNotification.NotifySignal().Disconnect( this, &Decorator::Impl::PopUpLeavesTopBoundary );
+ mCopyPastePopup.actor.RemovePropertyNotification( mPopupTopExceedNotification );
}
- // Ensure initial display of Popup is in alternative position if can not fit above. As Property notification will be a frame behind.
- if( popupWorldPosition.y - popupDistanceFromAnchorPoint.y < boundingRectangleWorld.y )
+ if( mPopupBottomExceedNotification )
{
- requiredPopupPosition.y = AlternatePopUpPositionRelativeToCursor();
+ mPopupBottomExceedNotification.NotifySignal().Disconnect( this, &Decorator::Impl::PopUpLeavesBottomBoundary );
+ mCopyPastePopup.actor.RemovePropertyNotification( mPopupBottomExceedNotification );
}
- requiredPopupPosition.x = requiredPopupPosition.x + xOffSetToKeepWithinBounds;
+ // Note Property notifications ignore any set anchor point so conditions must allow for this. Default is Top Left.
- // Prevent pixel mis-alignment by rounding down.
- requiredPopupPosition.x = floor( requiredPopupPosition.x );
- requiredPopupPosition.y = floor( requiredPopupPosition.y );
+ // Exceeding vertical boundary
+
+ mPopupTopExceedNotification = mCopyPastePopup.actor.AddPropertyNotification( Actor::Property::WORLD_POSITION_Y,
+ LessThanCondition( mBoundingBox.y + popupHalfSize.height ) );
+
+ mPopupBottomExceedNotification = mCopyPastePopup.actor.AddPropertyNotification( Actor::Property::WORLD_POSITION_Y,
+ GreaterThanCondition( mBoundingBox.w - popupHalfSize.height ) );
+
+ // Notifies the change from false to true and from true to false.
+ mPopupTopExceedNotification.SetNotifyMode( PropertyNotification::NOTIFY_ON_CHANGED );
+ mPopupBottomExceedNotification.SetNotifyMode( PropertyNotification::NOTIFY_ON_CHANGED );
+
+ mPopupTopExceedNotification.NotifySignal().Connect( this, &Decorator::Impl::PopUpLeavesTopBoundary );
+ mPopupBottomExceedNotification.NotifySignal().Connect( this, &Decorator::Impl::PopUpLeavesBottomBoundary );
}
- void SetHandleImage( HandleType handleType, HandleImageType handleImageType, Dali::Image image )
+ void SetHandleImage( HandleType handleType, HandleImageType handleImageType, const std::string& imageFileName )
{
+ ImageDimensions dimensions = Dali::GetOriginalImageSize( imageFileName );
+
HandleImpl& handle = mHandle[handleType];
- handle.size = Size( image.GetWidth(), image.GetHeight() );
+ handle.size = Size( dimensions.GetWidth(), dimensions.GetHeight() );
- mHandleImages[handleType][handleImageType] = image;
+ mHandleImages[handleType][handleImageType] = imageFileName;
}
void SetScrollThreshold( float threshold )
Timer mCursorBlinkTimer; ///< Timer to signal cursor to blink
Timer mScrollTimer; ///< Timer used to scroll the text when the grab handle is moved close to the edges.
- Layer mActiveLayer; ///< Layer for active handles and alike that ensures they are above all else.
- PropertyNotification mVerticalLessThanNotification; ///< Notifies when the 'y' coord of the active layer is less than a given value.
- PropertyNotification mVerticalGreaterThanNotification; ///< Notifies when the 'y' coord of the active layer is grater than a given value.
- PropertyNotification mHorizontalLessThanNotification; ///< Notifies when the 'x' coord of the active layer is less than a given value.
- PropertyNotification mHorizontalGreaterThanNotification; ///< Notifies when the 'x' coord of the active layer is grater than a given value.
+ Actor mActiveLayer; ///< Actor for active handles and alike that ensures they are above all else.
+ PropertyNotification mHandleVerticalLessThanNotification; ///< Notifies when the 'y' coord of the active layer is less than a given value.
+ PropertyNotification mHandleVerticalGreaterThanNotification; ///< Notifies when the 'y' coord of the active layer is grater than a given value.
+ PropertyNotification mHandleHorizontalLessThanNotification; ///< Notifies when the 'x' coord of the active layer is less than a given value.
+ PropertyNotification mHandleHorizontalGreaterThanNotification; ///< Notifies when the 'x' coord of the active layer is grater than a given value.
+ PropertyNotification mPopupTopExceedNotification; ///< Notifies when the popup leaves the bounding box through the top.
+ PropertyNotification mPopupBottomExceedNotification; ///< Notifies when the popup leaves the bounding box through the bottom.
Control mPrimaryCursor;
Control mSecondaryCursor;
TextSelectionPopup::Buttons mEnabledPopupButtons; /// Bit mask of currently enabled Popup buttons
TextSelectionPopupCallbackInterface& mTextSelectionPopupCallbackInterface;
- Image mHandleImages[HANDLE_TYPE_COUNT][HANDLE_IMAGE_TYPE_COUNT];
+ std::string mHandleImages[HANDLE_TYPE_COUNT][HANDLE_IMAGE_TYPE_COUNT];
Vector4 mHandleColor;
CursorImpl mCursor[CURSOR_COUNT];
HandleImpl mHandle[HANDLE_TYPE_COUNT];
- PropertyBuffer mQuadVertices;
+ VertexBuffer mQuadVertices;
Geometry mQuadGeometry;
- QuadContainer mHighlightQuadList; ///< Sub-selections that combine to create the complete selection highlight
+ QuadContainer mHighlightQuadList; ///< Sub-selections that combine to create the complete selection highlight.
Vector4 mBoundingBox; ///< The bounding box in world coords.
Vector4 mHighlightColor; ///< Color of the highlight
Vector2 mHighlightPosition; ///< The position of the highlight actor.
Size mHighlightSize; ///< The size of the highlighted text.
Size mControlSize; ///< The control's size. Set by the Relayout.
+ float mHighlightOutlineOffset; ///< The outline's offset.
unsigned int mActiveCursor;
unsigned int mCursorBlinkInterval;
float mCursorBlinkDuration;
float mCursorWidth; ///< The width of the cursors in pixels.
HandleType mHandleScrolling; ///< The handle which is scrolling.
+ HandleType mHandleReleased; ///< The last handle released.
ScrollDirection mScrollDirection; ///< The direction of the scroll.
float mScrollThreshold; ///< Defines a square area inside the control, close to the edge. A cursor entering this area will trigger scroll events.
float mScrollSpeed; ///< The scroll speed in pixels per second.
bool mHorizontalScrollingEnabled : 1; ///< Whether the horizontal scrolling is enabled.
bool mVerticalScrollingEnabled : 1; ///< Whether the vertical scrolling is enabled.
bool mSmoothHandlePanEnabled : 1; ///< Whether to pan smoothly the handles.
+ bool mIsHighlightBoxActive : 1; ///< Whether the highlight box is active.
};
DecoratorPtr Decorator::New( ControllerInterface& controller,
return mImpl->mCursor[cursor].position;
}
+void Decorator::SetGlyphOffset( Cursor cursor, float glyphOffset )
+{
+ Impl::CursorImpl& cursorImpl = mImpl->mCursor[cursor];
+
+ cursorImpl.glyphOffset = glyphOffset;
+}
+
+const float Decorator::GetGlyphOffset( Cursor cursor) const
+{
+ return mImpl->mCursor[cursor].glyphOffset;
+}
+
void Decorator::SetCursorColor( Cursor cursor, const Dali::Vector4& color )
{
mImpl->mCursor[cursor].color = color;
// The problem is the handle actor does not receive the touch event with the Interrupt
// state when the power button is pressed and the application goes to background.
mImpl->mHandle[handleType].pressed = false;
- Image imageReleased = mImpl->mHandleImages[handleType][HANDLE_IMAGE_RELEASED];
+ const bool imageReleased = mImpl->mHandleImages[handleType][HANDLE_IMAGE_RELEASED].size();
ImageView imageView = mImpl->mHandle[handleType].actor;
if( imageReleased && imageView )
{
- imageView.SetImage( imageReleased );
+ imageView.SetImage( mImpl->mHandleImages[handleType][HANDLE_IMAGE_RELEASED] );
}
}
return mImpl->mHandle[handleType].active ;
}
-void Decorator::SetHandleImage( HandleType handleType, HandleImageType handleImageType, Dali::Image image )
+void Decorator::SetHandleImage( HandleType handleType, HandleImageType handleImageType, const std::string& imageFileName )
{
- mImpl->SetHandleImage( handleType, handleImageType, image );
+ mImpl->SetHandleImage( handleType, handleImageType, imageFileName );
}
-Dali::Image Decorator::GetHandleImage( HandleType handleType, HandleImageType handleImageType ) const
+const std::string& Decorator::GetHandleImage( HandleType handleType, HandleImageType handleImageType ) const
{
return mImpl->mHandleImages[handleType][handleImageType];
}
mImpl->mFlipRightSelectionHandleDirection = right;
}
-void Decorator::AddHighlight( float x1, float y1, float x2, float y2 )
+void Decorator::AddHighlight( unsigned int index, const Vector4& quad )
{
- mImpl->mHighlightQuadList.push_back( QuadCoordinates(x1, y1, x2, y2) );
+ *( mImpl->mHighlightQuadList.Begin() + index ) = quad;
}
-void Decorator::SetHighLightBox( const Vector2& position, const Size& size )
+void Decorator::SetHighLightBox( const Vector2& position, const Size& size, float outlineOffset )
{
mImpl->mHighlightPosition = position;
mImpl->mHighlightSize = size;
+ mImpl->mHighlightOutlineOffset = outlineOffset;
}
void Decorator::ClearHighlights()
{
- mImpl->mHighlightQuadList.clear();
+ mImpl->mHighlightQuadList.Clear();
mImpl->mHighlightPosition = Vector2::ZERO;
+ mImpl->mHighlightOutlineOffset = 0.f;
+}
+
+void Decorator::ResizeHighlightQuads( unsigned int numberOfQuads )
+{
+ mImpl->mHighlightQuadList.Resize( numberOfQuads );
}
void Decorator::SetHighlightColor( const Vector4& color )
return mImpl->mHighlightColor;
}
+void Decorator::SetHighlightActive( bool active )
+{
+ mImpl->mIsHighlightBoxActive = active;
+}
+
+bool Decorator::IsHighlightActive() const
+{
+ return mImpl->mIsHighlightBoxActive;
+}
+
+bool Decorator::IsHighlightVisible() const
+{
+ return ( mImpl->mHighlightActor && mImpl->mHighlightActor.GetParent() );
+}
+
void Decorator::SetTextDepth( int textDepth )
{
mImpl->mTextDepth = textDepth;
bool Decorator::IsPopupActive() const
{
- return mImpl->mActiveCopyPastePopup ;
+ return mImpl->mActiveCopyPastePopup;
}
void Decorator::SetEnabledPopupButtons( TextSelectionPopup::Buttons& enabledButtonsBitMask )
{
mImpl->mCopyPastePopup.actor = TextSelectionPopup::New( &mImpl->mTextSelectionPopupCallbackInterface );
#ifdef DECORATOR_DEBUG
- mImpl->mCopyPastePopup.actor.SetName("mCopyPastePopup");
+ mImpl->mCopyPastePopup.actor.SetProperty( Dali::Actor::Property::NAME,"mCopyPastePopup");
#endif
- mImpl->mCopyPastePopup.actor.SetAnchorPoint( AnchorPoint::CENTER );
- mImpl->mCopyPastePopup.actor.OnRelayoutSignal().Connect( mImpl, &Decorator::Impl::PopupRelayoutComplete ); // Position popup after size negotiation
+ mImpl->mCopyPastePopup.actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
+ mImpl->mCopyPastePopup.actor.OnRelayoutSignal().Connect( mImpl, &Decorator::Impl::SetPopupPosition ); // Position popup after size negotiation
}
mImpl->mCopyPastePopup.actor.EnableButtons( mImpl->mEnabledPopupButtons );
projects / platform / core / uifw / dali-toolkit.git / blobdiff