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 "dali-toolkit: update text selection UI handles with selection properties"...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
control
/
control-data-impl.h
diff --git
a/dali-toolkit/internal/controls/control/control-data-impl.h
b/dali-toolkit/internal/controls/control/control-data-impl.h
index
2223215
..
e042113
100755
(executable)
--- a/
dali-toolkit/internal/controls/control/control-data-impl.h
+++ b/
dali-toolkit/internal/controls/control/control-data-impl.h
@@
-125,7
+125,7
@@
public:
* @param[in] object The visual whose resources are ready
* @note Overriding method in Visual::EventObserver.
*/
* @param[in] object The visual whose resources are ready
* @note Overriding method in Visual::EventObserver.
*/
- v
irtual v
oid ResourceReady( Visual::Base& object ) override;
+ void ResourceReady( Visual::Base& object ) override;
/**
* @brief Called when an event occurs.
/**
* @brief Called when an event occurs.
@@
-133,7
+133,7
@@
public:
* @param[in] signalId The signal to emit. See Visual to find supported signals
* @note Overriding method in Visual::EventObserver.
*/
* @param[in] signalId The signal to emit. See Visual to find supported signals
* @note Overriding method in Visual::EventObserver.
*/
- v
irtual v
oid NotifyVisualEvent( Visual::Base& object, Property::Index signalId ) override;
+ void NotifyVisualEvent( Visual::Base& object, Property::Index signalId ) override;
/**
* @copydoc Dali::Toolkit::DevelControl::RegisterVisual()
/**
* @copydoc Dali::Toolkit::DevelControl::RegisterVisual()
@@
-290,9
+290,9
@@
public:
bool IsResourceReady() const;
/**
bool IsResourceReady() const;
/**
- * @copydoc CustomActorImpl::OnS
tag
eDisconnection()
+ * @copydoc CustomActorImpl::OnS
cen
eDisconnection()
*/
*/
- void OnS
tag
eDisconnection();
+ void OnS
cen
eDisconnection();
/**
* @brief Sets the margin.
/**
* @brief Sets the margin.
@@
-336,6
+336,17
@@
public:
*/
DevelControl::VisualEventSignalType& VisualEventSignal();
*/
DevelControl::VisualEventSignalType& VisualEventSignal();
+ /**
+ * @brief Sets the shadow with a property map.
+ * @param[in] map The shadow property map
+ */
+ void SetShadow(const Property::Map& map);
+
+ /**
+ * @brief Clear the shadow.
+ */
+ void ClearShadow();
+
private:
/**
private:
/**
@@
-375,6
+386,16
@@
private:
*/
void RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual, VisualState::Type enabled, DepthIndexValue::Type depthIndexValueSet, int depthIndex = 0 );
*/
void RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual, VisualState::Type enabled, DepthIndexValue::Type depthIndexValueSet, int depthIndex = 0 );
+ /**
+ * @brief Emits the resource ready signal.
+ */
+ void EmitResourceReadySignal();
+
+ /**
+ * @brief Callbacks called on idle.
+ */
+ void OnIdleCallback();
+
public:
Control& mControlImpl;
public:
Control& mControlImpl;
@@
-408,10
+429,13
@@
public:
TooltipPtr mTooltip;
InputMethodContext mInputMethodContext;
TooltipPtr mTooltip;
InputMethodContext mInputMethodContext;
+ CallbackBase* mIdleCallback; ///< The idle callback to emit the resource ready signal.
ControlBehaviour mFlags : CONTROL_BEHAVIOUR_FLAG_COUNT; ///< Flags passed in from constructor.
bool mIsKeyboardNavigationSupported :1; ///< Stores whether keyboard navigation is supported by the control.
bool mIsKeyboardFocusGroup :1; ///< Stores whether the control is a focus group.
ControlBehaviour mFlags : CONTROL_BEHAVIOUR_FLAG_COUNT; ///< Flags passed in from constructor.
bool mIsKeyboardNavigationSupported :1; ///< Stores whether keyboard navigation is supported by the control.
bool mIsKeyboardFocusGroup :1; ///< Stores whether the control is a focus group.
+ bool mIsEmittingResourceReadySignal :1; ///< True during ResourceReady().
+ bool mNeedToEmitResourceReady :1; ///< True if need to emit the resource ready signal again.
RegisteredVisualContainer mRemoveVisuals; ///< List of visuals that are being replaced by another visual once ready
RegisteredVisualContainer mRemoveVisuals; ///< List of visuals that are being replaced by another visual once ready
@@
-431,6
+455,7
@@
public:
static const PropertyRegistration PROPERTY_12;
static const PropertyRegistration PROPERTY_13;
static const PropertyRegistration PROPERTY_14;
static const PropertyRegistration PROPERTY_12;
static const PropertyRegistration PROPERTY_13;
static const PropertyRegistration PROPERTY_14;
+ static const PropertyRegistration PROPERTY_15;
};
};