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 "Add a callback for navigation policy in web view." into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
controls
/
control-wrapper-impl.h
diff --git
a/dali-toolkit/devel-api/controls/control-wrapper-impl.h
b/dali-toolkit/devel-api/controls/control-wrapper-impl.h
old mode 100755
(executable)
new mode 100644
(file)
index
33905a5
..
6bd1026
--- a/
dali-toolkit/devel-api/controls/control-wrapper-impl.h
+++ b/
dali-toolkit/devel-api/controls/control-wrapper-impl.h
@@
-2,7
+2,7
@@
#define DALI_TOOLKIT_INTERNAL_CONTROL_WRAPPER_H
/*
#define DALI_TOOLKIT_INTERNAL_CONTROL_WRAPPER_H
/*
- * Copyright (c) 20
16
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,29
+19,32
@@
*/
// INTERNAL INCLUDES
*/
// INTERNAL INCLUDES
-#include <dali-toolkit/public-api/controls/control-impl.h>
#include <dali-toolkit/devel-api/controls/control-wrapper.h>
#include <dali-toolkit/devel-api/controls/control-wrapper.h>
+#include <dali-toolkit/public-api/controls/control-impl.h>
namespace Dali
{
namespace Dali
{
-
namespace Toolkit
{
namespace Toolkit
{
+class TransitionData;
-namespace
Intern
al
+namespace
Visu
al
{
{
+class Base;
+}
+namespace Internal
+{
class ControlWrapper;
class ControlWrapper;
-typedef IntrusivePtr<
ControlWrapper
> ControlWrapperPtr;
+typedef IntrusivePtr<
ControlWrapper
> ControlWrapperPtr;
/**
* @copydoc Toolkit::ControlWrapper
*/
/**
* @copydoc Toolkit::ControlWrapper
*/
-class DALI_
IMPOR
T_API ControlWrapper : public Control
+class DALI_
TOOLKI
T_API ControlWrapper : public Control
{
public:
{
public:
-
// Flags for the constructor
enum CustomControlBehaviour
{
// Flags for the constructor
enum CustomControlBehaviour
{
@@
-53,14
+56,14
@@
public:
LAST_CONTROL_BEHAVIOUR_FLAG
};
LAST_CONTROL_BEHAVIOUR_FLAG
};
- static const int CONTROL_BEHAVIOUR_FLAG_COUNT = Log<
LAST_CONTROL_BEHAVIOUR_FLAG - 1 >::value + 1;
///< Total count of flags
+ static const int CONTROL_BEHAVIOUR_FLAG_COUNT = Log<
LAST_CONTROL_BEHAVIOUR_FLAG - 1>::value + 1;
///< Total count of flags
/**
* @brief Control constructor
*
* @param[in] behaviourFlags Behavioural flags from CustomControlBehaviour enum
*/
/**
* @brief Control constructor
*
* @param[in] behaviourFlags Behavioural flags from CustomControlBehaviour enum
*/
- ControlWrapper(
CustomControlBehaviour behaviourFlags
);
+ ControlWrapper(
CustomControlBehaviour behaviourFlags
);
/**
* Create a new ControlWrapper.
/**
* Create a new ControlWrapper.
@@
-70,10
+73,9
@@
public:
*
* @return A public handle to the newly allocated ControlWrapper.
*/
*
* @return A public handle to the newly allocated ControlWrapper.
*/
- static Dali::Toolkit::ControlWrapper New(
const std::string& typeName, ControlWrapper* controlWrapper
);
+ static Dali::Toolkit::ControlWrapper New(
const std::string& typeName, ControlWrapper* controlWrapper
);
public: // From CustomActorImpl
public: // From CustomActorImpl
-
// Size negotiation helpers
/**
// Size negotiation helpers
/**
@@
-84,64
+86,73
@@
public: // From CustomActorImpl
/**
* @copydoc Dali::CustomActorImpl::GetHeightForWidthBase()
*/
/**
* @copydoc Dali::CustomActorImpl::GetHeightForWidthBase()
*/
- float GetHeightForWidthBase(
float width
);
+ float GetHeightForWidthBase(
float width
);
/**
* @copydoc Dali::CustomActorImpl::GetWidthForHeightBase()
*/
/**
* @copydoc Dali::CustomActorImpl::GetWidthForHeightBase()
*/
- float GetWidthForHeightBase(
float height
);
+ float GetWidthForHeightBase(
float height
);
/**
* @copydoc Dali::CustomActorImpl::CalculateChildSizeBase()
*/
/**
* @copydoc Dali::CustomActorImpl::CalculateChildSizeBase()
*/
- float CalculateChildSizeBase(
const Dali::Actor& child, Dimension::Type dimension
);
+ float CalculateChildSizeBase(
const Dali::Actor& child, Dimension::Type dimension
);
/**
* @copydoc Dali::CustomActorImpl::RelayoutDependentOnChildrenBase()
*/
/**
* @copydoc Dali::CustomActorImpl::RelayoutDependentOnChildrenBase()
*/
- bool RelayoutDependentOnChildrenBase(
Dimension::Type dimension = Dimension::ALL_DIMENSIONS
);
+ bool RelayoutDependentOnChildrenBase(
Dimension::Type dimension = Dimension::ALL_DIMENSIONS
);
public: // From Control
public: // From Control
+ /**
+ * @ref Dali::Toolkit::DevelControl::RegisterVisual()
+ */
+ void RegisterVisual(Property::Index index, Toolkit::Visual::Base& visual);
/**
/**
- * @
copydoc Dali::Toolkit::Internal::Control::RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual
)
+ * @
ref Dali::Toolkit::DevelControl::RegisterVisual(
)
*/
*/
- void RegisterVisual(
Property::Index index, Toolkit::Visual::Base& visual
);
+ void RegisterVisual(
Property::Index index, Toolkit::Visual::Base& visual, int depthIndex
);
/**
/**
- * @
copydoc Dali::Toolkit::Internal::Control::RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual, bool enabled
)
+ * @
ref Dali::Toolkit::DevelControl::RegisterVisual(
)
*/
*/
- void RegisterVisual(
Property::Index index, Toolkit::Visual::Base& visual, bool enabled
);
+ void RegisterVisual(
Property::Index index, Toolkit::Visual::Base& visual, bool enabled
);
/**
/**
- * @
copydoc Dali::Toolkit::Internal::Control::Unr
egisterVisual()
+ * @
ref Dali::Toolkit::DevelControl::R
egisterVisual()
*/
*/
- void
UnregisterVisual( Property::Index index
);
+ void
RegisterVisual(Property::Index index, Toolkit::Visual::Base& visual, bool enabled, int depthIndex
);
/**
/**
- * @
copydoc Dali::Toolkit::Internal::Control::Get
Visual()
+ * @
ref Dali::Toolkit::DevelControl::Unregister
Visual()
*/
*/
-
Toolkit::Visual::Base GetVisual( Property::Index index ) const
;
+
void UnregisterVisual(Property::Index index)
;
/**
/**
- * @
copydoc Dali::Toolkit::Internal::Control::Enable
Visual()
+ * @
ref Dali::Toolkit::DevelControl::Get
Visual()
*/
*/
-
void EnableVisual( Property::Index index, bool enable )
;
+
Toolkit::Visual::Base GetVisual(Property::Index index) const
;
/**
/**
- * @
copydoc Dali::Toolkit::Internal::Control::IsVisualEnabled
()
+ * @
ref Dali::Toolkit::DevelControl::EnableVisual
()
*/
*/
-
bool IsVisualEnabled( Property::Index index ) const
;
+
void EnableVisual(Property::Index index, bool enable)
;
/**
/**
- * @
copydoc Dali::Toolkit::Internal::Control::CreateTransition
()
+ * @
ref Dali::Toolkit::DevelControl::IsVisualEnabled
()
*/
*/
- Dali::Animation CreateTransition( const Toolkit::TransitionData& transitionData );
+ bool IsVisualEnabled(Property::Index index) const;
+
+ /**
+ * @ref Dali::Toolkit::DevelControl::CreateTransition()
+ */
+ Dali::Animation CreateTransition(const Toolkit::TransitionData& transitionData);
/**
* @copydoc Dali::Toolkit::Internal::Control::EmitKeyInputFocusSignal()
*/
/**
* @copydoc Dali::Toolkit::Internal::Control::EmitKeyInputFocusSignal()
*/
- void EmitKeyInputFocusSignal(
bool focusGained
);
+ void EmitKeyInputFocusSignal(
bool focusGained
);
/**
* @brief Apply the current style
/**
* @brief Apply the current style
@@
-151,8
+162,14
@@
public: // From Control
*/
void ApplyThemeStyle();
*/
void ApplyThemeStyle();
-protected:
+public:
+ /**
+ * Enable access to non-native type info from native side
+ * @return The type info that was registered on this type
+ */
+ Dali::TypeInfo GetTypeInfo();
+protected:
/**
* Protected Destructor
* A reference counted object may only be deleted by calling Unreference()
/**
* Protected Destructor
* A reference counted object may only be deleted by calling Unreference()
@@
-160,13
+177,12
@@
protected:
virtual ~ControlWrapper();
private:
virtual ~ControlWrapper();
private:
-
/// @cond internal
/// Undefined.
/// @cond internal
/// Undefined.
- DALI_INTERNAL ControlWrapper(
const ControlWrapper&
);
+ DALI_INTERNAL ControlWrapper(
const ControlWrapper&
);
/// Undefined.
/// Undefined.
- DALI_INTERNAL ControlWrapper& operator=(
const ControlWrapper& rhs
);
+ DALI_INTERNAL ControlWrapper& operator=(
const ControlWrapper& rhs
);
/// @endcond
};
/// @endcond
};
@@
-174,22
+190,22
@@
private:
// Helpers for public-api forwarding methods
// Helpers for public-api forwarding methods
-inline Toolkit::Internal::ControlWrapper& GetControlWrapperImpl(
Toolkit::ControlWrapper& publicObject
)
+inline Toolkit::Internal::ControlWrapper& GetControlWrapperImpl(
Toolkit::ControlWrapper& publicObject
)
{
{
- DALI_ASSERT_ALWAYS(
publicObject
);
+ DALI_ASSERT_ALWAYS(
publicObject
);
Dali::RefObject& handle = publicObject.GetImplementation();
Dali::RefObject& handle = publicObject.GetImplementation();
- return static_cast<Toolkit::Internal::ControlWrapper&>(
handle
);
+ return static_cast<Toolkit::Internal::ControlWrapper&>(
handle
);
}
}
-inline const Toolkit::Internal::ControlWrapper& GetControlWrapperImpl(
const Toolkit::ControlWrapper& publicObject
)
+inline const Toolkit::Internal::ControlWrapper& GetControlWrapperImpl(
const Toolkit::ControlWrapper& publicObject
)
{
{
- DALI_ASSERT_ALWAYS(
publicObject
);
+ DALI_ASSERT_ALWAYS(
publicObject
);
const Dali::RefObject& handle = publicObject.GetImplementation();
const Dali::RefObject& handle = publicObject.GetImplementation();
- return static_cast<const Toolkit::Internal::ControlWrapper&>(
handle
);
+ return static_cast<const Toolkit::Internal::ControlWrapper&>(
handle
);
}
} // namespace Toolkit
}
} // namespace Toolkit