#include <dali-toolkit/internal/text/decorator/text-decorator.h>
// EXTERNAL INCLUDES
+#include <dali/integration-api/debug.h>
#include <dali/public-api/actors/actor.h>
#include <dali/public-api/adaptor-framework/timer.h>
#include <dali/public-api/actors/image-actor.h>
#include <dali/public-api/actors/layer.h>
+#include <dali/public-api/actors/mesh-actor.h>
+#include <dali/public-api/animation/constraint.h>
#include <dali/public-api/common/constants.h>
+#include <dali/public-api/common/stage.h>
#include <dali/public-api/events/tap-gesture.h>
#include <dali/public-api/events/tap-gesture-detector.h>
#include <dali/public-api/events/pan-gesture.h>
#include <dali/public-api/events/pan-gesture-detector.h>
+#include <dali/public-api/geometry/mesh.h>
+#include <dali/public-api/geometry/mesh-data.h>
#include <dali/public-api/images/resource-image.h>
+#include <dali/public-api/math/rect.h>
#include <dali/public-api/math/vector2.h>
#include <dali/public-api/math/vector4.h>
-#include <dali/public-api/images/nine-patch-image.h>
+#include <dali/public-api/object/property-notification.h>
#include <dali/public-api/signals/connection-tracker.h>
-#include <libintl.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control.h>
#include <dali-toolkit/public-api/controls/control-impl.h>
-#include <dali-toolkit/public-api/controls/default-controls/solid-color-actor.h>
-#include <dali-toolkit/public-api/controls/text-controls/text-label.h>
#include <dali-toolkit/public-api/controls/buttons/push-button.h>
#include <dali-toolkit/public-api/controls/default-controls/solid-color-actor.h>
+#include <dali-toolkit/public-api/controls/text-controls/text-label.h>
+#include <dali-toolkit/public-api/controls/text-controls/text-selection-popup.h>
#ifdef DEBUG_ENABLED
#define DECORATOR_DEBUG
+
#endif
-// todo Move this to adaptor??
-#define GET_LOCALE_TEXT(string) dgettext("elementary", string)
+namespace Dali
+{
+namespace Internal
+{
+namespace
+{
+#ifdef DECORATOR_DEBUG
+Integration::Log::Filter* gLogFilter( Integration::Log::Filter::New(Debug::NoLogging, false, "LOG_TEXT_DECORATOR") );
+#endif
+}
+}
+}
+
// Local Data
namespace
const Dali::Vector3 DEFAULT_GRAB_HANDLE_RELATIVE_SIZE( 1.5f, 2.0f, 1.0f );
const Dali::Vector3 DEFAULT_SELECTION_HANDLE_RELATIVE_SIZE( 1.5f, 1.5f, 1.0f );
-const std::size_t CURSOR_BLINK_INTERVAL = 500; // Cursor blink interval
-const std::size_t MILLISECONDS = 1000;
-
-const std::string POPUP_BACKGROUND( DALI_IMAGE_DIR "popup_bubble_bg.#.png" );
-const std::string POPUP_BACKGROUND_EFFECT( DALI_IMAGE_DIR "popup_bubble_bg_ef.#.png" );
-const std::string POPUP_BACKGROUND_LINE( DALI_IMAGE_DIR "popup_bubble_bg_line.#.png" );
-
-const Dali::Vector4 DEFAULT_POPUP_BACKGROUND( Dali::Vector4( .20f, 0.29f, 0.44f, 1.0f ) );
-const Dali::Vector4 DEFAULT_POPUP_BACKGROUND_PRESSED( Dali::Vector4( 0.07f, 0.10f, 0.17f, 1.0f ) );
-const Dali::Vector4 DEFAULT_POPUP_LINE_COLOR( Dali::Vector4( 0.36f, 0.45f, 0.59f, 1.0f ) );
-const Dali::Vector4 DEFAULT_OPTION_ICON( Dali::Vector4( 1.0f, 1.0f, 1.0f, 1.0f ) );
-const Dali::Vector4 DEFAULT_OPTION_ICON_PRESSED( Dali::Vector4( 1.0f, 1.0f, 1.0f, 1.0f ) );
-const Dali::Vector4 DEFAULT_OPTION_TEXT( Dali::Vector4( 1.0f, 1.0f, 1.0f, 1.0f ) );
-const Dali::Vector4 DEFAULT_OPTION_TEXT_PRESSED( Dali::Vector4( 1.0f, 1.0f, 1.0f, 1.0f ) );
-
-const std::string OPTION_ICON_CLIPBOARD( DALI_IMAGE_DIR "copy_paste_icon_clipboard.png" );
-const std::string OPTION_ICON_COPY( DALI_IMAGE_DIR "copy_paste_icon_copy.png" );
-const std::string OPTION_ICON_CUT( DALI_IMAGE_DIR "copy_paste_icon_cut.png" );
-const std::string OPTION_ICON_PASTE( DALI_IMAGE_DIR "copy_paste_icon_paste.png" );
-const std::string OPTION_ICON_SELECT( DALI_IMAGE_DIR "copy_paste_icon_select.png" );
-const std::string OPTION_ICON_SELECT_ALL( DALI_IMAGE_DIR "copy_paste_icon_select_all.png" );
-
-const Dali::Vector2 DEFAULT_POPUP_MAX_SIZE( 470.0f, 120.0f ); ///< The maximum size of the popup.
-
-const float OPTION_TEXT_LINE_HEIGHT( 32.0f ); ///< The line height of the text.
-const Dali::Vector2 OPTION_ICON_SIZE( 0.f, 0.f ); ///< The size of the icon.
-const float OPTION_GAP_ICON_TEXT( 6.f ); ///< The gap between the icon and the text
-const float OPTION_MARGIN_WIDTH( 10.f ); ///< The margin between the right or lefts edge and the text or icon.
-const float OPTION_MAX_WIDTH( DEFAULT_POPUP_MAX_SIZE.width / 6 ); ///< The maximum width of the option (currently set to the max)
-const float OPTION_MIN_WIDTH( 86.0f ); ///< The minimum width of the option.
-
-const float POPUP_DIVIDER_WIDTH( 1.f ); ///< The size of the divider.
-
-const Dali::Vector2 POPUP_TAIL_SIZE( 20.0f, 16.0f ); ///< The size of the tail.
-const float POPUP_TAIL_Y_OFFSET( 5.f ); ///< The y offset of the tail (when its position is on the bottom).
-const float POPUP_TAIL_TOP_Y_OFFSET( 3.f ); ///< The y offset of the tail (when its position is on the top).
-
-const float HIDE_POPUP_ANIMATION_DURATION( 0.2f ); ///< Duration of popup hide animation in seconds.
-const float SHOW_POPUP_ANIMATION_DURATION( 0.2f ); ///< Duration of popup show animation in seconds.
-
-const char* const OPTION_SELECT_WORD = "option-select_word"; // "Select Word" popup option.
-const char* const OPTION_SELECT_ALL("option-select_all"); // "Select All" popup option.
-const char* const OPTION_CUT("option-cut"); // "Cut" popup option.
-const char* const OPTION_COPY("option-copy"); // "Copy" popup option.
-const char* const OPTION_PASTE("option-paste"); // "Paste" popup option.
-const char* const OPTION_CLIPBOARD("option-clipboard"); // "Clipboard" popup option.
-
-enum Buttons
-{
- ButtonsCut,
- ButtonsCopy,
- ButtonsPaste,
- ButtonsSelect,
- ButtonsSelectAll,
- ButtonsClipboard,
- ButtonsEnumEnd
-};
+const unsigned int CURSOR_BLINK_INTERVAL = 500u; // Cursor blink interval
+const float TO_MILLISECONDS = 1000.f;
+const float TO_SECONDS = 1.f / 1000.f;
+
+const float DISPLAYED_HIGHLIGHT_Z_OFFSET( -0.05f );
-struct ButtonRequirement
+/**
+ * structure to hold coordinates of each quad, which will make up the mesh.
+ */
+struct QuadCoordinates
{
- ButtonRequirement()
- : id( ButtonsEnumEnd ),
- priority( 0u ),
- name(),
- caption(),
- icon(),
- enabled( false )
- {}
-
- ButtonRequirement( Buttons buttonId,
- std::size_t buttonPriority,
- const std::string& buttonName,
- const std::string& buttonCaption,
- Dali::ResourceImage buttonIcon,
- bool buttonEnabled )
- : id( buttonId ),
- priority( buttonPriority ),
- name( buttonName ),
- caption( buttonCaption ),
- icon( buttonIcon ),
- enabled( buttonEnabled )
- {}
-
- Buttons id;
- std::size_t priority;
- std::string name;
- std::string caption;
- Dali::ResourceImage icon;
- bool enabled;
+ /**
+ * 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
};
-// Comparison function for ButtonRequirement Priority
-bool PriorityCompare( ButtonRequirement const& a, ButtonRequirement const& b)
+typedef std::vector<QuadCoordinates> QuadContainer;
+
+/**
+ * @brief Takes a bounding rectangle in the local coordinates of an actor and returns the world coordinates Bounding Box.
+ * @param[in] boundingRectangle local bounding
+ * @param[out] Vector4 World coordinate bounding Box.
+ */
+void LocalToWorldCoordinatesBoundingBox( const Dali::Rect<int>& boundingRectangle, Dali::Vector4& boundingBox )
{
- return a.priority < b.priority;
+ // Convert to world coordinates and store as a Vector4 to be compatible with Property Notifications.
+ Dali::Vector2 stageSize = Dali::Stage::GetCurrent().GetSize();
+
+ const float originX = boundingRectangle.x - 0.5f * stageSize.width;
+ const float originY = boundingRectangle.y - 0.5f * stageSize.height;
+
+ boundingBox = Dali::Vector4( originX,
+ originY,
+ originX + boundingRectangle.width,
+ originY + boundingRectangle.height );
}
+
} // end of namespace
namespace Dali
struct CursorImpl
{
CursorImpl()
- : x(0.0f),
- y(0.0f),
- height(0.0f),
- color(Dali::Color::WHITE)
+ : color( Dali::Color::WHITE ),
+ position(),
+ cursorHeight( 0.0f ),
+ lineHeight( 0.0f )
{
}
- float x;
- float y;
- float height;
-
Vector4 color;
+ Vector2 position;
+ float cursorHeight;
+ float lineHeight;
};
struct SelectionHandleImpl
{
SelectionHandleImpl()
- : x(0.0f),
- y(0.0f),
- cursorHeight(0.0f),
- flipped(false)
+ : position(),
+ lineHeight( 0.0f ),
+ flipped( false )
{
}
- float x;
- float y;
- float cursorHeight; ///< Not the handle height
- bool flipped;
-
ImageActor actor;
Actor grabArea;
Image pressedImage;
Image releasedImage;
- };
- struct PopupImpl
- {
- PopupImpl()
- : mVisiblePopUpSize( Vector2( 100.0f, 100.0f ) ),
- mRequiredPopUpSize( Vector2( 100.0f, 100.0f ) ),
- mMaxWidth( DEFAULT_POPUP_MAX_SIZE.width ),
- mBackgroundColor( DEFAULT_POPUP_BACKGROUND ),
- mBackgroundPressedColor( DEFAULT_POPUP_BACKGROUND_PRESSED ),
- mLineColor( DEFAULT_POPUP_LINE_COLOR ),
- mIconColor( DEFAULT_OPTION_ICON ),
- mIconPressedColor( DEFAULT_OPTION_ICON_PRESSED ),
- mTextColor( DEFAULT_OPTION_TEXT ),
- mTextPressedColor( DEFAULT_OPTION_TEXT_PRESSED )
- {
- }
-
- Actor mRoot; // The actor which all popup content is added to (i.e. panel and buttons)
- Actor mButtons; // Actor which holds all the buttons, sensitivity can be set oActor buttons via this actor
- Layer mStencilLayer; // Layer to enable clipping when buttons exceed popup
- ImageActor mBackground; // The background popup panel
- ImageActor mTail; // The tail for the popup
- ImageActor mTailEffect; // the tail effect
- ImageActor mTailLine; // The border/outline around the tail
-
- Size mVisiblePopUpSize; // Visible Size of popup excluding content that needs scrolling.
- Size mRequiredPopUpSize; // Total size of popup including any invisible margin
- float mMaxWidth; // Max width of the Popup
-
- Vector4 mNinePatchMargins; // Margins between the edge of the cropped image and the nine patch rect (left, right, top, bottom).
-
- Size mContentSize; // Size of Content (i.e. Buttons)
- //Animation mAnimation; // Popup Hide/Show animation.
-
- std::vector<ButtonRequirement> mOrderListOfButtons; // List of buttons in the order to be displayed and a flag to indicate if needed.
-
- Vector4 mBackgroundColor; // Color of the background of the text input popup
- Vector4 mBackgroundPressedColor; // Color of the option background.
- Vector4 mLineColor; // Color of the line around the text input popup
- Vector4 mIconColor; // Color of the popup icon.
- Vector4 mIconPressedColor; // Color of the popup icon when pressed.
- Vector4 mTextColor; // Color of the popup text.
- Vector4 mTextPressedColor; // Color of the popup text when pressed.
-
- // Priority of Options/Buttons in the Cut and Paste pop-up, higher priority buttons are displayed first, left to right.
- std::size_t mSelectOptionPriority; // Position of Select Button
- std::size_t mSelectAllOptionPriority; // Position of Select All button
- std::size_t mCutOptionPriority; // Position of Cut button
- std::size_t mCopyOptionPriority; // Position of Copy button
- std::size_t mPasteOptionPriority; // Position of Paste button
- std::size_t mClipboardOptionPriority; // Position of Clipboard button
-
- bool mShowIcons; // Flag to show icons
+ Vector2 position;
+ float lineHeight; ///< Not the handle height
+ bool flipped;
};
-
Impl( Dali::Toolkit::Internal::Control& parent, Observer& observer )
- : mTextControlParent(parent),
- mObserver(observer),
- mActiveCursor(ACTIVE_CURSOR_NONE),
- mActiveGrabHandle(false),
- mActiveSelection( false ),
- mActiveCopyPastePopup( false ),
+ : mTextControlParent( parent ),
+ mObserver( observer ),
+ mBoundingBox( Rect<int>() ),
+ mHighlightColor( 0.07f, 0.41f, 0.59f, 1.0f ), // light blue
+ mActiveCursor( ACTIVE_CURSOR_NONE ),
mCursorBlinkInterval( CURSOR_BLINK_INTERVAL ),
mCursorBlinkDuration( 0.0f ),
- mCursorBlinkStatus( true ),
mGrabDisplacementX( 0.0f ),
mGrabDisplacementY( 0.0f ),
- mBoundingBox( Rect<int>() )
+ mActiveGrabHandle( false ),
+ mActiveSelection( false ),
+ mActiveCopyPastePopup( false ),
+ mCursorBlinkStatus( true )
{
}
/**
* Relayout of the decorations owned by the decorator.
- * @param[in] size The Size of the UI control the decorater is adding it's decorations to.
+ * @param[in] size The Size of the UI control the decorator is adding it's decorations to.
*/
void Relayout( const Vector2& size, const Vector2& scrollPosition )
{
CreateCursors();
if( mPrimaryCursor )
{
- mPrimaryCursor.SetPosition( mCursor[PRIMARY_CURSOR].x + scrollPosition.x,
- mCursor[PRIMARY_CURSOR].y + scrollPosition.y );
- mPrimaryCursor.SetSize( 1.0f, mCursor[PRIMARY_CURSOR].height );
+ mPrimaryCursor.SetPosition( mCursor[PRIMARY_CURSOR].position.x + scrollPosition.x,
+ mCursor[PRIMARY_CURSOR].position.y + scrollPosition.y );
+ mPrimaryCursor.SetSize( Size( 1.0f, mCursor[PRIMARY_CURSOR].cursorHeight ) );
}
if( mSecondaryCursor )
{
- mSecondaryCursor.SetPosition( mCursor[SECONDARY_CURSOR].x + scrollPosition.x,
- mCursor[SECONDARY_CURSOR].y + scrollPosition.y );
- mSecondaryCursor.SetSize( 1.0f, mCursor[SECONDARY_CURSOR].height );
+ mSecondaryCursor.SetPosition( mCursor[SECONDARY_CURSOR].position.x + scrollPosition.x,
+ mCursor[SECONDARY_CURSOR].position.y + scrollPosition.y );
+ mSecondaryCursor.SetSize( Size( 1.0f, mCursor[SECONDARY_CURSOR].cursorHeight ) );
}
// Show or hide the grab handle
CreateGrabHandle();
- mGrabHandle.SetPosition( mCursor[PRIMARY_CURSOR].x + scrollPosition.x,
- mCursor[PRIMARY_CURSOR].y + scrollPosition.y + mCursor[PRIMARY_CURSOR].height );
+ mGrabHandle.SetPosition( mCursor[PRIMARY_CURSOR].position.x + scrollPosition.x,
+ mCursor[PRIMARY_CURSOR].position.y + mCursor[PRIMARY_CURSOR].lineHeight + scrollPosition.y );
}
else if( mGrabHandle )
{
CreateSelectionHandles();
SelectionHandleImpl& primary = mSelectionHandle[ PRIMARY_SELECTION_HANDLE ];
- primary.actor.SetPosition( primary.x + scrollPosition.x,
- primary.y + scrollPosition.y + primary.cursorHeight );
+ primary.actor.SetPosition( primary.position.x + scrollPosition.x,
+ primary.position.y + primary.lineHeight + scrollPosition.y );
SelectionHandleImpl& secondary = mSelectionHandle[ SECONDARY_SELECTION_HANDLE ];
- secondary.actor.SetPosition( secondary.x + scrollPosition.x,
- secondary.y + scrollPosition.y + secondary.cursorHeight );
+ secondary.actor.SetPosition( secondary.position.x + scrollPosition.x,
+ secondary.position.y + secondary.lineHeight + scrollPosition.y );
- //CreateHighlight(); TODO
+ CreateHighlight();
+ UpdateHighlight();
}
else
{
UnparentAndReset( mSelectionHandle[ PRIMARY_SELECTION_HANDLE ].actor );
UnparentAndReset( mSelectionHandle[ SECONDARY_SELECTION_HANDLE ].actor );
+ UnparentAndReset( mHighlightMeshActor );
}
if ( mActiveCopyPastePopup )
{
- CreatePopup();
- mCopyPastePopup.mRoot.SetPosition( Vector3( 180.0f, -100.0f, 0.0f ) ); //todo grabhandle or selection handle postions to be used
+ if ( !mCopyPastePopup )
+ {
+ mCopyPastePopup = TextSelectionPopup::New();
+#ifdef DECORATOR_DEBUG
+ mCopyPastePopup.SetName("mCopyPastePopup");
+#endif
+ mCopyPastePopup.SetAnchorPoint( AnchorPoint::CENTER );
+ mCopyPastePopup.OnRelayoutSignal().Connect( this, &Decorator::Impl::PopUpRelayoutComplete ); // Position popup after size negotiation
+ mActiveLayer.Add ( mCopyPastePopup );
+ }
}
else
{
- DestroyPopup();
+ if ( mCopyPastePopup )
+ {
+ UnparentAndReset( mCopyPastePopup );
+ }
}
}
+ void PopUpRelayoutComplete( Actor actor )
+ {
+ // Size negotiation for CopyPastePopup complete so can get the size and constrain position within bounding box.
+
+ mCopyPastePopup.OnRelayoutSignal().Disconnect( this, &Decorator::Impl::PopUpRelayoutComplete );
+
+ Vector3 popupPosition( mCursor[PRIMARY_CURSOR].position.x, mCursor[PRIMARY_CURSOR].position.y -100.0f , 0.0f); //todo 100 to be an offset Property
+
+ Vector3 popupSize = Vector3( mCopyPastePopup.GetRelayoutSize( Dimension::WIDTH ), mCopyPastePopup.GetRelayoutSize( Dimension::HEIGHT ), 0.0f );
+
+ GetConstrainedPopupPosition( popupPosition, popupSize, AnchorPoint::CENTER, mActiveLayer, mBoundingBox );
+
+ SetUpPopUpPositionNotifications();
+
+ mCopyPastePopup.SetPosition( popupPosition ); //todo grabhandle(cursor) or selection handle positions to be used
+ }
+
void CreateCursor( ImageActor& cursor )
{
cursor = CreateSolidColorActor( Color::WHITE );
- cursor.SetParentOrigin( ParentOrigin::TOP_LEFT );
+ cursor.SetParentOrigin( ParentOrigin::TOP_LEFT ); // Need to set the default parent origin as CreateSolidColorActor() sets a different one.
cursor.SetAnchorPoint( AnchorPoint::TOP_CENTER );
}
#ifdef DECORATOR_DEBUG
mPrimaryCursor.SetName( "PrimaryCursorActor" );
#endif
- mActiveLayer.Add( mPrimaryCursor);
+ mActiveLayer.Add( mPrimaryCursor );
}
}
#ifdef DECORATOR_DEBUG
mSecondaryCursor.SetName( "SecondaryCursorActor" );
#endif
- mActiveLayer.Add( mSecondaryCursor);
+ mActiveLayer.Add( mSecondaryCursor );
}
}
+ else
+ {
+ UnparentAndReset( mSecondaryCursor );
+ }
}
}
mActiveLayer.SetName ( "ActiveLayerActor" );
#endif
- mActiveLayer.SetAnchorPoint( AnchorPoint::CENTER);
- mActiveLayer.SetParentOrigin( ParentOrigin::CENTER);
- mActiveLayer.SetSizeMode( SIZE_EQUAL_TO_PARENT );
+ mActiveLayer.SetParentOrigin( ParentOrigin::CENTER );
+ mActiveLayer.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
mActiveLayer.SetPositionInheritanceMode( USE_PARENT_POSITION );
parent.Add( mActiveLayer );
}
mGrabHandle = ImageActor::New( mGrabHandleImage );
-#ifdef DECORATOR_DEBUG
- mGrabHandle.SetName( "GrabHandleActor" );
-#endif
- mGrabHandle.SetParentOrigin( ParentOrigin::TOP_LEFT );
mGrabHandle.SetAnchorPoint( AnchorPoint::TOP_CENTER );
mGrabHandle.SetDrawMode( DrawMode::OVERLAY );
-
- mGrabArea = Actor::New(); // Area that Grab handle responds to, larger than actual handle so easier to move
+ // Area that Grab handle responds to, larger than actual handle so easier to move
#ifdef DECORATOR_DEBUG
- mGrabArea.SetName( "GrabArea" );
+ mGrabHandle.SetName( "GrabHandleActor" );
+ if ( Dali::Internal::gLogFilter->IsEnabledFor( Debug::Verbose ) )
+ {
+ mGrabArea = Toolkit::CreateSolidColorActor( Vector4(0.0f, 0.0f, 0.0f, 0.0f), true, Color::RED, 1 );
+ mGrabArea.SetName( "GrabArea" );
+ }
+ else
+ {
+ mGrabArea = Actor::New();
+ mGrabArea.SetName( "GrabArea" );
+ }
+#else
+ mGrabArea = Actor::New();
#endif
- mGrabArea.SetPositionInheritanceMode( Dali::USE_PARENT_POSITION );
- mGrabArea.SetSizeMode( SIZE_RELATIVE_TO_PARENT );
+
+ mGrabArea.SetParentOrigin( ParentOrigin::TOP_CENTER );
+ mGrabArea.SetAnchorPoint( AnchorPoint::TOP_CENTER );
+ mGrabArea.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS );
mGrabArea.SetSizeModeFactor( DEFAULT_GRAB_HANDLE_RELATIVE_SIZE );
- mGrabHandle.Add(mGrabArea);
+ mGrabHandle.Add( mGrabArea );
mTapDetector.Attach( mGrabArea );
mPanGestureDetector.Attach( mGrabArea );
- mActiveLayer.Add(mGrabHandle);
+ mActiveLayer.Add( mGrabHandle );
}
}
#ifdef DECORATOR_DEBUG
primary.actor.SetName("SelectionHandleOne");
#endif
- primary.actor.SetParentOrigin( ParentOrigin::TOP_LEFT );
primary.actor.SetAnchorPoint( AnchorPoint::TOP_RIGHT ); // Change to BOTTOM_RIGHT if Look'n'Feel requires handle above text.
primary.actor.SetDrawMode( DrawMode::OVERLAY ); // ensure grab handle above text
primary.flipped = false;
#ifdef DECORATOR_DEBUG
primary.grabArea.SetName("SelectionHandleOneGrabArea");
#endif
- primary.grabArea.SetSizeMode( SIZE_RELATIVE_TO_PARENT );
+ primary.grabArea.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS );
primary.grabArea.SetSizeModeFactor( DEFAULT_SELECTION_HANDLE_RELATIVE_SIZE );
primary.grabArea.SetPositionInheritanceMode( Dali::USE_PARENT_POSITION );
#ifdef DECORATOR_DEBUG
secondary.actor.SetName("SelectionHandleTwo");
#endif
- secondary.actor.SetParentOrigin( ParentOrigin::TOP_LEFT );
- secondary.actor.SetAnchorPoint( AnchorPoint::TOP_RIGHT ); // Change to BOTTOM_RIGHT if Look'n'Feel requires handle above text.
+ secondary.actor.SetAnchorPoint( AnchorPoint::TOP_LEFT ); // Change to BOTTOM_LEFT if Look'n'Feel requires handle above text.
secondary.actor.SetDrawMode( DrawMode::OVERLAY ); // ensure grab handle above text
secondary.flipped = false;
#ifdef DECORATOR_DEBUG
secondary.grabArea.SetName("SelectionHandleTwoGrabArea");
#endif
- secondary.grabArea.SetSizeMode( SIZE_RELATIVE_TO_PARENT );
+ secondary.grabArea.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS );
secondary.grabArea.SetSizeModeFactor( DEFAULT_SELECTION_HANDLE_RELATIVE_SIZE );
secondary.grabArea.SetPositionInheritanceMode( Dali::USE_PARENT_POSITION );
//SetUpHandlePropertyNotifications(); TODO
}
+ void CreateHighlight()
+ {
+ if ( !mHighlightMeshActor )
+ {
+ mHighlightMaterial = Material::New( "HighlightMaterial" );
+ mHighlightMaterial.SetDiffuseColor( mHighlightColor );
+
+ mHighlightMeshData.SetMaterial( mHighlightMaterial );
+ mHighlightMeshData.SetHasNormals( true );
+
+ mHighlightMesh = Mesh::New( mHighlightMeshData );
+
+ mHighlightMeshActor = MeshActor::New( mHighlightMesh );
+#ifdef DECORATOR_DEBUG
+ mHighlightMeshActor.SetName( "HighlightMeshActor" );
+#endif
+ mHighlightMeshActor.SetAnchorPoint( AnchorPoint::TOP_LEFT );
+ mHighlightMeshActor.SetPosition( 0.0f, 0.0f, DISPLAYED_HIGHLIGHT_Z_OFFSET );
+
+ Actor parent = mTextControlParent.Self();
+ parent.Add( mHighlightMeshActor );
+ }
+ }
+
+ void UpdateHighlight()
+ {
+ // Construct a Mesh with a texture to be used as the highlight 'box' for selected text
+ //
+ // Example scenarios where mesh is made from 3, 1, 2, 2 ,3 or 3 quads.
+ //
+ // [ TOP ] [ TOP ] [TOP ] [ TOP ] [ TOP ] [ TOP ]
+ // [ MIDDLE ] [BOTTOM] [BOTTOM] [ MIDDLE ] [ MIDDLE ]
+ // [ BOTTOM] [ MIDDLE ] [ MIDDLE ]
+ // [BOTTOM] [ MIDDLE ]
+ // [BOTTOM]
+ //
+ // Each quad is created as 2 triangles.
+ // Middle is just 1 quad regardless of its size.
+ //
+ // (0,0) (0,0)
+ // 0* *2 0* *2
+ // TOP TOP
+ // 3* *1 3* *1
+ // 4* *1 4* *6
+ // MIDDLE BOTTOM
+ // 6* *5 7* *5
+ // 6* *8
+ // BOTTOM
+ // 9* *7
+ //
+
+ if ( mHighlightMesh && mHighlightMaterial && !mHighlightQuadList.empty() )
+ {
+ MeshData::VertexContainer vertices;
+ Dali::MeshData::FaceIndices faceIndices;
+
+ std::vector<QuadCoordinates>::iterator iter = mHighlightQuadList.begin();
+ std::vector<QuadCoordinates>::iterator endIter = mHighlightQuadList.end();
+
+ // vertex position defaults to (0 0 0)
+ MeshData::Vertex vertex;
+ // set normal for all vertices as (0 0 1) pointing outward from TextInput Actor.
+ vertex.nZ = 1.0f;
+
+ for(std::size_t v = 0; iter != endIter; ++iter,v+=4 )
+ {
+ // Add each quad geometry (a sub-selection) to the mesh data.
+
+ // 0-----1
+ // |\ |
+ // | \ A |
+ // | \ |
+ // | B \ |
+ // | \|
+ // 2-----3
+
+ QuadCoordinates& quad = *iter;
+ // top-left (v+0)
+ vertex.x = quad.min.x;
+ vertex.y = quad.min.y;
+ vertices.push_back( vertex );
+
+ // top-right (v+1)
+ vertex.x = quad.max.x;
+ vertex.y = quad.min.y;
+ vertices.push_back( vertex );
+
+ // bottom-left (v+2)
+ vertex.x = quad.min.x;
+ vertex.y = quad.max.y;
+ vertices.push_back( vertex );
+
+ // bottom-right (v+3)
+ vertex.x = quad.max.x;
+ vertex.y = quad.max.y;
+ vertices.push_back( vertex );
+
+ // triangle A (3, 1, 0)
+ faceIndices.push_back( v + 3 );
+ faceIndices.push_back( v + 1 );
+ faceIndices.push_back( v );
+
+ // triangle B (0, 2, 3)
+ faceIndices.push_back( v );
+ faceIndices.push_back( v + 2 );
+ faceIndices.push_back( v + 3 );
+
+ mHighlightMeshData.SetFaceIndices( faceIndices );
+ }
+
+ BoneContainer bones(0); // passed empty as bones not required
+ mHighlightMeshData.SetData( vertices, faceIndices, bones, mHighlightMaterial );
+ mHighlightMesh.UpdateMeshData( mHighlightMeshData );
+ }
+ }
+
void OnTap( Actor actor, const TapGesture& tap )
{
if( actor == mGrabHandle )
mGrabDisplacementX += gesture.displacement.x;
mGrabDisplacementY += gesture.displacement.y;
- float x = mCursor[PRIMARY_CURSOR].x + mGrabDisplacementX;
- float y = mCursor[PRIMARY_CURSOR].y + mCursor[PRIMARY_CURSOR].height*0.5f + mGrabDisplacementY;
+ const float x = mCursor[PRIMARY_CURSOR].position.x + mGrabDisplacementX;
+ const float y = mCursor[PRIMARY_CURSOR].position.y + mCursor[PRIMARY_CURSOR].lineHeight*0.5f + mGrabDisplacementY;
if( Gesture::Started == gesture.state ||
Gesture::Continuing == gesture.state )
return false;
}
- /**
- * Popup
- */
+ // Popup
- void CreateOrderedListOfPopupOptions()
+ float AlternatePopUpPositionRelativeToCursor()
{
- mCopyPastePopup.mOrderListOfButtons.clear();
-
- // Create button for each possible option using Option priority
- ResourceImage cutIcon = ResourceImage::New( OPTION_ICON_CUT );
- mCopyPastePopup.mOrderListOfButtons.push_back( ButtonRequirement( ButtonsCut, mCopyPastePopup.mCutOptionPriority, OPTION_CUT, GET_LOCALE_TEXT("IDS_COM_BODY_CUT"), cutIcon, true ) );
-
- ResourceImage copyIcon = ResourceImage::New( OPTION_ICON_COPY );
- mCopyPastePopup.mOrderListOfButtons.push_back( ButtonRequirement( ButtonsCopy, mCopyPastePopup.mCopyOptionPriority, OPTION_COPY, GET_LOCALE_TEXT("IDS_COM_BODY_COPY"), copyIcon, true ) );
-
- ResourceImage pasteIcon = ResourceImage::New( OPTION_ICON_PASTE );
- mCopyPastePopup.mOrderListOfButtons.push_back( ButtonRequirement( ButtonsPaste, mCopyPastePopup.mPasteOptionPriority, OPTION_PASTE, GET_LOCALE_TEXT("IDS_COM_BODY_PASTE"), pasteIcon, true ) );
+ float alternativePosition=0.0f;;
- ResourceImage selectIcon = ResourceImage::New( OPTION_ICON_SELECT );
- mCopyPastePopup.mOrderListOfButtons.push_back( ButtonRequirement( ButtonsSelect, mCopyPastePopup.mSelectOptionPriority, OPTION_SELECT_WORD, GET_LOCALE_TEXT("IDS_COM_SK_SELECT"), selectIcon, true ) );
-
- ResourceImage selectAllIcon = ResourceImage::New( OPTION_ICON_SELECT_ALL );
- mCopyPastePopup.mOrderListOfButtons.push_back( ButtonRequirement( ButtonsSelectAll, mCopyPastePopup.mSelectAllOptionPriority, OPTION_SELECT_ALL, GET_LOCALE_TEXT("IDS_COM_BODY_SELECT_ALL"), selectAllIcon, true ) );
-
- ResourceImage clipboardIcon = ResourceImage::New( OPTION_ICON_CLIPBOARD );
- mCopyPastePopup.mOrderListOfButtons.push_back( ButtonRequirement( ButtonsClipboard, mCopyPastePopup.mClipboardOptionPriority, OPTION_CLIPBOARD, GET_LOCALE_TEXT("IDS_COM_BODY_CLIPBOARD"), clipboardIcon, true ) );
-
- // Sort the buttons according their priorities.
- std::sort( mCopyPastePopup.mOrderListOfButtons.begin(), mCopyPastePopup.mOrderListOfButtons.end(), PriorityCompare );
- }
-
- void CreateBackground( PopupImpl& popup )
- {
- // Create background-panel if not already created (required if we have at least one option)
- if ( !popup.mBackground )
+ if ( mPrimaryCursor ) // Secondary cursor not used for paste
{
- ResourceImage bgImg = ResourceImage::New( POPUP_BACKGROUND );
- popup.mBackground = ImageActor::New( bgImg );
- popup.mBackground.SetColor( popup.mBackgroundColor );
- popup.mBackground.SetParentOrigin( ParentOrigin::CENTER );
-
- NinePatchImage backgroundImageNinePatch = NinePatchImage::DownCast( bgImg );
- if( backgroundImageNinePatch )
- {
- const Size ninePatchImageSize = Size( static_cast<float>( bgImg.GetWidth() ), static_cast<float>( bgImg.GetHeight() ) );
- Rect<int> childRect = backgroundImageNinePatch.GetChildRectangle();
-
- // -1u because of the cropping.
- popup.mNinePatchMargins.x = childRect.x - 1u;
- popup.mNinePatchMargins.y = ninePatchImageSize.width - ( childRect.x + childRect.width ) - 1u;
- popup.mNinePatchMargins.z = childRect.y - 1u;
- popup.mNinePatchMargins.w = ninePatchImageSize.height - ( childRect.y + childRect.height ) - 1u;
- }
-
- ResourceImage::Image bgEffectImg = ResourceImage::New( POPUP_BACKGROUND_EFFECT );
- ImageActor backgroundEffect = ImageActor::New( bgEffectImg );
- backgroundEffect.SetParentOrigin( ParentOrigin::CENTER );
-
- ResourceImage::Image bgLine = ResourceImage::New( POPUP_BACKGROUND_LINE );
- ImageActor backgroundLine = ImageActor::New( bgLine );
- backgroundLine.SetParentOrigin( ParentOrigin::CENTER );
- backgroundLine.SetColor( popup.mLineColor );
-
- popup.mBackground.Add( backgroundEffect );
- popup.mBackground.Add( backgroundLine );
+ Cursor cursor = PRIMARY_CURSOR;
+ alternativePosition = mCursor[cursor].position.y;
}
- }
- void AddOption( Actor& parent, const std::string& name, const std::string& caption, const Image iconImage, bool finalOption, bool showIcons )
- {
- // 1. Create the backgrounds for the popup option both normal and pressed.
- // Both containers will be added to a button.
- Actor optionContainer = Actor::New();
- optionContainer.SetDrawMode( DrawMode::OVERLAY );
- //optionContainer.SetParentOrigin( ParentOrigin::CENTER );
- optionContainer.SetAnchorPoint( AnchorPoint::TOP_LEFT );
-
- ImageActor optionPressedContainer = Toolkit::CreateSolidColorActor( mCopyPastePopup.mBackgroundPressedColor );
- optionPressedContainer.SetDrawMode( DrawMode::OVERLAY );
- //optionPressedContainer.SetParentOrigin( ParentOrigin::CENTER );
- optionPressedContainer.SetAnchorPoint( AnchorPoint::TOP_LEFT );
-
- // 2. Add text.
- Toolkit::TextLabel captionTextLabel = Toolkit::TextLabel::New();
- captionTextLabel.SetProperty( TextLabel::Property::TEXT, caption );
- optionContainer.Add( captionTextLabel );
-
- Toolkit::TextLabel pressedCaptionTextLabel = Toolkit::TextLabel::New();
- pressedCaptionTextLabel.SetProperty( TextLabel::Property::TEXT, caption );
- optionPressedContainer.Add( pressedCaptionTextLabel );
-
- // Calculates the icon/text position.
- float iconTextOffsetY = 0.0f;
-
- if ( showIcons )
+ const float popupHeight = 120.0f; // todo Set as a MaxSize Property in Control or retrieve from CopyPastePopup class.
+
+ if( mActiveGrabHandle )
{
- // 3. Create the icons
- ImageActor pressedIcon = ImageActor::New( iconImage );
- ImageActor icon = ImageActor::New( iconImage );
-
- optionContainer.Add( icon );
- optionPressedContainer.Add( pressedIcon );
-
- iconTextOffsetY = 0.5f * ( ( DEFAULT_POPUP_MAX_SIZE.height - mCopyPastePopup.mNinePatchMargins.z - mCopyPastePopup.mNinePatchMargins.w ) - ( OPTION_ICON_SIZE.height + OPTION_GAP_ICON_TEXT + OPTION_TEXT_LINE_HEIGHT ) );
-
- icon.SetParentOrigin( ParentOrigin::TOP_CENTER );
- icon.SetAnchorPoint( AnchorPoint::TOP_CENTER );
- icon.SetY( iconTextOffsetY );
-
- pressedIcon.SetParentOrigin( ParentOrigin::TOP_CENTER );
- pressedIcon.SetAnchorPoint( AnchorPoint::TOP_CENTER );
- pressedIcon.SetY( iconTextOffsetY );
-
- // Layout icon + gap + text
- captionTextLabel.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER );
- pressedCaptionTextLabel.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER );
- pressedCaptionTextLabel.SetParentOrigin( ParentOrigin::BOTTOM_CENTER );
- captionTextLabel.SetParentOrigin( ParentOrigin::BOTTOM_CENTER );
- pressedCaptionTextLabel.SetY( -iconTextOffsetY );
- captionTextLabel.SetY( -iconTextOffsetY );
+ // If grab handle enabled then position pop-up below the grab handle.
+ const Vector2 grabHandleSize( 59.0f, 56.0f ); // todo
+ const float BOTTOM_HANDLE_BOTTOM_OFFSET = 1.5; //todo Should be a property
+ alternativePosition += grabHandleSize.height + popupHeight + BOTTOM_HANDLE_BOTTOM_OFFSET ;
}
else
{
- // Centre option text
- captionTextLabel.SetAnchorPoint( AnchorPoint::CENTER );
- captionTextLabel.SetParentOrigin( ParentOrigin::CENTER );
- pressedCaptionTextLabel.SetAnchorPoint( AnchorPoint::CENTER );
- pressedCaptionTextLabel.SetParentOrigin( ParentOrigin::CENTER );
+ alternativePosition += popupHeight;
}
- // Calculate the size of the text.
- Vector3 textSize = captionTextLabel.GetNaturalSize();
- textSize.width = std::min( textSize.width, OPTION_MAX_WIDTH - 2.f * OPTION_MARGIN_WIDTH );
-
- // Set the size to the text. Text will be ellipsized if exceeds the max width.
- captionTextLabel.SetSize( textSize );
- pressedCaptionTextLabel.SetSize( textSize );
-
- // 4. Calculate the size of option.
-
- // The width is the max size of the text or the icon plus the margins clamped between the option min and max size.
- // The height is the whole popup height minus the ninepatch margins.
- const Vector2 optionSize( std::min( OPTION_MAX_WIDTH, std::max( OPTION_MIN_WIDTH, std::max( textSize.width, OPTION_ICON_SIZE.width ) + 2.f * OPTION_MARGIN_WIDTH ) ),
- DEFAULT_POPUP_MAX_SIZE.height - mCopyPastePopup.mNinePatchMargins.z - mCopyPastePopup.mNinePatchMargins.w );
+ return alternativePosition;
+ }
- optionContainer.SetSize( optionSize );
- optionPressedContainer.SetSize( optionSize );
+ void PopUpLeavesVerticalBoundary( PropertyNotification& source )
+ {
+ float alternativeYPosition=0.0f;
+ // todo
+ // if( mHighlightMeshActor ) // Text Selection mode
+ // {
+ // alternativePosition = AlternatePopUpPositionRelativeToSelectionHandles();
+ // }
+ // else // Not in Text Selection mode
+ // {
+ // if can't be positioned above, then position below row.
+ alternativeYPosition = AlternatePopUpPositionRelativeToCursor();
+ // }
+ mCopyPastePopup.SetY( alternativeYPosition );
+ }
- // 5. Create a option.
- Toolkit::PushButton option = Toolkit::PushButton::New();
- option.SetSizePolicy( Toolkit::Control::Fixed, Toolkit::Control::Fixed );
- option.SetSize( optionSize );
- option.SetAnchorPoint( AnchorPoint::TOP_LEFT );
- option.SetX( mCopyPastePopup.mContentSize.width );
- option.SetName( name );
- option.SetAnimationTime( 0.0f );
- //option.ClickedSignal().Connect( this, &TextInputPopup::OnButtonPressed );
- parent.Add( option );
+ void SetUpPopUpPositionNotifications( )
+ {
+ // Note Property notifications ignore any set anchor point so conditions must allow for this. Default is Top Left.
- // 6. Set the normal option image.
- option.SetButtonImage( optionContainer );
+ // Exceeding vertical boundary
- // 7. Set the pressed option image
- option.SetSelectedImage( optionPressedContainer );
+ Vector4 worldCoordinatesBoundingBox;
+ LocalToWorldCoordinatesBoundingBox( mBoundingBox, worldCoordinatesBoundingBox );
- // 8. Update the content size.
- mCopyPastePopup.mContentSize.width += optionSize.width;
- mCopyPastePopup.mContentSize.height = std::max ( optionSize.height, mCopyPastePopup.mContentSize.height );
+ float popupHeight = mCopyPastePopup.GetRelayoutSize( Dimension::HEIGHT);
- // 9. Add the divider
- if( !finalOption )
- {
- const Size size( POPUP_DIVIDER_WIDTH, mCopyPastePopup.mContentSize.height );
-
- ImageActor divider = Toolkit::CreateSolidColorActor( Color::WHITE );
- divider.SetSize (size);
- divider.SetParentOrigin( ParentOrigin::TOP_LEFT );
- divider.SetAnchorPoint( AnchorPoint::TOP_LEFT );
- divider.SetPosition( mCopyPastePopup.mContentSize.width - POPUP_DIVIDER_WIDTH, 0.0f );
- parent.Add( divider );
- }
- }
+ PropertyNotification verticalExceedNotification = mCopyPastePopup.AddPropertyNotification( Actor::Property::WORLD_POSITION_Y,
+ OutsideCondition( worldCoordinatesBoundingBox.y + popupHeight/2,
+ worldCoordinatesBoundingBox.w - popupHeight/2 ) );
- void SetUpPopup( Actor& popupRootActor, Size& size )
- {
- // Create Layer and Stencil.
- popupRootActor = Actor::New();
- mCopyPastePopup.mStencilLayer = Layer::New();
- ImageActor stencil = CreateSolidColorActor( Color::RED );
- stencil.SetDrawMode( DrawMode::STENCIL );
- stencil.SetVisible( true );
- Actor scrollview = Actor::New();
-
- //todo Use Size negotiation
- mCopyPastePopup.mStencilLayer.SetSize( size ); // matches stencil size
- popupRootActor.SetSize( size ); // matches stencil size
- stencil.SetSize( size );
- scrollview.SetSize( size );
- mCopyPastePopup.mButtons.SetSize( size );
-
- mCopyPastePopup.mStencilLayer.SetAnchorPoint(AnchorPoint::TOP_LEFT);
- scrollview.SetAnchorPoint(AnchorPoint::TOP_LEFT);
- mCopyPastePopup.mButtons.SetAnchorPoint( AnchorPoint::TOP_LEFT );
-
- mActiveLayer.Add( mCopyPastePopup.mRoot );
- popupRootActor.Add( mCopyPastePopup.mBackground );
- popupRootActor.Add( mCopyPastePopup.mStencilLayer );
- mCopyPastePopup.mStencilLayer.Add( stencil );
- mCopyPastePopup.mStencilLayer.Add( scrollview );
- scrollview.Add( mCopyPastePopup.mButtons );
+ verticalExceedNotification.NotifySignal().Connect( this, &Decorator::Impl::PopUpLeavesVerticalBoundary );
}
- void AddPopupOptions( bool createTail, bool showIcons )
+ void GetConstrainedPopupPosition( Vector3& requiredPopupPosition, Vector3& popupSize, Vector3 anchorPoint, Actor& parent, Rect<int>& boundingBox )
{
- mCopyPastePopup.mShowIcons = showIcons;
-
- mCopyPastePopup.mContentSize = Vector2::ZERO;
+ DALI_ASSERT_DEBUG ( "Popup parent not on stage" && parent.OnStage() )
- mCopyPastePopup.mButtons = Actor::New();
+ // Parent must already by added to Stage for these Get calls to work
+ Vector3 parentAnchorPoint = parent.GetCurrentAnchorPoint();
+ Vector3 parentWorldPositionLeftAnchor = parent.GetCurrentWorldPosition() - parent.GetCurrentSize()*parentAnchorPoint;
+ Vector3 popupWorldPosition = parentWorldPositionLeftAnchor + requiredPopupPosition; // Parent World position plus popup local position gives World Position
+ Vector3 popupDistanceFromAnchorPoint = popupSize*anchorPoint;
- // Add the options into the buttons container.
-
- // 1. Determine how many buttons are active and should be added to container.
- std::size_t numberOfOptions = 0u;
- for( std::vector<ButtonRequirement>::const_iterator it = mCopyPastePopup.mOrderListOfButtons.begin(), endIt = mCopyPastePopup.mOrderListOfButtons.end(); ( it != endIt ); ++it )
- {
- const ButtonRequirement& button( *it );
- if( button.enabled )
- {
- ++numberOfOptions;
- }
- }
+ // Bounding rectangle is supplied as screen coordinates, bounding will be done in world coordinates.
+ Vector4 boundingRectangleWorld;
+ LocalToWorldCoordinatesBoundingBox( boundingBox, boundingRectangleWorld );
- // 2. Iterate list of buttons and add active ones.
- std::size_t optionsAdded = 0u;
- for( std::vector<ButtonRequirement>::const_iterator it = mCopyPastePopup.mOrderListOfButtons.begin(), endIt = mCopyPastePopup.mOrderListOfButtons.end(); ( it != endIt ); ++it )
+ // Calculate distance to move popup (in local space) so fits within the boundary
+ float xOffSetToKeepWithinBounds = 0.0f;
+ if( popupWorldPosition.x - popupDistanceFromAnchorPoint.x < boundingRectangleWorld.x )
{
- const ButtonRequirement& button( *it );
- if ( button.enabled )
- {
- ++optionsAdded;
- AddOption( mCopyPastePopup.mButtons, button.name, button.caption, button.icon, optionsAdded == numberOfOptions, mCopyPastePopup.mShowIcons );
- }
+ xOffSetToKeepWithinBounds = boundingRectangleWorld.x - ( popupWorldPosition.x - popupDistanceFromAnchorPoint.x );
}
-
- // Calculate the size of the whole popup which may not be all visible.
- mCopyPastePopup.mRequiredPopUpSize = Size( std::min( mCopyPastePopup.mMaxWidth, mCopyPastePopup.mContentSize.width + mCopyPastePopup.mNinePatchMargins.x + mCopyPastePopup.mNinePatchMargins.y ), DEFAULT_POPUP_MAX_SIZE. height );
-
- // Set the size of the background, background line and background effect.
- mCopyPastePopup.mBackground.SetSize( mCopyPastePopup.mRequiredPopUpSize);
- for( std::size_t index = 0u, childCount = mCopyPastePopup.mBackground.GetChildCount(); index < childCount; ++index )
+ else if ( popupWorldPosition.x + popupDistanceFromAnchorPoint.x > boundingRectangleWorld.z )
{
- mCopyPastePopup.mBackground.GetChildAt( index ).SetSize( mCopyPastePopup.mRequiredPopUpSize );
+ xOffSetToKeepWithinBounds = boundingRectangleWorld.z - ( popupWorldPosition.x + popupDistanceFromAnchorPoint.x );
}
- // Size of the contents within the popup
- mCopyPastePopup.mVisiblePopUpSize = Size( mCopyPastePopup.mRequiredPopUpSize.width - mCopyPastePopup.mNinePatchMargins.x - mCopyPastePopup.mNinePatchMargins.y, mCopyPastePopup.mRequiredPopUpSize.height - mCopyPastePopup.mNinePatchMargins.z - mCopyPastePopup.mNinePatchMargins.w );
-
- }
-
- void CreatePopup()
- {
- if ( !mCopyPastePopup.mRoot )
+ // 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 )
{
- mActiveCopyPastePopup = true;
- CreateOrderedListOfPopupOptions(); //todo Currently causes all options to be shown
- CreateBackground( mCopyPastePopup );
- AddPopupOptions( true, true );
- SetUpPopup( mCopyPastePopup.mRoot, mCopyPastePopup.mVisiblePopUpSize );
+ requiredPopupPosition.y = AlternatePopUpPositionRelativeToCursor();
}
- mCopyPastePopup.mStencilLayer.RaiseToTop();
- }
-
- void DestroyPopup()
- {
- if ( mCopyPastePopup.mRoot )
- {
- mActiveCopyPastePopup = false;
- UnparentAndReset( mCopyPastePopup.mButtons );
- UnparentAndReset( mCopyPastePopup.mRoot );
- }
+ requiredPopupPosition.x = requiredPopupPosition.x + xOffSetToKeepWithinBounds;
}
- Internal::Control& mTextControlParent;
- Observer& mObserver;
-
- Layer mActiveLayer; // Layer for active handles and alike that ensures they are above all else.
-
- unsigned int mActiveCursor;
- bool mActiveGrabHandle;
- bool mActiveSelection;
- bool mActiveCopyPastePopup;
+ Internal::Control& mTextControlParent;
+ Observer& mObserver;
- CursorImpl mCursor[CURSOR_COUNT];
+ TapGestureDetector mTapDetector;
+ PanGestureDetector mPanGestureDetector;
+ Timer mCursorBlinkTimer; ///< Timer to signal cursor to blink
- Timer mCursorBlinkTimer; // Timer to signal cursor to blink
- unsigned int mCursorBlinkInterval;
- float mCursorBlinkDuration;
- bool mCursorBlinkStatus; // Flag to switch between blink on and blink off
+ Layer mActiveLayer; ///< Layer for active handles and alike that ensures they are above all else.
+ ImageActor mPrimaryCursor;
+ ImageActor mSecondaryCursor;
+ ImageActor mGrabHandle;
+ Actor mGrabArea;
+ MeshActor mHighlightMeshActor; ///< Mesh Actor to display highlight
+ TextSelectionPopup mCopyPastePopup;
- ImageActor mPrimaryCursor;
- ImageActor mSecondaryCursor;
-
- ImageActor mGrabHandle;
- Actor mGrabArea;
- float mGrabDisplacementX;
- float mGrabDisplacementY;
+ Image mCursorImage;
+ Image mGrabHandleImage;
+ Mesh mHighlightMesh; ///< Mesh for highlight
+ MeshData mHighlightMeshData; ///< Mesh Data for highlight
+ Material mHighlightMaterial; ///< Material used for highlight
+ CursorImpl mCursor[CURSOR_COUNT];
SelectionHandleImpl mSelectionHandle[SELECTION_HANDLE_COUNT];
+ QuadContainer mHighlightQuadList; ///< Sub-selections that combine to create the complete selection highlight
- PopupImpl mCopyPastePopup;
-
- Image mCursorImage;
- Image mGrabHandleImage;
+ Rect<int> mBoundingBox;
+ Vector4 mHighlightColor; ///< Color of the highlight
- TapGestureDetector mTapDetector;
- PanGestureDetector mPanGestureDetector;
+ unsigned int mActiveCursor;
+ unsigned int mCursorBlinkInterval;
+ float mCursorBlinkDuration;
+ float mGrabDisplacementX;
+ float mGrabDisplacementY;
- Rect<int> mBoundingBox;
+ bool mActiveGrabHandle:1;
+ bool mActiveSelection:1;
+ bool mActiveCopyPastePopup:1;
+ bool mCursorBlinkStatus:1; ///< Flag to switch between blink on and blink off
};
DecoratorPtr Decorator::New( Internal::Control& parent, Observer& observer )
return mImpl->mActiveCursor;
}
-void Decorator::SetPosition( Cursor cursor, float x, float y, float height )
+void Decorator::SetPosition( Cursor cursor, float x, float y, float cursorHeight, float lineHeight )
{
// Adjust grab handle displacement
- mImpl->mGrabDisplacementX -= x - mImpl->mCursor[cursor].x;
- mImpl->mGrabDisplacementY -= y - mImpl->mCursor[cursor].y;
+ mImpl->mGrabDisplacementX -= x - mImpl->mCursor[cursor].position.x;
+ mImpl->mGrabDisplacementY -= y - mImpl->mCursor[cursor].position.y;
- mImpl->mCursor[cursor].x = x;
- mImpl->mCursor[cursor].y = y;
- mImpl->mCursor[cursor].height = height;
+ mImpl->mCursor[cursor].position.x = x;
+ mImpl->mCursor[cursor].position.y = y;
+ mImpl->mCursor[cursor].cursorHeight = cursorHeight;
+ mImpl->mCursor[cursor].lineHeight = lineHeight;
}
-void Decorator::GetPosition( Cursor cursor, float& x, float& y, float& height ) const
+void Decorator::GetPosition( Cursor cursor, float& x, float& y, float& cursorHeight, float& lineHeight ) const
{
- x = mImpl->mCursor[cursor].x;
- y = mImpl->mCursor[cursor].y;
- height = mImpl->mCursor[cursor].height;
+ x = mImpl->mCursor[cursor].position.x;
+ y = mImpl->mCursor[cursor].position.y;
+ cursorHeight = mImpl->mCursor[cursor].cursorHeight;
+ lineHeight = mImpl->mCursor[cursor].lineHeight;
}
void Decorator::SetColor( Cursor cursor, const Dali::Vector4& color )
void Decorator::SetCursorBlinkInterval( float seconds )
{
- mImpl->mCursorBlinkInterval = seconds*MILLISECONDS; // Convert to milliseconds
+ mImpl->mCursorBlinkInterval = static_cast<unsigned int>( seconds * TO_MILLISECONDS ); // Convert to milliseconds
}
float Decorator::GetCursorBlinkInterval() const
{
- return mImpl->mCursorBlinkInterval;
+ return static_cast<float>( mImpl->mCursorBlinkInterval ) * TO_SECONDS;
}
void Decorator::SetCursorBlinkDuration( float seconds )
void Decorator::SetPosition( SelectionHandle handle, float x, float y, float height )
{
- mImpl->mSelectionHandle[handle].x = x;
- mImpl->mSelectionHandle[handle].y = y;
- mImpl->mSelectionHandle[handle].cursorHeight = height;
+ mImpl->mSelectionHandle[handle].position.x = x;
+ mImpl->mSelectionHandle[handle].position.y = y;
+ mImpl->mSelectionHandle[handle].lineHeight = height;
}
void Decorator::GetPosition( SelectionHandle handle, float& x, float& y, float& height ) const
{
- x = mImpl->mSelectionHandle[handle].x;
- y = mImpl->mSelectionHandle[handle].y;
- height = mImpl->mSelectionHandle[handle].cursorHeight;
+ x = mImpl->mSelectionHandle[handle].position.x;
+ y = mImpl->mSelectionHandle[handle].position.y;
+ height = mImpl->mSelectionHandle[handle].lineHeight;
}
void Decorator::SetImage( SelectionHandle handle, SelectionHandleState state, Dali::Image image )
return mImpl->mSelectionHandle[handle].releasedImage;
}
-void Decorator::ShowPopup()
+void Decorator::AddHighlight( float x1, float y1, float x2, float y2 )
{
- if ( !mImpl->mCopyPastePopup.mRoot )
- {
- mImpl->CreatePopup();
- }
+ mImpl->mHighlightQuadList.push_back( QuadCoordinates(x1, y1, x2, y2) );
}
-void Decorator::HidePopup()
+void Decorator::ClearHighlights()
{
- if ( mImpl->mCopyPastePopup.mRoot )
- {
- mImpl->DestroyPopup();
- }
+ mImpl->mHighlightQuadList.clear();
+}
+
+void Decorator::SetPopupActive( bool active )
+{
+ mImpl->mActiveCopyPastePopup = active;
+}
+
+bool Decorator::IsPopupActive() const
+{
+ return mImpl->mActiveCopyPastePopup ;
}
Decorator::~Decorator()
projects / platform / core / uifw / dali-toolkit.git / blobdiff