/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 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-toolkit/internal/controls/popup/popup-impl.h>
// EXTERNAL INCLUDES
-#include <cstring> // for strcmp
-#include <dali/devel-api/adaptor-framework/physical-keyboard.h>
#include <dali/devel-api/actors/actor-devel.h>
-#include <dali/public-api/object/type-registry-helper.h>
+#include <dali/devel-api/adaptor-framework/physical-keyboard.h>
+#include <dali/devel-api/common/stage.h>
+#include <dali/devel-api/scripting/scripting.h>
#include <dali/integration-api/debug.h>
#include <dali/public-api/adaptor-framework/key.h>
#include <dali/public-api/animation/constraints.h>
-#include <dali/devel-api/common/stage.h>
#include <dali/public-api/events/key-event.h>
-#include <dali/public-api/events/touch-data.h>
+#include <dali/public-api/events/touch-event.h>
+#include <dali/public-api/object/type-registry-helper.h>
#include <dali/public-api/object/type-registry.h>
-#include <dali/devel-api/scripting/scripting.h>
-#include <dali/devel-api/actors/actor-devel.h>
#include <dali/public-api/size-negotiation/relayout-container.h>
+#include <cstring> // for strcmp
// INTERNAL INCLUDES
+#include <dali-toolkit/dali-toolkit.h>
#include <dali-toolkit/devel-api/asset-manager/asset-manager.h>
+#include <dali-toolkit/devel-api/controls/control-devel.h>
+#include <dali-toolkit/internal/controls/control/control-data-impl.h>
#include <dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h>
#include <dali-toolkit/public-api/controls/control-impl.h>
#include <dali-toolkit/public-api/controls/image-view/image-view.h>
-#include <dali-toolkit/devel-api/accessibility-manager/accessibility-manager.h>
#include <dali-toolkit/public-api/visuals/color-visual-properties.h>
#include <dali-toolkit/public-api/visuals/visual-properties.h>
-#include <dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h>
using namespace Dali;
namespace Dali
{
-
namespace Toolkit
{
-
namespace Internal
{
-
namespace
{
-
/**
* Creation function for main Popup type.
* @return Handle to the new popup object.
}
// Toast style defaults.
-const int DEFAULT_TOAST_AUTO_HIDE_DELAY = 3000; ///< Toast will auto-hide after 3000ms (3 seconds)
-const float DEFAULT_TOAST_TRANSITION_TIME = 0.65f; ///< Default time the toast Popup will take to show and hide.
-const Vector3 DEFAULT_TOAST_BOTTOM_PARENT_ORIGIN( 0.5f, 0.94f, 0.5f ); ///< This is similar to BOTTOM_CENTER, but vertically higher up, as a ratio of parent height.
-const Vector3 DEFAULT_TOAST_WIDTH_OF_STAGE_RATIO( 0.75f, 0.75f, 0.75f ); ///< Amount of the stage's width that the toast popup will take up.
+const int DEFAULT_TOAST_AUTO_HIDE_DELAY = 3000; ///< Toast will auto-hide after 3000ms (3 seconds)
+const float DEFAULT_TOAST_TRANSITION_TIME = 0.65f; ///< Default time the toast Popup will take to show and hide.
+const Vector3 DEFAULT_TOAST_BOTTOM_PARENT_ORIGIN(0.5f, 0.94f, 0.5f); ///< This is similar to BOTTOM_CENTER, but vertically higher up, as a ratio of parent height.
+const Vector3 DEFAULT_TOAST_WIDTH_OF_STAGE_RATIO(0.75f, 0.75f, 0.75f); ///< Amount of the stage's width that the toast popup will take up.
/**
* Creation function for named type "popupToast".
Toolkit::Popup popup = Toolkit::Popup::New();
// Setup for Toast Popup type.
- 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 );
- popup.SetProperty( Toolkit::Popup::Property::ANIMATION_DURATION, DEFAULT_TOAST_TRANSITION_TIME );
- popup.SetProperty( Toolkit::Popup::Property::TAIL_VISIBILITY, false );
+ 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);
+ popup.SetProperty(Toolkit::Popup::Property::ANIMATION_DURATION, DEFAULT_TOAST_TRANSITION_TIME);
+ popup.SetProperty(Toolkit::Popup::Property::TAIL_VISIBILITY, false);
// Disable the dimmed backing.
- popup.SetProperty( Toolkit::Popup::Property::BACKING_ENABLED, false );
+ popup.SetProperty(Toolkit::Popup::Property::BACKING_ENABLED, false);
// The toast popup should fade in (not zoom).
- popup.SetProperty( Toolkit::Popup::Property::ANIMATION_MODE, Toolkit::Popup::FADE );
+ popup.SetProperty(Toolkit::Popup::Property::ANIMATION_MODE, Toolkit::Popup::FADE);
// The toast popup should auto-hide.
- popup.SetProperty( Toolkit::Popup::Property::AUTO_HIDE_DELAY, DEFAULT_TOAST_AUTO_HIDE_DELAY );
+ popup.SetProperty(Toolkit::Popup::Property::AUTO_HIDE_DELAY, DEFAULT_TOAST_AUTO_HIDE_DELAY);
// Align to the bottom of the screen.
- popup.SetProperty( Actor::Property::PARENT_ORIGIN, DEFAULT_TOAST_BOTTOM_PARENT_ORIGIN );
- popup.SetProperty( Actor::Property::ANCHOR_POINT, 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 );
+ popup.SetProperty(Toolkit::Popup::Property::TOUCH_TRANSPARENT, true);
return popup;
}
+// clang-format off
// Setup properties, signals and actions using the type-registry.
-DALI_TYPE_REGISTRATION_BEGIN( Toolkit::Popup, Toolkit::Control, Create )
+DALI_TYPE_REGISTRATION_BEGIN(Toolkit::Popup, Toolkit::Control, Create )
// Main content related properties.
-DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "title", MAP, TITLE )
-DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "content", MAP, CONTENT )
-DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "footer", MAP, FOOTER )
-DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "displayState", STRING, DISPLAY_STATE )
-DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "touchTransparent", BOOLEAN, TOUCH_TRANSPARENT )
+DALI_PROPERTY_REGISTRATION(Toolkit, Popup, "title", MAP, TITLE )
+DALI_PROPERTY_REGISTRATION(Toolkit, Popup, "content", MAP, CONTENT )
+DALI_PROPERTY_REGISTRATION(Toolkit, Popup, "footer", MAP, FOOTER )
+DALI_PROPERTY_REGISTRATION(Toolkit, Popup, "displayState", STRING, DISPLAY_STATE )
+DALI_PROPERTY_REGISTRATION(Toolkit, Popup, "touchTransparent", BOOLEAN, TOUCH_TRANSPARENT )
// Contextual related properties.
-DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "tailVisibility", BOOLEAN, TAIL_VISIBILITY )
-DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "tailPosition", VECTOR3, TAIL_POSITION )
-DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "contextualMode", STRING, CONTEXTUAL_MODE )
+DALI_PROPERTY_REGISTRATION(Toolkit, Popup, "tailVisibility", BOOLEAN, TAIL_VISIBILITY )
+DALI_PROPERTY_REGISTRATION(Toolkit, Popup, "tailPosition", VECTOR3, TAIL_POSITION )
+DALI_PROPERTY_REGISTRATION(Toolkit, Popup, "contextualMode", STRING, CONTEXTUAL_MODE )
// Animation related properties.
-DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "animationDuration", FLOAT, ANIMATION_DURATION )
-DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "animationMode", STRING, ANIMATION_MODE )
-DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "entryAnimation", MAP, ENTRY_ANIMATION )
-DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "exitAnimation", MAP, EXIT_ANIMATION )
-DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "autoHideDelay", INTEGER, AUTO_HIDE_DELAY )
+DALI_PROPERTY_REGISTRATION(Toolkit, Popup, "animationDuration", FLOAT, ANIMATION_DURATION )
+DALI_PROPERTY_REGISTRATION(Toolkit, Popup, "animationMode", STRING, ANIMATION_MODE )
+DALI_PROPERTY_REGISTRATION(Toolkit, Popup, "entryAnimation", MAP, ENTRY_ANIMATION )
+DALI_PROPERTY_REGISTRATION(Toolkit, Popup, "exitAnimation", MAP, EXIT_ANIMATION )
+DALI_PROPERTY_REGISTRATION(Toolkit, Popup, "autoHideDelay", INTEGER, AUTO_HIDE_DELAY )
// Style related properties.
-DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "backingEnabled", BOOLEAN, BACKING_ENABLED )
-DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "backingColor", VECTOR4, BACKING_COLOR )
-DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "popupBackgroundImage", STRING, POPUP_BACKGROUND_IMAGE )
-DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "popupBackgroundBorder", RECTANGLE, POPUP_BACKGROUND_BORDER )
-DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "tailUpImage", STRING, TAIL_UP_IMAGE )
-DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "tailDownImage", STRING, TAIL_DOWN_IMAGE )
-DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "tailLeftImage", STRING, TAIL_LEFT_IMAGE )
-DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "tailRightImage", STRING, TAIL_RIGHT_IMAGE )
+DALI_PROPERTY_REGISTRATION(Toolkit, Popup, "backingEnabled", BOOLEAN, BACKING_ENABLED )
+DALI_PROPERTY_REGISTRATION(Toolkit, Popup, "backingColor", VECTOR4, BACKING_COLOR )
+DALI_PROPERTY_REGISTRATION(Toolkit, Popup, "popupBackgroundImage", STRING, POPUP_BACKGROUND_IMAGE )
+DALI_PROPERTY_REGISTRATION(Toolkit, Popup, "popupBackgroundBorder", RECTANGLE, POPUP_BACKGROUND_BORDER)
+DALI_PROPERTY_REGISTRATION(Toolkit, Popup, "tailUpImage", STRING, TAIL_UP_IMAGE )
+DALI_PROPERTY_REGISTRATION(Toolkit, Popup, "tailDownImage", STRING, TAIL_DOWN_IMAGE )
+DALI_PROPERTY_REGISTRATION(Toolkit, Popup, "tailLeftImage", STRING, TAIL_LEFT_IMAGE )
+DALI_PROPERTY_REGISTRATION(Toolkit, Popup, "tailRightImage", STRING, TAIL_RIGHT_IMAGE )
// Signals.
-DALI_SIGNAL_REGISTRATION( Toolkit, Popup, "touchedOutside", SIGNAL_TOUCHED_OUTSIDE )
-DALI_SIGNAL_REGISTRATION( Toolkit, Popup, "showing", SIGNAL_SHOWING )
-DALI_SIGNAL_REGISTRATION( Toolkit, Popup, "shown", SIGNAL_SHOWN )
-DALI_SIGNAL_REGISTRATION( Toolkit, Popup, "hiding", SIGNAL_HIDING )
-DALI_SIGNAL_REGISTRATION( Toolkit, Popup, "hidden", SIGNAL_HIDDEN )
+DALI_SIGNAL_REGISTRATION(Toolkit, Popup, "touchedOutside", SIGNAL_TOUCHED_OUTSIDE)
+DALI_SIGNAL_REGISTRATION(Toolkit, Popup, "showing", SIGNAL_SHOWING )
+DALI_SIGNAL_REGISTRATION(Toolkit, Popup, "shown", SIGNAL_SHOWN )
+DALI_SIGNAL_REGISTRATION(Toolkit, Popup, "hiding", SIGNAL_HIDING )
+DALI_SIGNAL_REGISTRATION(Toolkit, Popup, "hidden", SIGNAL_HIDDEN )
DALI_TYPE_REGISTRATION_END()
// Named type registration.
// Toast Popup: Non-modal popup that displays information at the bottom of the screen.
-TypeRegistration typeRegistrationToast( "PopupToast", typeid( Toolkit::Popup ), CreateToast );
+TypeRegistration typeRegistrationToast("PopupToast", typeid( Toolkit::Popup ), CreateToast);
// Enumeration to / from string conversion tables
-const Scripting::StringEnum DisplayStateTable[] = {
- { "SHOWING", Toolkit::Popup::SHOWING },
- { "SHOWN", Toolkit::Popup::SHOWN },
- { "HIDING", Toolkit::Popup::HIDING },
- { "HIDDEN", Toolkit::Popup::HIDDEN },
-}; const unsigned int DisplayStateTableCount = sizeof( DisplayStateTable ) / sizeof( DisplayStateTable[0] );
-
-const Scripting::StringEnum AnimationModeTable[] = {
- { "NONE", Toolkit::Popup::NONE },
- { "ZOOM", Toolkit::Popup::ZOOM },
- { "FADE", Toolkit::Popup::FADE },
- { "CUSTOM", Toolkit::Popup::CUSTOM },
-}; const unsigned int AnimationModeTableCount = sizeof( AnimationModeTable ) / sizeof( AnimationModeTable[0] );
-
-const Scripting::StringEnum ContextualModeTable[] = {
- { "NON_CONTEXTUAL", Toolkit::Popup::NON_CONTEXTUAL },
- { "ABOVE", Toolkit::Popup::ABOVE },
- { "RIGHT", Toolkit::Popup::RIGHT },
- { "BELOW", Toolkit::Popup::BELOW },
- { "LEFT", Toolkit::Popup::LEFT },
-}; const unsigned int ContextualModeTableCount = sizeof( ContextualModeTable ) / sizeof( ContextualModeTable[0] );
+const Scripting::StringEnum DisplayStateTable[] =
+{
+ {"SHOWING", Toolkit::Popup::SHOWING},
+ {"SHOWN", Toolkit::Popup::SHOWN },
+ {"HIDING", Toolkit::Popup::HIDING },
+ {"HIDDEN", Toolkit::Popup::HIDDEN },
+};
+const unsigned int DisplayStateTableCount = sizeof(DisplayStateTable) / sizeof(DisplayStateTable[0]);
+
+const Scripting::StringEnum AnimationModeTable[] =
+{
+ {"NONE", Toolkit::Popup::NONE },
+ {"ZOOM", Toolkit::Popup::ZOOM },
+ {"FADE", Toolkit::Popup::FADE },
+ {"CUSTOM", Toolkit::Popup::CUSTOM},
+};
+const unsigned int AnimationModeTableCount = sizeof(AnimationModeTable) / sizeof(AnimationModeTable[0]);
+
+const Scripting::StringEnum ContextualModeTable[] =
+{
+ {"NON_CONTEXTUAL", Toolkit::Popup::NON_CONTEXTUAL},
+ {"ABOVE", Toolkit::Popup::ABOVE },
+ {"RIGHT", Toolkit::Popup::RIGHT },
+ {"BELOW", Toolkit::Popup::BELOW },
+ {"LEFT", Toolkit::Popup::LEFT },
+};
+const unsigned int ContextualModeTableCount = sizeof(ContextualModeTable) / sizeof(ContextualModeTable[0]);
+// clang-format on
// 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_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<int> DEFAULT_BACKGROUND_BORDER( 17, 17, 13, 13 ); ///< Default border of the background.
-const Rect<float> 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<float> 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<int> DEFAULT_BACKGROUND_BORDER(17, 17, 13, 13); ///< Default border of the background.
+const Rect<float> 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<float> 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
Dali::Toolkit::Popup Popup::New()
{
// Create the implementation
- PopupPtr popup( new Popup() );
+ PopupPtr popup(new Popup());
// Pass ownership to CustomActor via derived handle.
- Dali::Toolkit::Popup handle( *popup );
+ Dali::Toolkit::Popup handle(*popup);
// Second-phase initialisation of the implementation.
// This can only be done after the CustomActor connection has been made.
}
Popup::Popup()
-: Control( ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ),
+: Control(ControlBehaviour(CONTROL_BEHAVIOUR_DEFAULT)),
mTouchedOutsideSignal(),
mShowingSignal(),
mShownSignal(),
mTailImage(),
mPopupContainer(),
mAnimation(),
- mAlterAddedChild( false ),
- mLayoutDirty( true ),
+ mAlterAddedChild(false),
+ mLayoutDirty(true),
mAutoHideTimer(),
- mTouchTransparent( false ),
+ mTouchTransparent(false),
mTitle(),
mContent(),
mFooter(),
- mDisplayState( Toolkit::Popup::HIDDEN ), // Hidden until shown with SetDisplayState()
- mTailVisible( false ),
- mTailPosition( DEFAULT_TAIL_POSITION ),
- mContextualMode( Toolkit::Popup::NON_CONTEXTUAL ),
- mAnimationDuration( DEFAULT_POPUP_ANIMATION_DURATION ),
- mAnimationMode( Toolkit::Popup::FADE ),
+ mDisplayState(Toolkit::Popup::HIDDEN), // Hidden until shown with SetDisplayState()
+ mTailVisible(false),
+ mTailPosition(DEFAULT_TAIL_POSITION),
+ mContextualMode(Toolkit::Popup::NON_CONTEXTUAL),
+ mAnimationDuration(DEFAULT_POPUP_ANIMATION_DURATION),
+ mAnimationMode(Toolkit::Popup::FADE),
mEntryAnimationData(),
mExitAnimationData(),
- mAutoHideDelay( 0 ),
- mBackingEnabled( true ),
- mBackingColor( DEFAULT_BACKING_COLOR ),
+ mAutoHideDelay(0),
+ mBackingEnabled(true),
+ mBackingColor(DEFAULT_BACKING_COLOR),
mPopupBackgroundImage(),
- mBackgroundBorder( DEFAULT_BACKGROUND_BORDER ),
+ mBackgroundBorder(DEFAULT_BACKGROUND_BORDER),
mMargin(),
mTailUpImage(),
mTailDownImage(),
mTailLeftImage(),
mTailRightImage()
{
- SetKeyboardNavigationSupport( true );
+ 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;
+ 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;
}
void Popup::OnInitialize()
{
Actor self = Self();
- self.SetProperty( Dali::Actor::Property::NAME, "popup" );
+ self.SetProperty(Dali::Actor::Property::NAME, "popup");
// Apply some default resizing rules.
- self.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
- self.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
+ self.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+ self.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
- 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 );
+ 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.SetProperty( Dali::Actor::Property::NAME, "popupLayer" );
+ mLayer.SetProperty(Dali::Actor::Property::NAME, "popupLayer");
- 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 );
+ 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.SetProperty( Actor::Property::VISIBLE, false );
+ mLayer.SetProperty(Actor::Property::VISIBLE, false);
// Add the layer to the hierarchy.
- self.Add( mLayer );
+ self.Add(mLayer);
// Add Backing (Dimmed effect).
mBacking = CreateBacking();
- mLayer.Add( mBacking );
+ mLayer.Add(mBacking);
mPopupContainer = Actor::New();
- 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 );
+ 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);
// Create the Popup layout to contain all main content.
- mPopupLayout = Toolkit::TableView::New( 3, 1 );
+ mPopupLayout = Toolkit::TableView::New(3, 1);
// Adds the default background image.
const std::string imageDirPath = AssetManager::GetDaliImagePath();
- SetPopupBackgroundImage( Toolkit::ImageView::New( imageDirPath + DEFAULT_BACKGROUND_IMAGE_FILE_NAME ) );
+ SetPopupBackgroundImage(Toolkit::ImageView::New(imageDirPath + DEFAULT_BACKGROUND_IMAGE_FILE_NAME));
- mPopupLayout.SetProperty( Dali::Actor::Property::NAME, "popupLayoutTable" );
- mPopupLayout.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
- mPopupLayout.SetProperty( Actor::Property::ANCHOR_POINT, 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.SetProperty( Actor::Property::SIZE, Vector2( Stage::GetCurrent().GetSize().x * DEFAULT_RELATIVE_PARENT_WIDTH, 0.0f ) );
+ mPopupLayout.SetResizePolicy(ResizePolicy::USE_ASSIGNED_SIZE, Dimension::WIDTH);
+ mPopupLayout.SetResizePolicy(ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT);
+ 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.SetFitHeight(0); // Set row to fit.
+ mPopupLayout.SetFitHeight(1); // Set row to fit.
- mPopupContainer.Add( mPopupLayout );
+ mPopupContainer.Add(mPopupLayout);
// Any content after this point which is added to Self() will be re-parented to mContent.
mAlterAddedChild = true;
- SetAsKeyboardFocusGroup( true );
+ SetAsKeyboardFocusGroup(true);
SetupTouch();
+
+ DevelControl::AppendAccessibilityAttribute(self, "sub-role", "Alert");
+
+ DevelControl::SetAccessibilityConstructor(self, [](Dali::Actor actor) {
+ return std::unique_ptr<Dali::Accessibility::Accessible>(new AccessibleImpl(actor, Dali::Accessibility::Role::DIALOG, true));
+ });
}
Popup::~Popup()
void Popup::LayoutAnimation()
{
// Perform setup based on the currently selected animation.
- switch( mAnimationMode )
+ switch(mAnimationMode)
{
case Toolkit::Popup::ZOOM:
{
// Zoom animations start fully zoomed out.
- mPopupContainer.SetProperty( Actor::Property::SCALE, Vector3::ZERO );
+ mPopupContainer.SetProperty(Actor::Property::SCALE, Vector3::ZERO);
break;
}
case Toolkit::Popup::FADE:
{
// Fade animations start transparent.
- mPopupContainer.SetProperty( Actor::Property::OPACITY, 0.0f );
+ mPopupContainer.SetProperty(Actor::Property::OPACITY, 0.0f);
break;
}
{
// Initialise the custom animation by playing to the end of it's exit animation instantly.
// EG. If it was zooming in, then we zoom out fully instantly so the zoom in works.
- StartTransitionAnimation( false, true );
+ StartTransitionAnimation(false, true);
break;
}
}
}
-void Popup::StartTransitionAnimation( bool transitionIn, bool instantaneous /* false */ )
+void Popup::StartTransitionAnimation(bool transitionIn, bool instantaneous /* false */)
{
// Stop and recreate animation.
- if ( mAnimation )
+ if(mAnimation)
{
mAnimation.Stop();
mAnimation.Clear();
// Setup variables ready to start the animations.
// If we are performing the animation instantaneously, we do not want to emit a signal.
- if( !instantaneous )
+ if(!instantaneous)
{
- if( transitionIn )
+ if(transitionIn)
{
// Setup variables and signal that we are starting the transition.
// Note: We signal even if the transition is instant so signal order is consistent.
}
// Perform chosen animation for the Popup.
- switch( mAnimationMode )
+ switch(mAnimationMode)
{
case Toolkit::Popup::NONE:
{
- mAnimation = Animation::New( 0.0f );
+ mAnimation = Animation::New(0.0f);
break;
}
case Toolkit::Popup::ZOOM:
{
- mAnimation = Animation::New( duration );
- if( duration > Math::MACHINE_EPSILON_0 )
+ mAnimation = Animation::New(duration);
+ if(duration > Math::MACHINE_EPSILON_0)
{
- if( transitionIn )
+ if(transitionIn)
{
- mAnimation.AnimateTo( Property( mPopupContainer, Actor::Property::SCALE ), Vector3::ONE, AlphaFunction::EASE_IN_OUT, TimePeriod( duration * 0.25f, duration * 0.75f ) );
+ mAnimation.AnimateTo(Property(mPopupContainer, Actor::Property::SCALE), Vector3::ONE, AlphaFunction::EASE_IN_OUT, TimePeriod(duration * 0.25f, duration * 0.75f));
}
else
{
// Zoom out animation is twice the speed. Modify the duration variable so the backing animation speed is modified also.
duration /= 2.0f;
- mAnimation.SetDuration( duration );
- mAnimation.AnimateTo( Property( mPopupContainer, Actor::Property::SCALE ), Vector3::ZERO, AlphaFunction::EASE_IN_OUT, TimePeriod( 0.0f, duration ) );
+ mAnimation.SetDuration(duration);
+ mAnimation.AnimateTo(Property(mPopupContainer, Actor::Property::SCALE), Vector3::ZERO, AlphaFunction::EASE_IN_OUT, TimePeriod(0.0f, duration));
}
}
else
{
- mPopupContainer.SetProperty( Actor::Property::SCALE, transitionIn ? Vector3::ONE : Vector3::ZERO );
+ mPopupContainer.SetProperty(Actor::Property::SCALE, transitionIn ? Vector3::ONE : Vector3::ZERO);
}
break;
}
case Toolkit::Popup::FADE:
{
- mAnimation = Animation::New( duration );
- if( duration > Math::MACHINE_EPSILON_0 )
+ mAnimation = Animation::New(duration);
+ if(duration > Math::MACHINE_EPSILON_0)
{
- if( transitionIn )
+ if(transitionIn)
{
- mAnimation.AnimateTo( Property( mPopupContainer, Actor::Property::COLOR_ALPHA ), 1.0f, AlphaFunction::EASE_IN_OUT, TimePeriod( 0.30f, duration * 0.70f ) );
+ mAnimation.AnimateTo(Property(mPopupContainer, Actor::Property::COLOR_ALPHA), 1.0f, AlphaFunction::EASE_IN_OUT, TimePeriod(0.30f, duration * 0.70f));
}
else
{
- mAnimation.AnimateTo( Property( mPopupContainer, Actor::Property::COLOR_ALPHA ), 0.0f, AlphaFunction::EASE_IN_OUT, TimePeriod( 0.0f, duration * 0.70f ) );
+ mAnimation.AnimateTo(Property(mPopupContainer, Actor::Property::COLOR_ALPHA), 0.0f, AlphaFunction::EASE_IN_OUT, TimePeriod(0.0f, duration * 0.70f));
}
}
else
{
- mPopupContainer.SetProperty( Actor::Property::OPACITY, transitionIn ? 1.0f : 0.0f );
+ mPopupContainer.SetProperty(Actor::Property::OPACITY, transitionIn ? 1.0f : 0.0f);
}
break;
}
// Create a new animation from the pre-defined data in the AnimationData class.
// If there is no data, mAnimation is invalidated.
- mAnimation = animationData->CreateAnimation( mPopupContainer, duration );
+ mAnimation = animationData->CreateAnimation(mPopupContainer, duration);
// If we don't have a valid animation, provide a blank one so play() can still function generically.
- if( !mAnimation )
+ if(!mAnimation)
{
// No animation was configured (even though custom mode was specified). Create a dummy animation to avoid an exception.
- mAnimation = Animation::New( 0.0f );
+ mAnimation = Animation::New(0.0f);
}
break;
// Animate the backing, if enabled.
// This is set up last so that different animation modes can have an effect on the backing animation speed.
- if( mBackingEnabled )
+ if(mBackingEnabled)
{
// Use the alpha from the user-specified color.
float targetAlpha = mBackingColor.a;
- if( duration > Math::MACHINE_EPSILON_0 )
+ if(duration > Math::MACHINE_EPSILON_0)
{
- if( transitionIn )
+ if(transitionIn)
{
- mAnimation.AnimateTo( Property( mBacking, Actor::Property::COLOR_ALPHA ), targetAlpha, AlphaFunction::EASE_IN_OUT, TimePeriod( 0.0f, duration * 0.70f ) );
+ mAnimation.AnimateTo(Property(mBacking, Actor::Property::COLOR_ALPHA), targetAlpha, AlphaFunction::EASE_IN_OUT, TimePeriod(0.0f, duration * 0.70f));
}
else
{
- mAnimation.AnimateTo( Property( mBacking, Actor::Property::COLOR_ALPHA ), 0.0f, AlphaFunction::EASE_IN_OUT, TimePeriod( 0.30f, duration * 0.70f ) );
+ mAnimation.AnimateTo(Property(mBacking, Actor::Property::COLOR_ALPHA), 0.0f, AlphaFunction::EASE_IN_OUT, TimePeriod(0.30f, duration * 0.70f));
}
}
else
{
- mBacking.SetProperty( Actor::Property::COLOR_ALPHA, transitionIn ? targetAlpha : 0.0f );
+ mBacking.SetProperty(Actor::Property::COLOR_ALPHA, transitionIn ? targetAlpha : 0.0f);
}
}
// If we are performing the animation instantaneously, jump to the position directly and do not signal.
- if( instantaneous )
+ if(instantaneous)
{
- mAnimation.SetCurrentProgress( 1.0f );
+ mAnimation.SetCurrentProgress(1.0f);
mAnimation.Play();
}
- else if( duration > Math::MACHINE_EPSILON_0 )
+ else if(duration > Math::MACHINE_EPSILON_0)
{
// Run the animation.
- mAnimation.FinishedSignal().Connect( this, &Popup::OnDisplayChangeAnimationFinished );
+ mAnimation.FinishedSignal().Connect(this, &Popup::OnDisplayChangeAnimationFinished);
mAnimation.Play();
}
else
}
}
-void Popup::OnDisplayChangeAnimationFinished( Animation& source )
+void Popup::OnDisplayChangeAnimationFinished(Animation& source)
{
DisplayStateChangeComplete();
}
void Popup::DisplayStateChangeComplete()
{
// Remove contents from stage if completely hidden.
- if( mDisplayState == Toolkit::Popup::HIDING )
+ if(mDisplayState == Toolkit::Popup::HIDING)
{
mDisplayState = Toolkit::Popup::HIDDEN;
- mLayer.SetProperty( Actor::Property::VISIBLE, false );
- mPopupLayout.SetProperty( Actor::Property::SENSITIVE, false );
+ mLayer.SetProperty(Actor::Property::VISIBLE, false);
+ mPopupLayout.SetProperty(Actor::Property::SENSITIVE, false);
// Guard against destruction during signal emission.
- Toolkit::Popup handle( GetOwner() );
+ Toolkit::Popup handle(GetOwner());
mHiddenSignal.Emit();
}
- else if( mDisplayState == Toolkit::Popup::SHOWING )
+ else if(mDisplayState == Toolkit::Popup::SHOWING)
{
mDisplayState = Toolkit::Popup::SHOWN;
- Toolkit::Popup handle( GetOwner() );
+ Toolkit::Popup handle(GetOwner());
mShownSignal.Emit();
// Start a timer to auto-hide if enabled.
- if( mAutoHideDelay > 0u )
+ if(mAutoHideDelay > 0u)
{
- mAutoHideTimer = Timer::New( mAutoHideDelay );
- mAutoHideTimer.TickSignal().Connect( this, &Popup::OnAutoHideTimeReached );
+ mAutoHideTimer = Timer::New(mAutoHideDelay);
+ mAutoHideTimer.TickSignal().Connect(this, &Popup::OnAutoHideTimeReached);
mAutoHideTimer.Start();
}
}
bool Popup::OnAutoHideTimeReached()
{
- // Display timer has expired, auto hide the popup exactly as if the user had clicked outside.
- SetDisplayState( Toolkit::Popup::HIDDEN );
+ if(!Dali::Accessibility::IsUp() || true) // TODO: remove 'true' in sync with EFL (UX change)
+ {
+ // Display timer has expired, auto hide the popup exactly as if the user had clicked outside.
+ SetDisplayState(Toolkit::Popup::HIDDEN);
+ }
- if( mAutoHideTimer )
+ if(mAutoHideTimer)
{
mAutoHideTimer.Stop();
- mAutoHideTimer.TickSignal().Disconnect( this, &Popup::OnAutoHideTimeReached );
+ mAutoHideTimer.TickSignal().Disconnect(this, &Popup::OnAutoHideTimeReached);
mAutoHideTimer.Reset();
}
return true;
}
-void Popup::SetPopupBackgroundImage( Actor image )
+void Popup::SetPopupBackgroundImage(Actor image)
{
// Removes any previous background.
- if( mPopupBackgroundImage )
+ if(mPopupBackgroundImage)
{
mPopupBackgroundImage.Unparent();
- if( mTailImage )
+ if(mTailImage)
{
mTailImage.Unparent();
}
// Adds new background to the dialog.
mPopupBackgroundImage = image;
- mPopupBackgroundImage.SetProperty( Dali::Actor::Property::NAME, "popupBackgroundImage" );
- mPopupBackgroundImage.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
- mPopupBackgroundImage.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
+ 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();
const bool prevAlter = mAlterAddedChild;
- mAlterAddedChild = false;
- mPopupContainer.Add( mPopupBackgroundImage );
+ mAlterAddedChild = false;
+ mPopupContainer.Add(mPopupBackgroundImage);
mPopupBackgroundImage.LowerToBottom();
mAlterAddedChild = prevAlter;
- if( mTailImage )
+ if(mTailImage)
{
- mPopupBackgroundImage.Add( mTailImage );
+ mPopupBackgroundImage.Add(mTailImage);
}
mLayoutDirty = true;
return mPopupBackgroundImage;
}
-void Popup::SetTitle( Actor titleActor )
+void Popup::SetTitle(Actor titleActor)
{
// Replaces the current title actor.
- if( !mPopupLayout )
+ if(!mPopupLayout)
{
return;
}
- if( mTitle )
+ if(mTitle)
{
- mPopupLayout.RemoveChildAt( Toolkit::TableView::CellPosition( 0, 0) );
+ mPopupLayout.RemoveChildAt(Toolkit::TableView::CellPosition(0, 0));
}
mTitle = titleActor;
- if( mTitle )
+ if(mTitle)
{
// Set up padding to give sensible default behaviour
// (an application developer can later override this if they wish).
- mTitle.SetProperty( Actor::Property::PADDING, DEFAULT_TITLE_PADDING );
+ mTitle.SetProperty(Actor::Property::PADDING, DEFAULT_TITLE_PADDING);
- mPopupLayout.AddChild( mTitle, Toolkit::TableView::CellPosition( 0, 0 ) );
+ mPopupLayout.AddChild(mTitle, Toolkit::TableView::CellPosition(0, 0));
}
mLayoutDirty = true;
return mTitle;
}
-void Popup::SetContent( Actor content )
+void Popup::SetContent(Actor content)
{
// Remove previous content actor.
- if( mPopupLayout )
+ if(mPopupLayout)
{
- mPopupLayout.RemoveChildAt( Toolkit::TableView::CellPosition( 1, 0 ) );
+ mPopupLayout.RemoveChildAt(Toolkit::TableView::CellPosition(1, 0));
}
- // Keep a handle to the new content.
+ // Keep a handle to the new content.
mContent = content;
- if( mContent )
+ if(mContent)
{
- mContent.SetProperty( Dali::Actor::Property::NAME, "popupContent" );
+ mContent.SetProperty(Dali::Actor::Property::NAME, "popupContent");
- mPopupLayout.AddChild( mContent, Toolkit::TableView::CellPosition( 1, 0 ) );
+ mPopupLayout.AddChild(mContent, Toolkit::TableView::CellPosition(1, 0));
}
mLayoutDirty = true;
return mContent;
}
-void Popup::SetFooter( Actor footer )
+void Popup::SetFooter(Actor footer)
{
// Remove previous content actor.
- if( mPopupLayout )
+ if(mPopupLayout)
{
- mPopupLayout.RemoveChildAt( Toolkit::TableView::CellPosition( 2, 0 ) );
+ mPopupLayout.RemoveChildAt(Toolkit::TableView::CellPosition(2, 0));
}
// Keep a handle to the new content.
mFooter = footer;
- if( mFooter )
+ if(mFooter)
{
- mFooter.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
+ mFooter.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH);
// The control container has a fixed height.
- mPopupLayout.SetFitHeight( 2u );
- mPopupLayout.AddChild( footer, Toolkit::TableView::CellPosition( 2, 0 ) );
+ mPopupLayout.SetFitHeight(2u);
+ mPopupLayout.AddChild(footer, Toolkit::TableView::CellPosition(2, 0));
}
mLayoutDirty = true;
return mFooter;
}
-void Popup::SetDisplayState( Toolkit::Popup::DisplayState displayState )
+void Popup::SetDisplayState(Toolkit::Popup::DisplayState displayState)
{
// Convert the 4-way state to a bool, true for show, false for hide.
- bool display = ( displayState == Toolkit::Popup::SHOWING ) || ( displayState == Toolkit::Popup::SHOWN );
+ bool display = (displayState == Toolkit::Popup::SHOWING) || (displayState == Toolkit::Popup::SHOWN);
// Ignore if we are already at the target display state.
- if( display == ( ( mDisplayState == Toolkit::Popup::SHOWING ) || ( mDisplayState == Toolkit::Popup::SHOWN ) ) )
+ if(display == ((mDisplayState == Toolkit::Popup::SHOWING) || (mDisplayState == Toolkit::Popup::SHOWN)))
{
return;
}
+ auto* accessible = Dali::Accessibility::Accessible::Get(Self());
+ if(display)
+ {
+ Dali::Accessibility::Bridge::GetCurrentBridge()->AddPopup(accessible);
+ accessible->EmitStateChanged(Dali::Accessibility::State::SHOWING, 1, 0);
+ }
+ else
+ {
+ accessible->EmitStateChanged(Dali::Accessibility::State::SHOWING, 0, 0);
+ Dali::Accessibility::Bridge::GetCurrentBridge()->RemovePopup(accessible);
+ }
+
// Convert the bool state to the actual display state to use.
mDisplayState = display ? Toolkit::Popup::SHOWING : Toolkit::Popup::HIDING;
- if ( display )
+ if(display)
{
// Update the state to indicate the current intent.
mDisplayState = Toolkit::Popup::SHOWING;
// We are displaying so bring the popup layer to the front, and set it visible so it is rendered.
mLayer.RaiseToTop();
- mLayer.SetProperty( Actor::Property::VISIBLE, 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 )
+ if(mLayoutDirty)
{
// Bake-in any style and layout options to create the Popup layout.
LayoutPopup();
}
// Allow the popup to catch events.
- mPopupLayout.SetProperty( Actor::Property::SENSITIVE, true );
+ mPopupLayout.SetProperty(Actor::Property::SENSITIVE, true);
// Handle the keyboard focus when popup is shown.
Dali::Toolkit::KeyboardFocusManager keyboardFocusManager = Dali::Toolkit::KeyboardFocusManager::Get();
- if( keyboardFocusManager )
+ if(keyboardFocusManager)
{
mPreviousFocusedActor = keyboardFocusManager.GetCurrentFocusActor();
- if( Self().GetProperty< bool >( Actor::Property::KEYBOARD_FOCUSABLE ) )
+ if(Self().GetProperty<bool>(Actor::Property::KEYBOARD_FOCUSABLE))
{
// Setup the actgor to start focus from.
Actor focusActor;
- if( mContent && mContent.GetProperty< bool >( Actor::Property::KEYBOARD_FOCUSABLE ) )
+ 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.GetProperty< bool >( Actor::Property::KEYBOARD_FOCUSABLE ) )
+ else if(mFooter && mFooter.GetProperty<bool>(Actor::Property::KEYBOARD_FOCUSABLE))
{
// If the footer is focusable, move the focus to the footer.
focusActor = mFooter;
}
else
{
- DALI_LOG_WARNING( "There is no focusable in popup\n" );
+ DALI_LOG_WARNING("There is no focusable in popup\n");
}
- if( focusActor )
+ if(focusActor)
{
- keyboardFocusManager.SetCurrentFocusActor( focusActor );
+ keyboardFocusManager.SetCurrentFocusActor(focusActor);
}
}
}
ClearKeyInputFocus();
// Restore the keyboard focus when popup is hidden.
- if( mPreviousFocusedActor && mPreviousFocusedActor.GetProperty< bool >( Actor::Property::KEYBOARD_FOCUSABLE ) )
+ if(mPreviousFocusedActor && mPreviousFocusedActor.GetProperty<bool>(Actor::Property::KEYBOARD_FOCUSABLE))
{
Dali::Toolkit::KeyboardFocusManager keyboardFocusManager = Dali::Toolkit::KeyboardFocusManager::Get();
- if( keyboardFocusManager )
+ if(keyboardFocusManager)
{
- keyboardFocusManager.SetCurrentFocusActor( mPreviousFocusedActor );
+ keyboardFocusManager.SetCurrentFocusActor(mPreviousFocusedActor);
}
}
}
// Perform animation.
- StartTransitionAnimation( display );
+ StartTransitionAnimation(display);
}
Toolkit::Popup::DisplayState Popup::GetDisplayState() const
* | |````
* | |
*/
- 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 ) );
+ 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(mTitle)
{
- if( !mContent && !mFooter )
+ if(!mContent && !mFooter)
{
- mTitle.SetProperty( Actor::Property::PADDING, DEFAULT_TITLE_ONLY_PADDING );
+ mTitle.SetProperty(Actor::Property::PADDING, DEFAULT_TITLE_ONLY_PADDING);
}
else
{
- mTitle.SetProperty( Actor::Property::PADDING, DEFAULT_TITLE_PADDING );
+ mTitle.SetProperty(Actor::Property::PADDING, DEFAULT_TITLE_PADDING);
}
}
OnLayoutSetup();
// Update background visibility.
- mPopupContainer.SetProperty( Actor::Property::VISIBLE, !( !mFooter && mPopupLayout.GetChildCount() == 0 ) );
+ mPopupContainer.SetProperty(Actor::Property::VISIBLE, !(!mFooter && mPopupLayout.GetChildCount() == 0));
// Create / destroy / position the tail as needed.
LayoutTail();
void Popup::LayoutTail()
{
// Removes the tail actor.
- if( mTailImage && mTailImage.GetParent() )
+ if(mTailImage && mTailImage.GetParent())
{
- mTailImage.GetParent().Remove( mTailImage );
+ mTailImage.GetParent().Remove(mTailImage);
mTailImage.Reset();
}
- if( !mTailVisible )
+ if(!mTailVisible)
{
return;
}
const Vector3& parentOrigin = GetTailPosition();
- Vector3 position;
- std::string image;
- Vector3 anchorPoint;
+ Vector3 position;
+ std::string image;
+ Vector3 anchorPoint;
// depending on position of tail around ParentOrigin, a different tail image is used...
- if( parentOrigin.y < Math::MACHINE_EPSILON_1 )
+ if(parentOrigin.y < Math::MACHINE_EPSILON_1)
{
- image = mTailUpImage;
+ image = mTailUpImage;
anchorPoint = AnchorPoint::BOTTOM_CENTER;
- position.y = mBackgroundBorder.top;
+ position.y = mBackgroundBorder.top;
}
- else if( parentOrigin.y > ( 1.0f - Math::MACHINE_EPSILON_1 ) )
+ else if(parentOrigin.y > (1.0f - Math::MACHINE_EPSILON_1))
{
- image = mTailDownImage;
+ image = mTailDownImage;
anchorPoint = AnchorPoint::TOP_CENTER;
- position.y = - mBackgroundBorder.bottom;
+ position.y = -mBackgroundBorder.bottom;
}
- else if( parentOrigin.x < Math::MACHINE_EPSILON_1 )
+ else if(parentOrigin.x < Math::MACHINE_EPSILON_1)
{
- image = mTailLeftImage;
+ image = mTailLeftImage;
anchorPoint = AnchorPoint::CENTER_RIGHT;
- position.x = mBackgroundBorder.left;
+ position.x = mBackgroundBorder.left;
}
- else if( parentOrigin.x > ( 1.0f - Math::MACHINE_EPSILON_1 ) )
+ else if(parentOrigin.x > (1.0f - Math::MACHINE_EPSILON_1))
{
- image = mTailRightImage;
+ image = mTailRightImage;
anchorPoint = AnchorPoint::CENTER_LEFT;
- position.x = - mBackgroundBorder.right;
+ position.x = -mBackgroundBorder.right;
}
- if( !image.empty() )
+ if(!image.empty())
{
// Adds the tail actor.
- mTailImage = Toolkit::ImageView::New( image );
- 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 );
+ mTailImage = Toolkit::ImageView::New(image);
+ 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 )
+ if(mPopupBackgroundImage)
{
- mPopupBackgroundImage.Add( mTailImage );
+ mPopupBackgroundImage.Add(mTailImage);
}
}
}
-void Popup::SetContextualMode( Toolkit::Popup::ContextualMode mode )
+void Popup::SetContextualMode(Toolkit::Popup::ContextualMode mode)
{
mContextualMode = mode;
- mLayoutDirty = true;
+ mLayoutDirty = true;
}
Toolkit::Popup::ContextualMode Popup::GetContextualMode() const
Toolkit::Control Popup::CreateBacking()
{
Toolkit::Control backing = Control::New();
- 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.SetProperty( Dali::Actor::Property::NAME, "popupBacking" );
+ 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.SetProperty(Dali::Actor::Property::NAME, "popupBacking");
// Must always be positioned top-left of stage, regardless of parent.
- backing.SetProperty( Actor::Property::INHERIT_POSITION, false );
+ backing.SetProperty(Actor::Property::INHERIT_POSITION, false);
// Always the full size of the stage.
- backing.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );
- backing.SetProperty( Actor::Property::SIZE, Stage::GetCurrent().GetSize() );
+ backing.SetResizePolicy(ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS);
+ backing.SetProperty(Actor::Property::SIZE, Stage::GetCurrent().GetSize());
// Catch events.
- backing.SetProperty( Actor::Property::SENSITIVE, true );
+ backing.SetProperty(Actor::Property::SENSITIVE, true);
// Default to being transparent.
- backing.SetProperty( Actor::Property::COLOR_ALPHA, 0.0f );
- backing.WheelEventSignal().Connect( this, &Popup::OnBackingWheelEvent );
+ backing.SetProperty(Actor::Property::COLOR_ALPHA, 0.0f);
+ backing.WheelEventSignal().Connect(this, &Popup::OnBackingWheelEvent);
return backing;
}
return mHiddenSignal;
}
-void Popup::SetTailVisibility( bool visible )
+void Popup::SetTailVisibility(bool visible)
{
mTailVisible = visible;
mLayoutDirty = true;
return mTailVisible;
}
-void Popup::SetTailPosition( Vector3 position )
+void Popup::SetTailPosition(Vector3 position)
{
mTailPosition = position;
- mLayoutDirty = true;
+ mLayoutDirty = true;
}
const Vector3& Popup::GetTailPosition() const
return mTailPosition;
}
-void Popup::SetAnimationDuration( float duration )
+void Popup::SetAnimationDuration(float duration)
{
mAnimationDuration = duration;
- mLayoutDirty = true;
+ mLayoutDirty = true;
}
float Popup::GetAnimationDuration() const
return mAnimationDuration;
}
-void Popup::SetAnimationMode( Toolkit::Popup::AnimationMode animationMode )
+void Popup::SetAnimationMode(Toolkit::Popup::AnimationMode animationMode)
{
mAnimationMode = animationMode;
- mLayoutDirty = true;
+ mLayoutDirty = true;
}
Toolkit::Popup::AnimationMode Popup::GetAnimationMode() const
return mAnimationMode;
}
-void Popup::SetEntryAnimationData( const Property::Map& map )
+void Popup::SetEntryAnimationData(const Property::Map& map)
{
mEntryAnimationData.Clear();
- Scripting::NewAnimation( map, mEntryAnimationData );
+ Scripting::NewAnimation(map, mEntryAnimationData);
}
-void Popup::SetExitAnimationData( const Property::Map& map )
+void Popup::SetExitAnimationData(const Property::Map& map)
{
mExitAnimationData.Clear();
- Scripting::NewAnimation( map, mExitAnimationData );
+ Scripting::NewAnimation(map, mExitAnimationData);
}
void Popup::UpdateBackgroundPositionAndSize()
{
- if( mPopupBackgroundImage )
+ if(mPopupBackgroundImage)
{
- mPopupBackgroundImage.SetResizePolicy( ResizePolicy::SIZE_FIXED_OFFSET_FROM_PARENT, Dimension::ALL_DIMENSIONS );
- mPopupBackgroundImage.SetProperty( Actor::Property::SIZE_MODE_FACTOR, Vector3( mBackgroundBorder.left + mBackgroundBorder.right, mBackgroundBorder.top + mBackgroundBorder.bottom, 0.0f ) );
+ mPopupBackgroundImage.SetResizePolicy(ResizePolicy::SIZE_FIXED_OFFSET_FROM_PARENT, Dimension::ALL_DIMENSIONS);
+ 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.SetProperty( Actor::Property::POSITION, Vector2( ( 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));
}
}
-void Popup::SetAutoHideDelay( int delay )
+void Popup::SetAutoHideDelay(int delay)
{
mAutoHideDelay = delay;
}
return mAutoHideDelay;
}
-void Popup::SetBackingEnabled( bool enabled )
+void Popup::SetBackingEnabled(bool enabled)
{
mBackingEnabled = enabled;
- mLayoutDirty = true;
+ mLayoutDirty = true;
}
const bool Popup::IsBackingEnabled() const
return mBackingEnabled;
}
-void Popup::SetBackingColor( Vector4 color )
+void Popup::SetBackingColor(Vector4 color)
{
mBackingColor = color;
- mBacking.SetBackgroundColor( Vector4( color.r, color.g, color.b, 1.0f ) );
+ mBacking.SetBackgroundColor(Vector4(color.r, color.g, color.b, 1.0f));
mLayoutDirty = true;
}
return mBackingColor;
}
-void Popup::SetTailUpImage( std::string image )
+void Popup::SetTailUpImage(std::string image)
{
mTailUpImage = image;
mLayoutDirty = true;
return mTailUpImage;
}
-void Popup::SetTailDownImage( std::string image )
+void Popup::SetTailDownImage(std::string image)
{
mTailDownImage = image;
- mLayoutDirty = true;
+ mLayoutDirty = true;
LayoutTail();
}
return mTailDownImage;
}
-void Popup::SetTailLeftImage( std::string image )
+void Popup::SetTailLeftImage(std::string image)
{
mTailLeftImage = image;
- mLayoutDirty = true;
+ mLayoutDirty = true;
LayoutTail();
}
return mTailLeftImage;
}
-void Popup::SetTailRightImage( std::string image )
+void Popup::SetTailRightImage(std::string image)
{
mTailRightImage = image;
- mLayoutDirty = true;
+ mLayoutDirty = true;
LayoutTail();
}
return mTailRightImage;
}
-void Popup::SetTouchTransparent( bool enabled )
+void Popup::SetTouchTransparent(bool enabled)
{
- if( mTouchTransparent != enabled )
+ if(mTouchTransparent != enabled)
{
mTouchTransparent = enabled;
SetupTouch();
return mTouchTransparent;
}
-void Popup::SetProperty( BaseObject* object, Property::Index propertyIndex, const Property::Value& value )
+void Popup::SetProperty(BaseObject* object, Property::Index propertyIndex, const Property::Value& value)
{
- Toolkit::Popup popup = Toolkit::Popup::DownCast( Dali::BaseHandle( object ) );
+ Toolkit::Popup popup = Toolkit::Popup::DownCast(Dali::BaseHandle(object));
- if ( popup )
+ if(popup)
{
- Popup& popupImpl( GetImpl( popup ) );
+ Popup& popupImpl(GetImpl(popup));
- switch ( propertyIndex )
+ switch(propertyIndex)
{
case Toolkit::Popup::Property::TITLE:
{
Property::Map valueMap;
- if( value.Get( valueMap ) )
+ if(value.Get(valueMap))
{
- popupImpl.SetTitle( Scripting::NewActor( valueMap ) );
+ popupImpl.SetTitle(Scripting::NewActor(valueMap));
}
break;
}
case Toolkit::Popup::Property::CONTENT:
{
Property::Map valueMap;
- if( value.Get( valueMap ) )
+ if(value.Get(valueMap))
{
- popupImpl.SetContent( Scripting::NewActor( valueMap ) );
+ popupImpl.SetContent(Scripting::NewActor(valueMap));
}
break;
}
case Toolkit::Popup::Property::FOOTER:
{
Property::Map valueMap;
- if( value.Get( valueMap ) )
+ if(value.Get(valueMap))
{
- popupImpl.SetFooter( Scripting::NewActor( valueMap ) );
+ popupImpl.SetFooter(Scripting::NewActor(valueMap));
}
break;
}
case Toolkit::Popup::Property::DISPLAY_STATE:
{
std::string valueString;
- if( value.Get( valueString ) )
+ if(value.Get(valueString))
{
- Toolkit::Popup::DisplayState displayState( Toolkit::Popup::HIDDEN );
- if( Scripting::GetEnumeration< Toolkit::Popup::DisplayState >( valueString.c_str(), DisplayStateTable, DisplayStateTableCount, displayState ) )
+ Toolkit::Popup::DisplayState displayState(Toolkit::Popup::HIDDEN);
+ if(Scripting::GetEnumeration<Toolkit::Popup::DisplayState>(valueString.c_str(), DisplayStateTable, DisplayStateTableCount, displayState))
{
- popupImpl.SetDisplayState( displayState );
+ popupImpl.SetDisplayState(displayState);
}
}
break;
case Toolkit::Popup::Property::TOUCH_TRANSPARENT:
{
bool valueBool;
- if( value.Get( valueBool ) )
+ if(value.Get(valueBool))
{
- popupImpl.SetTouchTransparent( valueBool );
+ popupImpl.SetTouchTransparent(valueBool);
}
break;
}
case Toolkit::Popup::Property::TAIL_VISIBILITY:
{
bool valueBool;
- if( value.Get( valueBool ) )
+ if(value.Get(valueBool))
{
- popupImpl.SetTailVisibility( valueBool );
+ popupImpl.SetTailVisibility(valueBool);
}
break;
}
case Toolkit::Popup::Property::TAIL_POSITION:
{
Vector3 valueVector3;
- if( value.Get( valueVector3 ) )
+ if(value.Get(valueVector3))
{
- popupImpl.SetTailPosition( valueVector3 );
+ popupImpl.SetTailPosition(valueVector3);
}
break;
}
case Toolkit::Popup::Property::CONTEXTUAL_MODE:
{
std::string valueString;
- if( value.Get( valueString ) )
+ if(value.Get(valueString))
{
- Toolkit::Popup::ContextualMode contextualMode( Toolkit::Popup::BELOW );
- if( Scripting::GetEnumeration< Toolkit::Popup::ContextualMode >( valueString.c_str(), ContextualModeTable, ContextualModeTableCount, contextualMode ) )
+ Toolkit::Popup::ContextualMode contextualMode(Toolkit::Popup::BELOW);
+ if(Scripting::GetEnumeration<Toolkit::Popup::ContextualMode>(valueString.c_str(), ContextualModeTable, ContextualModeTableCount, contextualMode))
{
- popupImpl.SetContextualMode( contextualMode );
+ popupImpl.SetContextualMode(contextualMode);
}
}
break;
case Toolkit::Popup::Property::ANIMATION_DURATION:
{
float valueFloat;
- if( value.Get( valueFloat ) )
+ if(value.Get(valueFloat))
{
- popupImpl.SetAnimationDuration( valueFloat );
+ popupImpl.SetAnimationDuration(valueFloat);
}
break;
}
case Toolkit::Popup::Property::ANIMATION_MODE:
{
std::string valueString;
- if( value.Get( valueString ) )
+ if(value.Get(valueString))
{
- Toolkit::Popup::AnimationMode animationMode( Toolkit::Popup::FADE );
- if( Scripting::GetEnumeration< Toolkit::Popup::AnimationMode >( valueString.c_str(), AnimationModeTable, AnimationModeTableCount, animationMode ) )
+ Toolkit::Popup::AnimationMode animationMode(Toolkit::Popup::FADE);
+ if(Scripting::GetEnumeration<Toolkit::Popup::AnimationMode>(valueString.c_str(), AnimationModeTable, AnimationModeTableCount, animationMode))
{
- popupImpl.SetAnimationMode( animationMode );
+ popupImpl.SetAnimationMode(animationMode);
}
}
break;
case Toolkit::Popup::Property::ENTRY_ANIMATION:
{
Property::Map valueMap;
- if( value.Get( valueMap ) )
+ if(value.Get(valueMap))
{
- popupImpl.SetEntryAnimationData( valueMap );
+ popupImpl.SetEntryAnimationData(valueMap);
}
break;
}
case Toolkit::Popup::Property::EXIT_ANIMATION:
{
Property::Map valueMap;
- if( value.Get( valueMap ) )
+ if(value.Get(valueMap))
{
- popupImpl.SetExitAnimationData( valueMap );
+ popupImpl.SetExitAnimationData(valueMap);
}
break;
}
case Toolkit::Popup::Property::AUTO_HIDE_DELAY:
{
int valueInt;
- if( value.Get( valueInt ) )
+ if(value.Get(valueInt))
{
- popupImpl.SetAutoHideDelay( valueInt );
+ popupImpl.SetAutoHideDelay(valueInt);
}
break;
}
case Toolkit::Popup::Property::BACKING_ENABLED:
{
bool valueBool;
- if( value.Get( valueBool ) )
+ if(value.Get(valueBool))
{
- popupImpl.SetBackingEnabled( valueBool );
+ popupImpl.SetBackingEnabled(valueBool);
}
break;
}
case Toolkit::Popup::Property::BACKING_COLOR:
{
Vector4 valueVector4;
- if( value.Get( valueVector4 ) )
+ if(value.Get(valueVector4))
{
- popupImpl.SetBackingColor( valueVector4 );
+ popupImpl.SetBackingColor(valueVector4);
}
break;
}
case Toolkit::Popup::Property::POPUP_BACKGROUND_IMAGE:
{
std::string valueString;
- if( value.Get( valueString ) )
+ if(value.Get(valueString))
{
- Toolkit::ImageView actor = Toolkit::ImageView::New( valueString );
- popupImpl.SetPopupBackgroundImage( actor );
+ Toolkit::ImageView actor = Toolkit::ImageView::New(valueString);
+ popupImpl.SetPopupBackgroundImage(actor);
}
break;
}
bool valueUpdated = false;
Vector4 valueVector4;
- if( value.Get( popupImpl.mBackgroundBorder ) )
+ if(value.Get(popupImpl.mBackgroundBorder))
{
valueUpdated = true;
}
- else if( value.Get( valueVector4 ) )
+ else if(value.Get(valueVector4))
{
popupImpl.mBackgroundBorder.left = valueVector4.x;
popupImpl.mBackgroundBorder.right = valueVector4.y;
popupImpl.mBackgroundBorder.bottom = valueVector4.z;
popupImpl.mBackgroundBorder.top = valueVector4.w;
- valueUpdated = true;
+ valueUpdated = true;
}
- if( valueUpdated )
+ if(valueUpdated)
{
- popupImpl.LayoutTail(); // Update the tail if required
+ popupImpl.LayoutTail(); // Update the tail if required
popupImpl.UpdateBackgroundPositionAndSize(); // Update the background's size and position
}
break;
case Toolkit::Popup::Property::TAIL_UP_IMAGE:
{
std::string valueString;
- if( value.Get( valueString ) )
+ if(value.Get(valueString))
{
- popupImpl.SetTailUpImage( valueString );
+ popupImpl.SetTailUpImage(valueString);
}
break;
}
case Toolkit::Popup::Property::TAIL_DOWN_IMAGE:
{
std::string valueString;
- if( value.Get( valueString ) )
+ if(value.Get(valueString))
{
- popupImpl.SetTailDownImage( valueString );
+ popupImpl.SetTailDownImage(valueString);
}
break;
}
case Toolkit::Popup::Property::TAIL_LEFT_IMAGE:
{
std::string valueString;
- if( value.Get( valueString ) )
+ if(value.Get(valueString))
{
- popupImpl.SetTailLeftImage( valueString );
+ popupImpl.SetTailLeftImage(valueString);
}
break;
}
case Toolkit::Popup::Property::TAIL_RIGHT_IMAGE:
{
std::string valueString;
- if( value.Get( valueString ) )
+ if(value.Get(valueString))
{
- popupImpl.SetTailRightImage( valueString );
+ popupImpl.SetTailRightImage(valueString);
}
break;
}
}
}
-Property::Value Popup::GetProperty( BaseObject* object, Property::Index propertyIndex )
+Property::Value Popup::GetProperty(BaseObject* object, Property::Index propertyIndex)
{
Property::Value value;
- Toolkit::Popup popup = Toolkit::Popup::DownCast( Dali::BaseHandle( object ) );
+ Toolkit::Popup popup = Toolkit::Popup::DownCast(Dali::BaseHandle(object));
- if ( popup )
+ if(popup)
{
- Popup& popupImpl( GetImpl( popup ) );
+ Popup& popupImpl(GetImpl(popup));
- switch ( propertyIndex )
+ switch(propertyIndex)
{
case Toolkit::Popup::Property::TITLE:
{
Property::Map map;
- Scripting::CreatePropertyMap( popupImpl.GetTitle(), map );
+ Scripting::CreatePropertyMap(popupImpl.GetTitle(), map);
value = map;
break;
}
case Toolkit::Popup::Property::CONTENT:
{
Property::Map map;
- Scripting::CreatePropertyMap( popupImpl.GetContent(), map );
+ Scripting::CreatePropertyMap(popupImpl.GetContent(), map);
value = map;
break;
}
case Toolkit::Popup::Property::FOOTER:
{
Property::Map map;
- Scripting::CreatePropertyMap( popupImpl.GetFooter(), map );
+ Scripting::CreatePropertyMap(popupImpl.GetFooter(), map);
value = map;
break;
}
case Toolkit::Popup::Property::DISPLAY_STATE:
{
- value = Scripting::GetLinearEnumerationName< Toolkit::Popup::DisplayState >( popupImpl.GetDisplayState(), DisplayStateTable, DisplayStateTableCount );
+ value = Scripting::GetLinearEnumerationName<Toolkit::Popup::DisplayState>(popupImpl.GetDisplayState(), DisplayStateTable, DisplayStateTableCount);
break;
}
case Toolkit::Popup::Property::TOUCH_TRANSPARENT:
}
case Toolkit::Popup::Property::CONTEXTUAL_MODE:
{
- value = Scripting::GetLinearEnumerationName< Toolkit::Popup::ContextualMode >( popupImpl.GetContextualMode(), ContextualModeTable, ContextualModeTableCount );
+ value = Scripting::GetLinearEnumerationName<Toolkit::Popup::ContextualMode>(popupImpl.GetContextualMode(), ContextualModeTable, ContextualModeTableCount);
break;
}
case Toolkit::Popup::Property::ANIMATION_DURATION:
}
case Toolkit::Popup::Property::ANIMATION_MODE:
{
- value = Scripting::GetLinearEnumerationName< Toolkit::Popup::AnimationMode >( popupImpl.GetAnimationMode(), AnimationModeTable, AnimationModeTableCount );
+ value = Scripting::GetLinearEnumerationName<Toolkit::Popup::AnimationMode>(popupImpl.GetAnimationMode(), AnimationModeTable, AnimationModeTableCount);
break;
}
case Toolkit::Popup::Property::ENTRY_ANIMATION:
}
case Toolkit::Popup::Property::POPUP_BACKGROUND_IMAGE:
{
- Toolkit::ImageView imageView = Toolkit::ImageView::DownCast( popupImpl.GetPopupBackgroundImage() );
- if( imageView )
+ Toolkit::ImageView imageView = Toolkit::ImageView::DownCast(popupImpl.GetPopupBackgroundImage());
+ if(imageView)
{
- value = imageView.GetProperty( Toolkit::ImageView::Property::IMAGE );
+ value = imageView.GetProperty(Toolkit::ImageView::Property::IMAGE);
}
break;
}
return value;
}
-bool Popup::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor )
+bool Popup::DoConnectSignal(BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor)
{
- Dali::BaseHandle handle( object );
+ Dali::BaseHandle handle(object);
- bool connected( true );
- Toolkit::Popup popup = Toolkit::Popup::DownCast( handle );
+ bool connected(true);
+ Toolkit::Popup popup = Toolkit::Popup::DownCast(handle);
- if( 0 == strcmp( signalName.c_str(), SIGNAL_TOUCHED_OUTSIDE ) )
+ if(0 == strcmp(signalName.c_str(), SIGNAL_TOUCHED_OUTSIDE))
{
- popup.OutsideTouchedSignal().Connect( tracker, functor );
+ popup.OutsideTouchedSignal().Connect(tracker, functor);
}
- else if( 0 == strcmp( signalName.c_str(), SIGNAL_SHOWING ) )
+ else if(0 == strcmp(signalName.c_str(), SIGNAL_SHOWING))
{
- popup.ShowingSignal().Connect( tracker, functor );
+ popup.ShowingSignal().Connect(tracker, functor);
}
- else if( 0 == strcmp( signalName.c_str(), SIGNAL_SHOWN ) )
+ else if(0 == strcmp(signalName.c_str(), SIGNAL_SHOWN))
{
- popup.ShownSignal().Connect( tracker, functor );
+ popup.ShownSignal().Connect(tracker, functor);
}
- else if( 0 == strcmp( signalName.c_str(), SIGNAL_HIDING ) )
+ else if(0 == strcmp(signalName.c_str(), SIGNAL_HIDING))
{
- popup.HidingSignal().Connect( tracker, functor );
+ popup.HidingSignal().Connect(tracker, functor);
}
- else if( 0 == strcmp( signalName.c_str(), SIGNAL_HIDDEN ) )
+ else if(0 == strcmp(signalName.c_str(), SIGNAL_HIDDEN))
{
- popup.HiddenSignal().Connect( tracker, functor );
+ popup.HiddenSignal().Connect(tracker, functor);
}
else
{
return connected;
}
-bool Popup::OnBackingTouched( Actor actor, const TouchData& touch )
+bool Popup::OnBackingTouched(Actor actor, const TouchEvent& touch)
{
// 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.GetHitActor(0) == actor) &&
+ (touch.GetPointCount() > 0) &&
+ (touch.GetState(0) == PointState::DOWN))
{
// Guard against destruction during signal emission.
- Toolkit::Popup handle( GetOwner() );
+ Toolkit::Popup handle(GetOwner());
mTouchedOutsideSignal.Emit();
}
return false;
}
-bool Popup::OnBackingWheelEvent( Actor actor, const WheelEvent& event )
+bool Popup::OnBackingWheelEvent(Actor actor, const WheelEvent& event)
{
// Allow events to pass through if touch transparency is enabled.
- if( mTouchTransparent )
+ if(mTouchTransparent)
{
return false;
}
return true;
}
-bool Popup::OnDialogTouched( Actor actor, const TouchData& touch )
+bool Popup::OnDialogTouched(Actor actor, const TouchEvent& touch)
{
// Only connecting this so the backing does not become the default hit-actor and inadvertently closes the popup
return false;
}
-void Popup::OnSceneConnection( int depth )
+void Popup::OnSceneConnection(int depth)
{
mLayoutDirty = true;
RelayoutRequest();
- Control::OnSceneConnection( depth );
+ Control::OnSceneConnection(depth);
}
-void Popup::OnChildAdd( Actor& child )
+void Popup::OnChildAdd(Actor& child)
{
// Re-parent any children added by user to the body layer.
- if( mAlterAddedChild )
+ if(mAlterAddedChild)
{
- SetContent( child );
+ SetContent(child);
}
else
{
RelayoutRequest();
}
- Control::OnChildAdd( child );
+ Control::OnChildAdd(child);
}
-void Popup::LayoutContext( const Vector2& size )
+void Popup::LayoutContext(const Vector2& size)
{
// Do nothing if not in a contextual mode (or there is no parent context).
- Actor self = Self();
+ Actor self = Self();
Actor parent = self.GetParent();
- if( ( mContextualMode == Toolkit::Popup::NON_CONTEXTUAL ) || !parent )
+ if((mContextualMode == Toolkit::Popup::NON_CONTEXTUAL) || !parent)
{
return;
}
- mPopupContainer.SetProperty( Actor::Property::PARENT_ORIGIN, 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.SetProperty( Actor::Property::ANCHOR_POINT, 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.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 );
+ Vector3 halfStageSize(Stage().GetCurrent().GetSize() / 2.0f);
+ 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);
// Perform different positioning based on the specified contextual layout mode.
- switch( mContextualMode )
+ switch(mContextualMode)
{
case Toolkit::Popup::BELOW:
{
// Check new position is not too far right. If so, correct it.
// Note: Check for right rather than left first, so if popup is too wide, the left check overrides
// the right check and we at least see the left portion of the popup (as this is more useful).
- if( newPosition.x >= ( halfStageSize.x - parentPosition.x - halfSize.x - DEFAULT_CONTEXTUAL_STAGE_BORDER.x ) )
+ if(newPosition.x >= (halfStageSize.x - parentPosition.x - halfSize.x - DEFAULT_CONTEXTUAL_STAGE_BORDER.x))
{
newPosition.x = halfStageSize.x - parentPosition.x - halfSize.x - DEFAULT_CONTEXTUAL_STAGE_BORDER.x;
}
// Check new position is not too far left. If so, correct it.
- if( newPosition.x < halfSize.x - ( parentPosition.x + halfStageSize.x ) + DEFAULT_CONTEXTUAL_STAGE_BORDER.x )
+ if(newPosition.x < halfSize.x - (parentPosition.x + halfStageSize.x) + DEFAULT_CONTEXTUAL_STAGE_BORDER.x)
{
- newPosition.x = halfSize.x - ( parentPosition.x + halfStageSize.x ) + DEFAULT_CONTEXTUAL_STAGE_BORDER.x;// - parentSize.x;
+ newPosition.x = halfSize.x - (parentPosition.x + halfStageSize.x) + DEFAULT_CONTEXTUAL_STAGE_BORDER.x; // - parentSize.x;
}
// Check new position is not too far down. If so, correct it.
- if( newPosition.y >= ( halfStageSize.y - parentPosition.y - halfSize.y - DEFAULT_CONTEXTUAL_STAGE_BORDER.y ) )
+ if(newPosition.y >= (halfStageSize.y - parentPosition.y - halfSize.y - DEFAULT_CONTEXTUAL_STAGE_BORDER.y))
{
newPosition.y = halfStageSize.y - parentPosition.y - halfSize.y - DEFAULT_CONTEXTUAL_STAGE_BORDER.y;
}
// Check new position is not too far up. If so, correct it.
- if( newPosition.y < halfSize.y - ( parentPosition.y + halfStageSize.y ) + DEFAULT_CONTEXTUAL_STAGE_BORDER.y )
+ if(newPosition.y < halfSize.y - (parentPosition.y + halfStageSize.y) + DEFAULT_CONTEXTUAL_STAGE_BORDER.y)
{
- newPosition.y = halfSize.y - ( parentPosition.y + halfStageSize.y ) + DEFAULT_CONTEXTUAL_STAGE_BORDER.y;
+ newPosition.y = halfSize.y - (parentPosition.y + halfStageSize.y) + DEFAULT_CONTEXTUAL_STAGE_BORDER.y;
}
// Set the final position.
- mPopupContainer.SetProperty( Actor::Property::POSITION, newPosition );
+ mPopupContainer.SetProperty(Actor::Property::POSITION, newPosition);
}
-void Popup::OnRelayout( const Vector2& size, RelayoutContainer& container )
+void Popup::OnRelayout(const Vector2& size, RelayoutContainer& container)
{
- Vector2 useSize( size );
+ Vector2 useSize(size);
// Use the Popup layouts size, unless requested to use a fixed size.
// In which case take the size set for the Popup itself.
- ResizePolicy::Type widthPolicy = Self().GetResizePolicy( Dimension::WIDTH );
- ResizePolicy::Type heightPolicy = Self().GetResizePolicy( Dimension::HEIGHT );
+ ResizePolicy::Type widthPolicy = Self().GetResizePolicy(Dimension::WIDTH);
+ ResizePolicy::Type heightPolicy = Self().GetResizePolicy(Dimension::HEIGHT);
// Width calculations:
- if( widthPolicy == ResizePolicy::USE_NATURAL_SIZE || widthPolicy == ResizePolicy::FIT_TO_CHILDREN )
+ if(widthPolicy == ResizePolicy::USE_NATURAL_SIZE || widthPolicy == ResizePolicy::FIT_TO_CHILDREN)
{
// If we using a child-based policy, take the size from the popup layout.
- mPopupLayout.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::WIDTH );
- useSize.width = mPopupLayout.GetRelayoutSize( Dimension::WIDTH );
+ mPopupLayout.SetResizePolicy(ResizePolicy::USE_NATURAL_SIZE, Dimension::WIDTH);
+ useSize.width = mPopupLayout.GetRelayoutSize(Dimension::WIDTH);
- mPopupLayout.SetFitWidth( 0u );
+ mPopupLayout.SetFitWidth(0u);
}
else
{
// If we using a parent-based policy, take the size from the popup object itself (self).
- mPopupLayout.SetResizePolicy( ResizePolicy::USE_ASSIGNED_SIZE, Dimension::WIDTH );
+ mPopupLayout.SetResizePolicy(ResizePolicy::USE_ASSIGNED_SIZE, Dimension::WIDTH);
- mPopupLayout.SetFixedWidth( 0u, useSize.width );
+ mPopupLayout.SetFixedWidth(0u, useSize.width);
}
// Height calculations:
// Title: Let the title be as high as it needs to be.
- mPopupLayout.SetFitHeight( 0u );
+ mPopupLayout.SetFitHeight(0u);
// Footer: Convert the footer's resize policy to a TableView row policy.
- if( mFooter )
+ if(mFooter)
{
- ResizePolicy::Type footerHeightPolicy = mFooter.GetResizePolicy( Dimension::HEIGHT );
- if( ( footerHeightPolicy == ResizePolicy::USE_NATURAL_SIZE ) ||
- ( footerHeightPolicy == ResizePolicy::FIT_TO_CHILDREN ) )
+ ResizePolicy::Type footerHeightPolicy = mFooter.GetResizePolicy(Dimension::HEIGHT);
+ if((footerHeightPolicy == ResizePolicy::USE_NATURAL_SIZE) ||
+ (footerHeightPolicy == ResizePolicy::FIT_TO_CHILDREN))
{
- mPopupLayout.SetFitHeight( 2u );
+ mPopupLayout.SetFitHeight(2u);
}
- else if( footerHeightPolicy == ResizePolicy::FIXED )
+ else if(footerHeightPolicy == ResizePolicy::FIXED)
{
- mPopupLayout.SetFixedHeight( 2u, mFooter.GetRelayoutSize( Dimension::HEIGHT) );
+ mPopupLayout.SetFixedHeight(2u, mFooter.GetRelayoutSize(Dimension::HEIGHT));
}
else
{
- mPopupLayout.SetRelativeHeight( 2u, 1.0f );
+ mPopupLayout.SetRelativeHeight(2u, 1.0f);
}
}
else
{
- mPopupLayout.SetFixedHeight( 2u, 0.0f );
+ mPopupLayout.SetFixedHeight(2u, 0.0f);
}
// Popup contents: Adjust the tableview's policies based on the popup's policies.
- if( heightPolicy == ResizePolicy::USE_NATURAL_SIZE || heightPolicy == ResizePolicy::FIT_TO_CHILDREN )
+ if(heightPolicy == ResizePolicy::USE_NATURAL_SIZE || heightPolicy == ResizePolicy::FIT_TO_CHILDREN)
{
- mPopupLayout.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT );
+ mPopupLayout.SetResizePolicy(ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT);
// Let both the contents expand as necessary.
- mPopupLayout.SetFitHeight( 1u );
- useSize.height = mPopupLayout.GetRelayoutSize( Dimension::HEIGHT );
+ mPopupLayout.SetFitHeight(1u);
+ useSize.height = mPopupLayout.GetRelayoutSize(Dimension::HEIGHT);
}
else
{
- mPopupLayout.SetResizePolicy( heightPolicy, Dimension::HEIGHT );
+ mPopupLayout.SetResizePolicy(heightPolicy, Dimension::HEIGHT);
// Let the content expand to fill the remaining space.
- mPopupLayout.SetRelativeHeight( 1u, 1.0f );
- mPopupLayout.SetResizePolicy( ResizePolicy::USE_ASSIGNED_SIZE, Dimension::HEIGHT );
+ mPopupLayout.SetRelativeHeight(1u, 1.0f);
+ mPopupLayout.SetResizePolicy(ResizePolicy::USE_ASSIGNED_SIZE, Dimension::HEIGHT);
}
// Relayout the popup-layout to give it it's new size this frame.
- container.Add( mPopupLayout, useSize );
+ container.Add(mPopupLayout, useSize);
- if( mContent )
+ if(mContent)
{
- container.Add( mContent, Vector2( mContent.GetRelayoutSize( Dimension::WIDTH ), mContent.GetRelayoutSize( Dimension::HEIGHT ) ) );
+ container.Add(mContent, Vector2(mContent.GetRelayoutSize(Dimension::WIDTH), mContent.GetRelayoutSize(Dimension::HEIGHT)));
}
// Perform contextual layout setup if required.
// This is done each time in case the parent moves.
// This will have no effect if no contextual mode is selected.
- LayoutContext( useSize );
+ LayoutContext(useSize);
}
-void Popup::OnSetResizePolicy( ResizePolicy::Type policy, Dimension::Type dimension )
+void Popup::OnSetResizePolicy(ResizePolicy::Type policy, Dimension::Type dimension)
{
// To get the popup to emulate fit-to-children, we need to actually set use-natural-size.
- if( ( dimension & Dimension::HEIGHT ) && ( policy == ResizePolicy::FIT_TO_CHILDREN ) )
+ if((dimension & Dimension::HEIGHT) && (policy == ResizePolicy::FIT_TO_CHILDREN))
{
- Self().SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT );
+ Self().SetResizePolicy(ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT);
}
mLayoutDirty = true;
return mPopupLayout.GetNaturalSize();
}
-float Popup::GetHeightForWidth( float width )
+float Popup::GetHeightForWidth(float width)
{
- return mPopupLayout.GetHeightForWidth( width );
+ return mPopupLayout.GetHeightForWidth(width);
}
-float Popup::GetWidthForHeight( float height )
+float Popup::GetWidthForHeight(float height)
{
- return mPopupLayout.GetWidthForHeight( height );
+ return mPopupLayout.GetWidthForHeight(height);
}
-bool Popup::OnKeyEvent( const KeyEvent& event )
+bool Popup::OnKeyEvent(const KeyEvent& event)
{
// Allow events to pass through if touch transparency is enabled.
- if( mTouchTransparent )
+ if(mTouchTransparent)
{
return false;
}
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 );
+ SetDisplayState(Toolkit::Popup::HIDDEN);
consumed = true;
}
}
return consumed;
}
-void Popup::AddFocusableChildrenRecursive( Actor parent, std::vector< Actor >& focusableActors )
+void Popup::AddFocusableChildrenRecursive(Actor parent, std::vector<Actor>& focusableActors)
{
- if( parent )
+ if(parent)
{
- Toolkit::Control control = Toolkit::Control::DownCast( parent );
- bool layoutControl = control && GetImplementation( control ).IsKeyboardNavigationSupported();
+ Toolkit::Control control = Toolkit::Control::DownCast(parent);
+ bool layoutControl = control && GetImplementation(control).IsKeyboardNavigationSupported();
- if( parent.GetProperty< bool >( Actor::Property::KEYBOARD_FOCUSABLE ) || layoutControl )
+ if(parent.GetProperty<bool>(Actor::Property::KEYBOARD_FOCUSABLE) || layoutControl)
{
- focusableActors.push_back( parent );
+ focusableActors.push_back(parent);
- if( !layoutControl )
+ if(!layoutControl)
{
- for( unsigned int i = 0, numberChildren = parent.GetChildCount(); i < numberChildren; ++i )
+ for(unsigned int i = 0, numberChildren = parent.GetChildCount(); i < numberChildren; ++i)
{
- Actor child( parent.GetChildAt( i ) );
- AddFocusableChildrenRecursive( child, focusableActors );
+ Actor child(parent.GetChildAt(i));
+ AddFocusableChildrenRecursive(child, focusableActors);
}
}
}
}
}
-void Popup::AddFocusableChildren( Actor parent, std::vector< Actor >& focusableActors )
+void Popup::AddFocusableChildren(Actor parent, std::vector<Actor>& focusableActors)
{
- if( parent )
+ if(parent)
{
- Toolkit::Control control = Toolkit::Control::DownCast( parent );
- if( !GetImplementation( control ).IsKeyboardNavigationSupported() )
+ Toolkit::Control control = Toolkit::Control::DownCast(parent);
+ if(!GetImplementation(control).IsKeyboardNavigationSupported())
{
- for( unsigned int i = 0, numberChildren = parent.GetChildCount(); i < numberChildren; ++i )
+ for(unsigned int i = 0, numberChildren = parent.GetChildCount(); i < numberChildren; ++i)
{
- Actor child( parent.GetChildAt( i ) );
- AddFocusableChildrenRecursive( child, focusableActors );
+ Actor child(parent.GetChildAt(i));
+ AddFocusableChildrenRecursive(child, focusableActors);
}
}
else
{
- focusableActors.push_back( parent );
+ focusableActors.push_back(parent);
}
}
}
-Actor Popup::GetNextKeyboardFocusableActor( Actor currentFocusedActor, Toolkit::Control::KeyboardFocus::Direction direction, bool loopEnabled )
+Actor Popup::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Toolkit::Control::KeyboardFocus::Direction direction, bool loopEnabled)
{
std::string currentStr;
- if( currentFocusedActor )
+ if(currentFocusedActor)
{
- currentStr = currentFocusedActor.GetProperty< std::string >( Dali::Actor::Property::NAME );
+ currentStr = currentFocusedActor.GetProperty<std::string>(Dali::Actor::Property::NAME);
}
- Actor nextFocusableActor( currentFocusedActor );
+ Actor nextFocusableActor(currentFocusedActor);
Actor currentFocusGroup;
- if( currentFocusedActor )
+ if(currentFocusedActor)
{
- currentFocusGroup = KeyboardFocusManager::Get().GetFocusGroup( currentFocusedActor );
+ currentFocusGroup = KeyboardFocusManager::Get().GetFocusGroup(currentFocusedActor);
}
// TODO: Needs to be optimised
// The following statement checks that if we have a current focused actor, then the current focus group is not the popup content or footer.
// This is to detect if the focus is currently outside the popup, and if so, move it inside.
- if( !currentFocusedActor ||
- ( currentFocusedActor && ( ( !mContent || ( currentFocusGroup != mContent ) ) && ( !mFooter || ( currentFocusGroup != mFooter ) ) ) ) )
+ if(!currentFocusedActor ||
+ (currentFocusedActor && ((!mContent || (currentFocusGroup != mContent)) && (!mFooter || (currentFocusGroup != mFooter)))))
{
// The current focused actor is not within popup.
- if( mContent && mContent.GetProperty< bool >( Actor::Property::KEYBOARD_FOCUSABLE ) )
+ 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.GetProperty< bool >( Actor::Property::KEYBOARD_FOCUSABLE ) )
+ else if(mFooter && mFooter.GetProperty<bool>(Actor::Property::KEYBOARD_FOCUSABLE))
{
// If the footer is focusable, move the focus to the footer.
nextFocusableActor = mFooter;
else
{
// Rebuild the focus chain because controls or content can be added or removed dynamically
- std::vector< Actor > focusableActors;
+ std::vector<Actor> focusableActors;
- AddFocusableChildren( mContent, focusableActors );
- AddFocusableChildren( mFooter, focusableActors );
+ AddFocusableChildren(mContent, focusableActors);
+ AddFocusableChildren(mFooter, focusableActors);
- std::vector< Actor >::iterator endIterator = focusableActors.end();
- std::vector< Actor >::iterator currentIterator = focusableActors.begin();
- for( std::vector< Actor >::iterator iterator = focusableActors.begin(); iterator != endIterator; ++iterator )
+ std::vector<Actor>::iterator endIterator = focusableActors.end();
+ std::vector<Actor>::iterator currentIterator = focusableActors.begin();
+ for(std::vector<Actor>::iterator iterator = focusableActors.begin(); iterator != endIterator; ++iterator)
{
- if( currentFocusedActor == *iterator )
+ if(currentFocusedActor == *iterator)
{
currentIterator = iterator;
}
}
- if( currentIterator != endIterator )
+ if(currentIterator != endIterator)
{
- switch( direction )
+ switch(direction)
{
case Toolkit::Control::KeyboardFocus::LEFT:
{
- if( currentIterator == focusableActors.begin() )
+ if(currentIterator == focusableActors.begin())
{
- nextFocusableActor = *( endIterator - 1 );
+ nextFocusableActor = *(endIterator - 1);
}
else
{
- nextFocusableActor = *( currentIterator - 1 );
+ nextFocusableActor = *(currentIterator - 1);
}
break;
}
case Toolkit::Control::KeyboardFocus::RIGHT:
{
- if( currentIterator == endIterator - 1 )
+ if(currentIterator == endIterator - 1)
{
- nextFocusableActor = *( focusableActors.begin() );
+ nextFocusableActor = *(focusableActors.begin());
}
else
{
- nextFocusableActor = *( currentIterator + 1 );
+ nextFocusableActor = *(currentIterator + 1);
}
break;
}
case Toolkit::Control::KeyboardFocus::UP:
{
- nextFocusableActor = *( focusableActors.begin() );
+ nextFocusableActor = *(focusableActors.begin());
break;
}
case Toolkit::Control::KeyboardFocus::DOWN:
{
- nextFocusableActor = *( endIterator - 1 );
+ nextFocusableActor = *(endIterator - 1);
break;
}
}
}
- if( !nextFocusableActor )
+ if(!nextFocusableActor)
{
- DALI_LOG_WARNING( "Can not decide next focusable actor\n" );
+ DALI_LOG_WARNING("Can not decide next focusable actor\n");
}
}
}
void Popup::SetupTouch()
{
- if( ! mTouchTransparent )
+ if(!mTouchTransparent)
{
// Connect all the signals and set us up to consume all touch events
- mBacking.TouchSignal().Connect( this, &Popup::OnBackingTouched );
- mPopupBackgroundImage.TouchSignal().Connect( this, &Popup::OnDialogTouched );
- mPopupLayout.TouchSignal().Connect( this, &Popup::OnDialogTouched );
- mLayer.SetProperty( Layer::Property::CONSUMES_TOUCH, true );
+ 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.TouchSignal().Disconnect( this, &Popup::OnBackingTouched );
- mPopupBackgroundImage.TouchSignal().Disconnect( this, &Popup::OnDialogTouched );
- mPopupLayout.TouchSignal().Disconnect( this, &Popup::OnDialogTouched );
- mLayer.SetProperty( Layer::Property::CONSUMES_TOUCH, false );
+ 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);
+ }
+}
+
+std::string Popup::AccessibleImpl::GetNameRaw()
+{
+ auto popup = Toolkit::Popup::DownCast(Self());
+ std::string title;
+ Actor popupTitle = popup.GetTitle();
+ if(popupTitle)
+ {
+ std::string titleText = popupTitle.GetProperty<std::string>(Toolkit::TextLabel::Property::TEXT);
+ title = titleText;
+ }
+ else
+ {
+ Actor popupContent = popup.GetContent();
+ if(popupContent)
+ {
+ std::string contentText = popupContent.GetProperty<std::string>(Toolkit::TextLabel::Property::TEXT);
+ title = contentText;
+ }
}
+ return title;
+}
+
+Dali::Accessibility::States Popup::AccessibleImpl::CalculateStates()
+{
+ auto states = DevelControl::AccessibleImpl::CalculateStates();
+ auto popup = Toolkit::Popup::DownCast(Self());
+ auto displayState = popup.GetProperty<std::string>(Toolkit::Popup::Property::DISPLAY_STATE);
+
+ states[Dali::Accessibility::State::SHOWING] = (displayState == "SHOWN" || displayState == "SHOWING");
+
+ return states;
}
} // namespace Internal
projects / platform / core / uifw / dali-toolkit.git / blobdiff