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
Merge changes I2df640e0,Ia1188305,I7fae506e,I7967a7cc,Ib0fdcdf4, ... into devel/master
[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
7903998
..
e9dffef
--- a/
dali-toolkit/internal/controls/popup/popup-impl.h
+++ b/
dali-toolkit/internal/controls/popup/popup-impl.h
@@
-2,7
+2,7
@@
#define DALI_TOOLKIT_INTERNAL_POPUP_H
/*
#define DALI_TOOLKIT_INTERNAL_POPUP_H
/*
- * Copyright (c) 20
19
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.
@@
-28,6
+28,7
@@
#include <dali-toolkit/public-api/controls/control-impl.h>
#include <dali-toolkit/devel-api/controls/table-view/table-view.h>
#include <dali-toolkit/devel-api/controls/popup/popup.h>
#include <dali-toolkit/public-api/controls/control-impl.h>
#include <dali-toolkit/devel-api/controls/table-view/table-view.h>
#include <dali-toolkit/devel-api/controls/popup/popup.h>
+#include <dali-toolkit/internal/controls/control/control-data-impl.h>
namespace Dali
{
namespace Dali
{
@@
-244,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.
@@
-404,7
+412,7
@@
private:
* @param[in] touch The Touch Data.
* @return Whether to consume event or not.
*/
* @param[in] touch The Touch Data.
* @return Whether to consume event or not.
*/
- bool OnBackingTouched(Actor actor, const Touch
Data
& touch);
+ bool OnBackingTouched(Actor actor, const Touch
Event
& 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.
@@
-420,12
+428,12
@@
private:
* @param[in] touch The Touch Data.
* @return Whether to consume event or not.
*/
* @param[in] touch The Touch Data.
* @return Whether to consume event or not.
*/
- bool OnDialogTouched( Actor actor, const Touch
Data
& touch );
+ bool OnDialogTouched( Actor actor, const Touch
Event
& 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.
@@
-437,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 OnStageConnection( int depth )
;
+ 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 OnChildAdd( 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()
@@
-499,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.