projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[AT-SPI] Correct VISIBLE and SHOWING states
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
popup
/
popup-impl.h
diff --git
a/dali-toolkit/internal/controls/popup/popup-impl.h
b/dali-toolkit/internal/controls/popup/popup-impl.h
old mode 100755
(executable)
new mode 100644
(file)
index
f01d498
..
e9dffef
--- a/
dali-toolkit/internal/controls/popup/popup-impl.h
+++ b/
dali-toolkit/internal/controls/popup/popup-impl.h
@@
-1,8
+1,8
@@
-#ifndef
__DALI_TOOLKIT_INTERNAL_POPUP_H__
-#define
__DALI_TOOLKIT_INTERNAL_POPUP_H__
+#ifndef
DALI_TOOLKIT_INTERNAL_POPUP_H
+#define
DALI_TOOLKIT_INTERNAL_POPUP_H
/*
/*
- * Copyright (c) 20
15
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
20
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-19,7
+19,6
@@
*/
// EXTERNAL INCLUDES
*/
// EXTERNAL INCLUDES
-#include <dali/public-api/actors/image-actor.h>
#include <dali/public-api/actors/layer.h>
#include <dali/public-api/adaptor-framework/timer.h>
#include <dali/public-api/animation/animation.h>
#include <dali/public-api/actors/layer.h>
#include <dali/public-api/adaptor-framework/timer.h>
#include <dali/public-api/animation/animation.h>
@@
-27,8
+26,9
@@
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control-impl.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control-impl.h>
-#include <dali-toolkit/
public
-api/controls/table-view/table-view.h>
+#include <dali-toolkit/
devel
-api/controls/table-view/table-view.h>
#include <dali-toolkit/devel-api/controls/popup/popup.h>
#include <dali-toolkit/devel-api/controls/popup/popup.h>
+#include <dali-toolkit/internal/controls/control/control-data-impl.h>
namespace Dali
{
namespace Dali
{
@@
-245,6
+245,13
@@
public:
static Property::Value GetProperty( BaseObject* object, Property::Index propertyIndex );
protected:
static Property::Value GetProperty( BaseObject* object, Property::Index propertyIndex );
protected:
+ struct AccessibleImpl : public Control::Impl::AccessibleImpl
+ {
+ using Control::Impl::AccessibleImpl::AccessibleImpl;
+
+ std::string GetNameRaw() override;
+ Dali::Accessibility::States CalculateStates() override;
+ };
/**
* Construct a new Popup.
/**
* Construct a new Popup.
@@
-348,6
+355,11
@@
private:
*/
void SetExitAnimationData( const Property::Map& map );
*/
void SetExitAnimationData( const Property::Map& map );
+ /**
+ * @briefs Updates the popup background's position and size.
+ */
+ void UpdateBackgroundPositionAndSize();
+
public: // Signals
/**
public: // Signals
/**
@@
-397,10
+409,10
@@
private:
/**
* Signal occurs when the dimmed backing for the Popup is touched.
* @param[in] actor The Actor Touched
/**
* Signal occurs when the dimmed backing for the Popup is touched.
* @param[in] actor The Actor Touched
- * @param[in]
event The Touch Event
.
+ * @param[in]
touch The Touch Data
.
* @return Whether to consume event or not.
*/
* @return Whether to consume event or not.
*/
- bool OnBackingTouched(Actor actor, const TouchEvent&
event
);
+ bool OnBackingTouched(Actor actor, const TouchEvent&
touch
);
/**
* Signal occurs when a mouse wheel event occurs on the dimmed backing.
/**
* Signal occurs when a mouse wheel event occurs on the dimmed backing.
@@
-413,15
+425,15
@@
private:
/**
* Signal occurs when the dialog has been touched.
* @param[in] actor The Actor Touched
/**
* Signal occurs when the dialog has been touched.
* @param[in] actor The Actor Touched
- * @param[in]
event The Touch Event
.
+ * @param[in]
touch The Touch Data
.
* @return Whether to consume event or not.
*/
* @return Whether to consume event or not.
*/
- bool OnDialogTouched(
Actor actor, const TouchEvent& event
);
+ bool OnDialogTouched(
Actor actor, const TouchEvent& touch
);
/**
* @copydoc Toolkit::Control::OnInitialize()
*/
/**
* @copydoc Toolkit::Control::OnInitialize()
*/
- v
irtual void OnInitialize()
;
+ v
oid OnInitialize() override
;
/**
* Called whenever the popup layout is re-set up.
/**
* Called whenever the popup layout is re-set up.
@@
-433,43
+445,43
@@
private:
/**
* Called when the popup is directly or indirectly parented to the stage.
*/
/**
* Called when the popup is directly or indirectly parented to the stage.
*/
- v
irtual void OnControlStageConnection()
;
+ v
oid OnSceneConnection( int depth ) override
;
/**
* From Control; called after a child has been added to the owning actor.
* @param[in] child The child which has been added.
*/
/**
* From Control; called after a child has been added to the owning actor.
* @param[in] child The child which has been added.
*/
- v
irtual void OnControlChildAdd( Actor& child )
;
+ v
oid OnChildAdd( Actor& child ) override
;
/**
* @copydoc Control::OnRelayOut()
*/
/**
* @copydoc Control::OnRelayOut()
*/
- v
irtual void OnRelayout( const Vector2& size, RelayoutContainer& container )
;
+ v
oid OnRelayout( const Vector2& size, RelayoutContainer& container ) override
;
/**
* @copydoc Control::OnSetResizePolicy()
*/
/**
* @copydoc Control::OnSetResizePolicy()
*/
- v
irtual void OnSetResizePolicy( ResizePolicy::Type policy, Dimension::Type dimension )
;
+ v
oid OnSetResizePolicy( ResizePolicy::Type policy, Dimension::Type dimension ) override
;
/**
* @copydoc Control::GetNaturalSize()
*/
/**
* @copydoc Control::GetNaturalSize()
*/
-
virtual Vector3 GetNaturalSize()
;
+
Vector3 GetNaturalSize() override
;
/**
* @copydoc Control::GetHeightForWidth()
*/
/**
* @copydoc Control::GetHeightForWidth()
*/
-
virtual float GetHeightForWidth( float width )
;
+
float GetHeightForWidth( float width ) override
;
/**
* @copydoc Control::GetWidthForHeight()
*/
/**
* @copydoc Control::GetWidthForHeight()
*/
-
virtual float GetWidthForHeight( float height )
;
+
float GetWidthForHeight( float height ) override
;
/**
* @copydoc Control::OnKeyEvent()
*/
/**
* @copydoc Control::OnKeyEvent()
*/
-
virtual bool OnKeyEvent( const KeyEvent& event )
;
+
bool OnKeyEvent( const KeyEvent& event ) override
;
/**
* @copydoc Control::GetNextKeyboardFocusableActor()
/**
* @copydoc Control::GetNextKeyboardFocusableActor()
@@
-495,6
+507,12
@@
private:
*/
void AddFocusableChildrenRecursive( Actor parent, std::vector< Actor >& focusableActors );
*/
void AddFocusableChildrenRecursive( Actor parent, std::vector< Actor >& focusableActors );
+ /**
+ * Sets up the touch signals connections as required.
+ * @note This must be called after all the members have been created.
+ */
+ void SetupTouch();
+
private:
// Undefined.
private:
// Undefined.
@@
-543,7
+561,7
@@
private:
bool mBackingEnabled; ///< True if a dimmed backing will be used.
Vector4 mBackingColor; ///< The color of the backing.
Actor mPopupBackgroundImage; ///< Stores the background image.
bool mBackingEnabled; ///< True if a dimmed backing will be used.
Vector4 mBackingColor; ///< The color of the backing.
Actor mPopupBackgroundImage; ///< Stores the background image.
- Vector4 mBackgroundOuterBorder; ///< Background external border margin size
+ Rect<int> mBackgroundBorder; ///< Background border.
float mMargin; ///< Internal margin for popup contents.
std::string mTailUpImage; ///< Image used for the tail for the up direction.
std::string mTailDownImage; ///< Image used for the tail for the down direction.
float mMargin; ///< Internal margin for popup contents.
std::string mTailUpImage; ///< Image used for the tail for the up direction.
std::string mTailDownImage; ///< Image used for the tail for the down direction.
@@
-577,4
+595,4
@@
inline const Toolkit::Internal::Popup& GetImpl( const Toolkit::Popup& publicObje
} // namespace Dali
} // namespace Dali
-#endif //
__DALI_TOOLKIT_INTERNAL_POPUP_H__
+#endif //
DALI_TOOLKIT_INTERNAL_POPUP_H