#include <dali-toolkit/internal/feedback/feedback-style.h>
// EXTERNAL INCLUDES
+#include <dali/public-api/common/vector-wrapper.h>
#include <dali/integration-api/debug.h>
#include <dali/public-api/common/stage.h>
#include <dali/public-api/object/object-registry.h>
static const FeedbackStyleInfo DEFAULT_FEEDBACK_STYLE_INFO;
FeedbackStyle::FeedbackStyle()
-: mConnections( this )
{
mFeedback = Dali::FeedbackPlayer::Get();
void FeedbackStyle::StyleChanged( const std::string& userDefinedThemePath, Dali::StyleChange::Type styleChange )
{
- if( StyleChange::THEME_CHANGE )
+ if( styleChange == StyleChange::THEME_CHANGE )
{
string userDefinedTheme;
DALI_ASSERT_ALWAYS(type && TreeNode::STRING == type->GetType() && "Signal must have a type");
signalFeedbackInfo.mSignalName = type->GetString();
- GetIfString( (*signalIter).second, "haptic-feedback-pattern",
+ GetIfString( (*signalIter).second, "hapticFeedbackPattern",
signalFeedbackInfo.mHasHapticFeedbackInfo,
signalFeedbackInfo.mHapticFeedbackPattern );
- GetIfString( (*signalIter).second, "haptic-feedback-file",
+ GetIfString( (*signalIter).second, "hapticFeedbackFile",
signalFeedbackInfo.mHasHapticFeedbackInfo,
signalFeedbackInfo.mHapticFeedbackFile );
- GetIfString( (*signalIter).second, "sound-feedback-pattern",
+ GetIfString( (*signalIter).second, "soundFeedbackPattern",
signalFeedbackInfo.mHasSoundFeedbackInfo,
signalFeedbackInfo.mSoundFeedbackPattern );
- GetIfString( (*signalIter).second, "haptic-feedback-file",
+ GetIfString( (*signalIter).second, "hapticFeedbackFile",
signalFeedbackInfo.mHasSoundFeedbackInfo,
signalFeedbackInfo.mSoundFeedbackFile );