X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fpopup%2Fpopup-impl.cpp;h=430d98597b5721a2466699438933ec74413d17a3;hp=73741386ac22bba1b397e94f82af9afd7a2dbda1;hb=8a647e87a01c5c78451653c1264a9eea81ac9b20;hpb=026776eb4b0303604b3c6ca5857cc1ac59b4006e diff --git a/dali-toolkit/internal/controls/popup/popup-impl.cpp b/dali-toolkit/internal/controls/popup/popup-impl.cpp index 7374138..430d985 100644 --- a/dali-toolkit/internal/controls/popup/popup-impl.cpp +++ b/dali-toolkit/internal/controls/popup/popup-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 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. @@ -21,26 +21,28 @@ // EXTERNAL INCLUDES #include // for strcmp #include +#include #include #include #include #include -#include +#include #include -#include +#include #include #include #include #include // INTERNAL INCLUDES +#include #include #include #include -#include #include #include #include +#include using namespace Dali; @@ -80,7 +82,7 @@ BaseHandle CreateToast() Toolkit::Popup popup = Toolkit::Popup::New(); // Setup for Toast Popup type. - popup.SetSizeModeFactor( DEFAULT_TOAST_WIDTH_OF_STAGE_RATIO ); + popup.SetProperty( Actor::Property::SIZE_MODE_FACTOR, DEFAULT_TOAST_WIDTH_OF_STAGE_RATIO ); popup.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::WIDTH ); popup.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT ); popup.SetProperty( Toolkit::Popup::Property::CONTEXTUAL_MODE, Toolkit::Popup::NON_CONTEXTUAL ); @@ -97,8 +99,8 @@ BaseHandle CreateToast() popup.SetProperty( Toolkit::Popup::Property::AUTO_HIDE_DELAY, DEFAULT_TOAST_AUTO_HIDE_DELAY ); // Align to the bottom of the screen. - popup.SetParentOrigin( DEFAULT_TOAST_BOTTOM_PARENT_ORIGIN ); - popup.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER ); + popup.SetProperty( Actor::Property::PARENT_ORIGIN, DEFAULT_TOAST_BOTTOM_PARENT_ORIGIN ); + popup.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_CENTER ); // Let events pass through the toast popup. popup.SetProperty( Toolkit::Popup::Property::TOUCH_TRANSPARENT, true ); @@ -177,29 +179,29 @@ const Scripting::StringEnum ContextualModeTable[] = { }; const unsigned int ContextualModeTableCount = sizeof( ContextualModeTable ) / sizeof( ContextualModeTable[0] ); // Popup defaults. -const Vector3 DEFAULT_POPUP_PARENT_RELATIVE_SIZE( 0.75f, 1.0f, 1.0f ); ///< Default size percentage of parent. -const float DEFAULT_POPUP_ANIMATION_DURATION = 0.6f; ///< Duration of hide/show animations. -const float POPUP_OUT_MARGIN_WIDTH = 16.f; ///< Space between the screen edge and the popup edge in the horizontal dimension. -const float POPUP_OUT_MARGIN_HEIGHT = 36.f; ///< Space between the screen edge and the popup edge in the vertical dimension. -const Vector3 DEFAULT_TAIL_POSITION( 0.5f, 1.0f, 0.0f ); ///< Position the tail will be displayed when enabled without setting the position. +const Vector3 DEFAULT_POPUP_PARENT_RELATIVE_SIZE( 0.75f, 1.0f, 1.0f ); ///< Default size percentage of parent. +const float DEFAULT_POPUP_ANIMATION_DURATION = 0.6f; ///< Duration of hide/show animations. +const float POPUP_OUT_MARGIN_WIDTH = 16.f; ///< Space between the screen edge and the popup edge in the horizontal dimension. +const float POPUP_OUT_MARGIN_HEIGHT = 36.f; ///< Space between the screen edge and the popup edge in the vertical dimension. +const Vector3 DEFAULT_TAIL_POSITION( 0.5f, 1.0f, 0.0f ); ///< Position the tail will be displayed when enabled without setting the position. // Contextual defaults. -const Vector2 DEFAULT_CONTEXTUAL_ADJACENCY_MARGIN( 10.0f, 10.0f ); ///< How close the Popup will be to it's contextual parent. -const Vector2 DEFAULT_CONTEXTUAL_STAGE_BORDER( 15.0f, 15.0f ); ///< How close the Popup can be to the stage edges. +const Vector2 DEFAULT_CONTEXTUAL_ADJACENCY_MARGIN( 10.0f, 10.0f ); ///< How close the Popup will be to it's contextual parent. +const Vector2 DEFAULT_CONTEXTUAL_STAGE_BORDER( 15.0f, 15.0f ); ///< How close the Popup can be to the stage edges. // Popup style defaults. -const char* DEFAULT_BACKGROUND_IMAGE_PATH = DALI_IMAGE_DIR "00_popup_bg.9.png"; ///< Background image. -const char* DEFAULT_TAIL_UP_IMAGE_PATH = DALI_IMAGE_DIR "popup_tail_up.png"; ///< Tail up image. -const char* DEFAULT_TAIL_DOWN_IMAGE_PATH = DALI_IMAGE_DIR "popup_tail_down.png"; ///< Tail down image. -const char* DEFAULT_TAIL_LEFT_IMAGE_PATH = DALI_IMAGE_DIR "popup_tail_left.png"; ///< Tail left image. -const char* DEFAULT_TAIL_RIGHT_IMAGE_PATH = DALI_IMAGE_DIR "popup_tail_right.png"; ///< Tail right image. - -const Vector4 DEFAULT_BACKING_COLOR( 0.0f, 0.0f, 0.0f, 0.5f ); ///< Color of the dimmed backing. -const Rect DEFAULT_BACKGROUND_BORDER( 17, 17, 13, 13 ); ///< Default border of the background. -const Rect DEFAULT_TITLE_PADDING( 20.0f, 20.0f, 20.0f, 20.0f ); ///< Title padding used on popups with content and/or controls (from Tizen GUI UX). -const Rect DEFAULT_TITLE_ONLY_PADDING( 8.0f, 8.0f, 8.0f, 8.0f ); ///< Title padding used on popups with a title only (like toast popups). -const Vector3 FOOTER_SIZE( 620.0f, 96.0f,0.0f ); ///< Default size of the bottom control area. -const float DEFAULT_RELATIVE_PARENT_WIDTH = 0.75f; ///< If width is not fixed, relative size to parent is used by default. +const char* DEFAULT_BACKGROUND_IMAGE_FILE_NAME = "00_popup_bg.9.png"; ///< Background image. +const char* DEFAULT_TAIL_UP_IMAGE_FILE_NAME = "popup_tail_up.png"; ///< Tail up image. +const char* DEFAULT_TAIL_DOWN_IMAGE_FILE_NAME = "popup_tail_down.png"; ///< Tail down image. +const char* DEFAULT_TAIL_LEFT_IMAGE_FILE_NAME = "popup_tail_left.png"; ///< Tail left image. +const char* DEFAULT_TAIL_RIGHT_IMAGE_FILE_NAME = "popup_tail_right.png"; ///< Tail right image. + +const Vector4 DEFAULT_BACKING_COLOR( 0.0f, 0.0f, 0.0f, 0.5f ); ///< Color of the dimmed backing. +const Rect DEFAULT_BACKGROUND_BORDER( 17, 17, 13, 13 ); ///< Default border of the background. +const Rect DEFAULT_TITLE_PADDING( 20.0f, 20.0f, 20.0f, 20.0f ); ///< Title padding used on popups with content and/or controls (from Tizen GUI UX). +const Rect DEFAULT_TITLE_ONLY_PADDING( 8.0f, 8.0f, 8.0f, 8.0f ); ///< Title padding used on popups with a title only (like toast popups). +const Vector3 FOOTER_SIZE( 620.0f, 96.0f,0.0f ); ///< Default size of the bottom control area. +const float DEFAULT_RELATIVE_PARENT_WIDTH = 0.75f; ///< If width is not fixed, relative size to parent is used by default. } // Unnamed namespace @@ -257,38 +259,49 @@ Popup::Popup() mPopupBackgroundImage(), mBackgroundBorder( DEFAULT_BACKGROUND_BORDER ), mMargin(), - mTailUpImage( DEFAULT_TAIL_UP_IMAGE_PATH ), - mTailDownImage( DEFAULT_TAIL_DOWN_IMAGE_PATH ), - mTailLeftImage( DEFAULT_TAIL_LEFT_IMAGE_PATH ), - mTailRightImage( DEFAULT_TAIL_RIGHT_IMAGE_PATH ) + mTailUpImage(), + mTailDownImage(), + mTailLeftImage(), + mTailRightImage() { SetKeyboardNavigationSupport( true ); + + const std::string imageDirPath = AssetManager::GetDaliImagePath(); + mTailUpImage = imageDirPath + DEFAULT_TAIL_UP_IMAGE_FILE_NAME; + mTailDownImage = imageDirPath + DEFAULT_TAIL_DOWN_IMAGE_FILE_NAME; + mTailLeftImage = imageDirPath + DEFAULT_TAIL_LEFT_IMAGE_FILE_NAME; + mTailRightImage = imageDirPath + DEFAULT_TAIL_RIGHT_IMAGE_FILE_NAME; + + DevelControl::SetAccessibilityConstructor( Self(), []( Dali::Actor actor ) { + return std::unique_ptr< Dali::Accessibility::Accessible >( + new Control::Impl::AccessibleImpl( actor, Dali::Accessibility::Role::DIALOG, true ) ); + } ); } void Popup::OnInitialize() { Actor self = Self(); - self.SetName( "popup" ); + self.SetProperty( Dali::Actor::Property::NAME, "popup" ); // Apply some default resizing rules. - self.SetParentOrigin( ParentOrigin::CENTER ); - self.SetAnchorPoint( AnchorPoint::CENTER ); + self.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + self.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); - self.SetSizeModeFactor( DEFAULT_POPUP_PARENT_RELATIVE_SIZE ); + self.SetProperty( Actor::Property::SIZE_MODE_FACTOR, DEFAULT_POPUP_PARENT_RELATIVE_SIZE ); self.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::WIDTH ); self.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT ); // Create a new layer so all Popup components can appear above all other actors. mLayer = Layer::New(); - mLayer.SetName( "popupLayer" ); + mLayer.SetProperty( Dali::Actor::Property::NAME, "popupLayer" ); - mLayer.SetParentOrigin( ParentOrigin::CENTER ); - mLayer.SetAnchorPoint( AnchorPoint::CENTER ); + mLayer.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + mLayer.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); mLayer.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); // Important to set as invisible as otherwise, if the popup is parented, // but not shown yet it will appear statically on the screen. - mLayer.SetVisible( false ); + mLayer.SetProperty( Actor::Property::VISIBLE, false ); // Add the layer to the hierarchy. self.Add( mLayer ); @@ -298,9 +311,9 @@ void Popup::OnInitialize() mLayer.Add( mBacking ); mPopupContainer = Actor::New(); - mPopupContainer.SetName( "popupContainer" ); - mPopupContainer.SetParentOrigin( ParentOrigin::CENTER ); - mPopupContainer.SetAnchorPoint( AnchorPoint::CENTER ); + mPopupContainer.SetProperty( Dali::Actor::Property::NAME, "popupContainer" ); + mPopupContainer.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + mPopupContainer.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); mPopupContainer.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::ALL_DIMENSIONS ); mLayer.Add( mPopupContainer ); @@ -308,31 +321,34 @@ void Popup::OnInitialize() mPopupLayout = Toolkit::TableView::New( 3, 1 ); // Adds the default background image. - SetPopupBackgroundImage( Toolkit::ImageView::New( DEFAULT_BACKGROUND_IMAGE_PATH ) ); + const std::string imageDirPath = AssetManager::GetDaliImagePath(); + SetPopupBackgroundImage( Toolkit::ImageView::New( imageDirPath + DEFAULT_BACKGROUND_IMAGE_FILE_NAME ) ); - mPopupLayout.SetName( "popupLayoutTable" ); - mPopupLayout.SetParentOrigin( ParentOrigin::CENTER ); - mPopupLayout.SetAnchorPoint( AnchorPoint::CENTER ); + mPopupLayout.SetProperty( Dali::Actor::Property::NAME, "popupLayoutTable" ); + mPopupLayout.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + mPopupLayout.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); mPopupLayout.SetResizePolicy( ResizePolicy::USE_ASSIGNED_SIZE, Dimension::WIDTH ); mPopupLayout.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT ); - mPopupLayout.SetSize( Stage::GetCurrent().GetSize().x * DEFAULT_RELATIVE_PARENT_WIDTH, 0.0f ); + mPopupLayout.SetProperty( Actor::Property::SIZE, Vector2( Stage::GetCurrent().GetSize().x * DEFAULT_RELATIVE_PARENT_WIDTH, 0.0f ) ); mPopupLayout.SetFitHeight( 0 ); // Set row to fit. mPopupLayout.SetFitHeight( 1 ); // Set row to fit. - mPopupLayout.TouchSignal().Connect( this, &Popup::OnDialogTouched ); - mPopupContainer.Add( mPopupLayout ); // Any content after this point which is added to Self() will be re-parented to mContent. mAlterAddedChild = true; SetAsKeyboardFocusGroup( true ); + + SetupTouch(); } Popup::~Popup() { + if( DevelControl::GetBoundAccessibilityObject( Self() ) ) + Accessibility::Bridge::GetCurrentBridge()->RemovePopup( DevelControl::GetBoundAccessibilityObject( Self() ) ); mEntryAnimationData.Clear(); mExitAnimationData.Clear(); } @@ -345,14 +361,14 @@ void Popup::LayoutAnimation() case Toolkit::Popup::ZOOM: { // Zoom animations start fully zoomed out. - mPopupContainer.SetScale( Vector3::ZERO ); + mPopupContainer.SetProperty( Actor::Property::SCALE, Vector3::ZERO ); break; } case Toolkit::Popup::FADE: { // Fade animations start transparent. - mPopupContainer.SetOpacity( 0.0f ); + mPopupContainer.SetProperty( Actor::Property::OPACITY, 0.0f ); break; } @@ -426,7 +442,7 @@ void Popup::StartTransitionAnimation( bool transitionIn, bool instantaneous /* f } else { - mPopupContainer.SetScale( transitionIn ? Vector3::ONE : Vector3::ZERO ); + mPopupContainer.SetProperty( Actor::Property::SCALE, transitionIn ? Vector3::ONE : Vector3::ZERO ); } break; } @@ -447,7 +463,7 @@ void Popup::StartTransitionAnimation( bool transitionIn, bool instantaneous /* f } else { - mPopupContainer.SetOpacity( transitionIn ? 1.0f : 0.0f ); + mPopupContainer.SetProperty( Actor::Property::OPACITY, transitionIn ? 1.0f : 0.0f ); } break; } @@ -529,8 +545,8 @@ void Popup::DisplayStateChangeComplete() { mDisplayState = Toolkit::Popup::HIDDEN; - mLayer.SetVisible( false ); - mPopupLayout.SetSensitive( false ); + mLayer.SetProperty( Actor::Property::VISIBLE, false ); + mPopupLayout.SetProperty( Actor::Property::SENSITIVE, false ); // Guard against destruction during signal emission. Toolkit::Popup handle( GetOwner() ); @@ -580,12 +596,9 @@ void Popup::SetPopupBackgroundImage( Actor image ) // Adds new background to the dialog. mPopupBackgroundImage = image; - mPopupBackgroundImage.SetName( "popupBackgroundImage" ); - mPopupBackgroundImage.SetAnchorPoint( AnchorPoint::CENTER ); - mPopupBackgroundImage.SetParentOrigin( ParentOrigin::CENTER ); - - // OnDialogTouched only consumes the event. It prevents the touch event to be caught by the backing. - mPopupBackgroundImage.TouchSignal().Connect( this, &Popup::OnDialogTouched ); + mPopupBackgroundImage.SetProperty( Dali::Actor::Property::NAME, "popupBackgroundImage" ); + mPopupBackgroundImage.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); + mPopupBackgroundImage.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); // Set the popup border to be slightly larger than the layout contents. UpdateBackgroundPositionAndSize(); @@ -593,7 +606,7 @@ void Popup::SetPopupBackgroundImage( Actor image ) const bool prevAlter = mAlterAddedChild; mAlterAddedChild = false; mPopupContainer.Add( mPopupBackgroundImage ); - DevelActor::LowerToBottom(mPopupBackgroundImage); + mPopupBackgroundImage.LowerToBottom(); mAlterAddedChild = prevAlter; if( mTailImage ) @@ -627,7 +640,7 @@ void Popup::SetTitle( Actor titleActor ) { // Set up padding to give sensible default behaviour // (an application developer can later override this if they wish). - mTitle.SetPadding( DEFAULT_TITLE_PADDING ); + mTitle.SetProperty( Actor::Property::PADDING, DEFAULT_TITLE_PADDING ); mPopupLayout.AddChild( mTitle, Toolkit::TableView::CellPosition( 0, 0 ) ); } @@ -653,7 +666,7 @@ void Popup::SetContent( Actor content ) if( mContent ) { - mContent.SetName( "popupContent" ); + mContent.SetProperty( Dali::Actor::Property::NAME, "popupContent" ); mPopupLayout.AddChild( mContent, Toolkit::TableView::CellPosition( 1, 0 ) ); } @@ -720,7 +733,7 @@ void Popup::SetDisplayState( Toolkit::Popup::DisplayState displayState ) // We are displaying so bring the popup layer to the front, and set it visible so it is rendered. mLayer.RaiseToTop(); - mLayer.SetVisible( true ); + mLayer.SetProperty( Actor::Property::VISIBLE, true ); // Set up the layout if this is the first display or the layout has become dirty. if( mLayoutDirty ) @@ -730,7 +743,7 @@ void Popup::SetDisplayState( Toolkit::Popup::DisplayState displayState ) } // Allow the popup to catch events. - mPopupLayout.SetSensitive( true ); + mPopupLayout.SetProperty( Actor::Property::SENSITIVE, true ); // Handle the keyboard focus when popup is shown. Dali::Toolkit::KeyboardFocusManager keyboardFocusManager = Dali::Toolkit::KeyboardFocusManager::Get(); @@ -738,16 +751,16 @@ void Popup::SetDisplayState( Toolkit::Popup::DisplayState displayState ) { mPreviousFocusedActor = keyboardFocusManager.GetCurrentFocusActor(); - if( Self().IsKeyboardFocusable() ) + if( Self().GetProperty< bool >( Actor::Property::KEYBOARD_FOCUSABLE ) ) { // Setup the actgor to start focus from. Actor focusActor; - if( mContent && mContent.IsKeyboardFocusable() ) + if( mContent && mContent.GetProperty< bool >( Actor::Property::KEYBOARD_FOCUSABLE ) ) { // If the content is focusable, move the focus to the content. focusActor = mContent; } - else if( mFooter && mFooter.IsKeyboardFocusable() ) + else if( mFooter && mFooter.GetProperty< bool >( Actor::Property::KEYBOARD_FOCUSABLE ) ) { // If the footer is focusable, move the focus to the footer. focusActor = mFooter; @@ -770,7 +783,7 @@ void Popup::SetDisplayState( Toolkit::Popup::DisplayState displayState ) ClearKeyInputFocus(); // Restore the keyboard focus when popup is hidden. - if( mPreviousFocusedActor && mPreviousFocusedActor.IsKeyboardFocusable() ) + if( mPreviousFocusedActor && mPreviousFocusedActor.GetProperty< bool >( Actor::Property::KEYBOARD_FOCUSABLE ) ) { Dali::Toolkit::KeyboardFocusManager keyboardFocusManager = Dali::Toolkit::KeyboardFocusManager::Get(); if( keyboardFocusManager ) @@ -806,19 +819,19 @@ void Popup::LayoutPopup() * | |```` * | | */ - mPopupContainer.SetParentOrigin( Self().GetCurrentParentOrigin() ); - mPopupContainer.SetAnchorPoint( Self().GetCurrentAnchorPoint() ); + mPopupContainer.SetProperty( Actor::Property::PARENT_ORIGIN, Self().GetCurrentProperty< Vector3 >( Actor::Property::PARENT_ORIGIN ) ); + mPopupContainer.SetProperty( Actor::Property::ANCHOR_POINT, Self().GetCurrentProperty< Vector3 >( Actor::Property::ANCHOR_POINT ) ); // If there is only a title, use less padding. if( mTitle ) { if( !mContent && !mFooter ) { - mTitle.SetPadding( DEFAULT_TITLE_ONLY_PADDING ); + mTitle.SetProperty( Actor::Property::PADDING, DEFAULT_TITLE_ONLY_PADDING ); } else { - mTitle.SetPadding( DEFAULT_TITLE_PADDING ); + mTitle.SetProperty( Actor::Property::PADDING, DEFAULT_TITLE_PADDING ); } } @@ -826,7 +839,7 @@ void Popup::LayoutPopup() OnLayoutSetup(); // Update background visibility. - mPopupContainer.SetVisible( !( !mFooter && mPopupLayout.GetChildCount() == 0 ) ); + mPopupContainer.SetProperty( Actor::Property::VISIBLE, !( !mFooter && mPopupLayout.GetChildCount() == 0 ) ); // Create / destroy / position the tail as needed. LayoutTail(); @@ -886,10 +899,10 @@ void Popup::LayoutTail() { // Adds the tail actor. mTailImage = Toolkit::ImageView::New( image ); - mTailImage.SetName( "tailImage" ); - mTailImage.SetParentOrigin( parentOrigin ); - mTailImage.SetAnchorPoint( anchorPoint ); - mTailImage.SetPosition( position ); + mTailImage.SetProperty( Dali::Actor::Property::NAME, "tailImage" ); + mTailImage.SetProperty( Actor::Property::PARENT_ORIGIN, parentOrigin ); + mTailImage.SetProperty( Actor::Property::ANCHOR_POINT, anchorPoint ); + mTailImage.SetProperty( Actor::Property::POSITION, position ); if( mPopupBackgroundImage ) { @@ -915,22 +928,20 @@ Toolkit::Control Popup::CreateBacking() backing.SetProperty( Toolkit::Control::Property::BACKGROUND, Property::Map().Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::COLOR ) .Add( Toolkit::ColorVisual::Property::MIX_COLOR, Vector4( mBackingColor.r, mBackingColor.g, mBackingColor.b, 1.0f ) ) ); - backing.SetName( "popupBacking" ); + backing.SetProperty( Dali::Actor::Property::NAME, "popupBacking" ); // Must always be positioned top-left of stage, regardless of parent. - backing.SetInheritPosition(false); - backing.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + backing.SetProperty( Actor::Property::INHERIT_POSITION, false ); // Always the full size of the stage. backing.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS ); - backing.SetSize( Stage::GetCurrent().GetSize() ); + backing.SetProperty( Actor::Property::SIZE, Stage::GetCurrent().GetSize() ); // Catch events. - backing.SetSensitive( true ); + backing.SetProperty( Actor::Property::SENSITIVE, true ); // Default to being transparent. backing.SetProperty( Actor::Property::COLOR_ALPHA, 0.0f ); - backing.TouchSignal().Connect( this, &Popup::OnBackingTouched ); backing.WheelEventSignal().Connect( this, &Popup::OnBackingWheelEvent ); return backing; } @@ -1021,10 +1032,10 @@ void Popup::UpdateBackgroundPositionAndSize() if( mPopupBackgroundImage ) { mPopupBackgroundImage.SetResizePolicy( ResizePolicy::SIZE_FIXED_OFFSET_FROM_PARENT, Dimension::ALL_DIMENSIONS ); - mPopupBackgroundImage.SetSizeModeFactor( Vector3( mBackgroundBorder.left + mBackgroundBorder.right, mBackgroundBorder.top + mBackgroundBorder.bottom, 0.0f ) ); + mPopupBackgroundImage.SetProperty( Actor::Property::SIZE_MODE_FACTOR, Vector3( mBackgroundBorder.left + mBackgroundBorder.right, mBackgroundBorder.top + mBackgroundBorder.bottom, 0.0f ) ); // Adjust the position of the background so the transparent areas are set appropriately - mPopupBackgroundImage.SetPosition( ( mBackgroundBorder.right - mBackgroundBorder.left ) * 0.5f, ( mBackgroundBorder.bottom - mBackgroundBorder.top ) * 0.5f ); + mPopupBackgroundImage.SetProperty( Actor::Property::POSITION, Vector2( ( mBackgroundBorder.right - mBackgroundBorder.left ) * 0.5f, ( mBackgroundBorder.bottom - mBackgroundBorder.top ) * 0.5f )); } } @@ -1111,7 +1122,11 @@ const std::string& Popup::GetTailRightImage() const void Popup::SetTouchTransparent( bool enabled ) { - mTouchTransparent = enabled; + if( mTouchTransparent != enabled ) + { + mTouchTransparent = enabled; + SetupTouch(); + } } const bool Popup::IsTouchTransparent() const @@ -1524,28 +1539,20 @@ bool Popup::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tra return connected; } -bool Popup::OnBackingTouched( Actor actor, const TouchData& touch ) +bool Popup::OnBackingTouched( Actor actor, const TouchEvent& touch ) { - // Allow events to pass through if touch transparency is enabled. - if( mTouchTransparent ) - { - return false; - } - - if( touch.GetPointCount() > 0 ) + // Allow events to pass through if the backing isn't the hit-actor + if( (touch.GetHitActor(0) == actor) && + (touch.GetPointCount() > 0) && + (touch.GetState( 0 ) == PointState::DOWN)) { - if( touch.GetState( 0 ) == PointState::DOWN ) - { - // Guard against destruction during signal emission. - Toolkit::Popup handle( GetOwner() ); + // Guard against destruction during signal emission. + Toolkit::Popup handle( GetOwner() ); - mTouchedOutsideSignal.Emit(); - } + mTouchedOutsideSignal.Emit(); } - // Block anything behind backing becoming touched. - mLayer.SetTouchConsumed( true ); - return true; + return false; } bool Popup::OnBackingWheelEvent( Actor actor, const WheelEvent& event ) @@ -1556,30 +1563,30 @@ bool Popup::OnBackingWheelEvent( Actor actor, const WheelEvent& event ) return false; } - // Consume wheel event in dimmed backing actor. - mLayer.SetTouchConsumed( true ); return true; } -bool Popup::OnDialogTouched( Actor actor, const TouchData& touch ) +bool Popup::OnDialogTouched( Actor actor, const TouchEvent& touch ) { - // Allow events to pass through if touch transparency is enabled. - if( mTouchTransparent ) - { - return false; - } + // Only connecting this so the backing does not become the default hit-actor and inadvertently closes the popup + return false; +} - // Consume event (stops backing actor receiving touch events) - mLayer.SetTouchConsumed( true ); - return true; +void Popup::OnSceneDisconnection() +{ + auto p = Dali::Accessibility::Accessible::Get(Self()); + Accessibility::Bridge::GetCurrentBridge()->RemovePopup( p ); + Control::OnSceneDisconnection(); } -void Popup::OnStageConnection( int depth ) +void Popup::OnSceneConnection( int depth ) { mLayoutDirty = true; RelayoutRequest(); - Control::OnStageConnection( depth ); + Control::OnSceneConnection( depth ); + auto p = Dali::Accessibility::Accessible::Get(Self()); + Accessibility::Bridge::GetCurrentBridge()->AddPopup( p ); } void Popup::OnChildAdd( Actor& child ) @@ -1608,14 +1615,14 @@ void Popup::LayoutContext( const Vector2& size ) return; } - mPopupContainer.SetParentOrigin( ParentOrigin::CENTER ); + mPopupContainer.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); // We always anchor to the CENTER, rather than a different anchor point for each contextual // mode to allow code-reuse of the bound checking code (for maintainability). - mPopupContainer.SetAnchorPoint( AnchorPoint::CENTER ); + mPopupContainer.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); // Setup with some pre-calculations for speed. Vector3 halfStageSize( Stage().GetCurrent().GetSize() / 2.0f ); - Vector3 parentPosition( parent.GetCurrentPosition() ); + Vector3 parentPosition( parent.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ) ); Vector2 halfSize( size / 2.0f ); Vector2 halfParentSize( parent.GetRelayoutSize( Dimension::WIDTH ) / 2.0f, parent.GetRelayoutSize( Dimension::HEIGHT ) / 2.0f ); Vector3 newPosition( Vector3::ZERO ); @@ -1679,7 +1686,7 @@ void Popup::LayoutContext( const Vector2& size ) } // Set the final position. - mPopupContainer.SetPosition( newPosition ); + mPopupContainer.SetProperty( Actor::Property::POSITION, newPosition ); } void Popup::OnRelayout( const Vector2& size, RelayoutContainer& container ) @@ -1804,9 +1811,9 @@ bool Popup::OnKeyEvent( const KeyEvent& event ) bool consumed = false; - if( event.state == KeyEvent::Down ) + if( event.GetState() == KeyEvent::DOWN ) { - if (event.keyCode == Dali::DALI_KEY_ESCAPE || event.keyCode == Dali::DALI_KEY_BACK) + if (event.GetKeyCode() == Dali::DALI_KEY_ESCAPE || event.GetKeyCode() == Dali::DALI_KEY_BACK) { SetDisplayState( Toolkit::Popup::HIDDEN ); consumed = true; @@ -1823,7 +1830,7 @@ void Popup::AddFocusableChildrenRecursive( Actor parent, std::vector< Actor >& f Toolkit::Control control = Toolkit::Control::DownCast( parent ); bool layoutControl = control && GetImplementation( control ).IsKeyboardNavigationSupported(); - if( parent.IsKeyboardFocusable() || layoutControl ) + if( parent.GetProperty< bool >( Actor::Property::KEYBOARD_FOCUSABLE ) || layoutControl ) { focusableActors.push_back( parent ); @@ -1864,7 +1871,7 @@ Actor Popup::GetNextKeyboardFocusableActor( Actor currentFocusedActor, Toolkit:: std::string currentStr; if( currentFocusedActor ) { - currentStr = currentFocusedActor.GetName(); + currentStr = currentFocusedActor.GetProperty< std::string >( Dali::Actor::Property::NAME ); } Actor nextFocusableActor( currentFocusedActor ); @@ -1881,12 +1888,12 @@ Actor Popup::GetNextKeyboardFocusableActor( Actor currentFocusedActor, Toolkit:: ( currentFocusedActor && ( ( !mContent || ( currentFocusGroup != mContent ) ) && ( !mFooter || ( currentFocusGroup != mFooter ) ) ) ) ) { // The current focused actor is not within popup. - if( mContent && mContent.IsKeyboardFocusable() ) + if( mContent && mContent.GetProperty< bool >( Actor::Property::KEYBOARD_FOCUSABLE ) ) { // If the content is focusable, move the focus to the content. nextFocusableActor = mContent; } - else if( mFooter && mFooter.IsKeyboardFocusable() ) + else if( mFooter && mFooter.GetProperty< bool >( Actor::Property::KEYBOARD_FOCUSABLE ) ) { // If the footer is focusable, move the focus to the footer. nextFocusableActor = mFooter; @@ -1967,6 +1974,25 @@ Actor Popup::GetNextKeyboardFocusableActor( Actor currentFocusedActor, Toolkit:: return nextFocusableActor; } +void Popup::SetupTouch() +{ + if( ! mTouchTransparent ) + { + // Connect all the signals and set us up to consume all touch events + mBacking.TouchedSignal().Connect( this, &Popup::OnBackingTouched ); + mPopupBackgroundImage.TouchedSignal().Connect( this, &Popup::OnDialogTouched ); + mPopupLayout.TouchedSignal().Connect( this, &Popup::OnDialogTouched ); + mLayer.SetProperty( Layer::Property::CONSUMES_TOUCH, true ); + } + else + { + // We are touch transparent so disconnect all signals and ensure our layer does not consumed all touch events + mBacking.TouchedSignal().Disconnect( this, &Popup::OnBackingTouched ); + mPopupBackgroundImage.TouchedSignal().Disconnect( this, &Popup::OnDialogTouched ); + mPopupLayout.TouchedSignal().Disconnect( this, &Popup::OnDialogTouched ); + mLayer.SetProperty( Layer::Property::CONSUMES_TOUCH, false ); + } +} } // namespace Internal