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
[dali_2.3.25] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
feedback
/
feedback-style.cpp
diff --git
a/dali-toolkit/internal/feedback/feedback-style.cpp
b/dali-toolkit/internal/feedback/feedback-style.cpp
index
1e8607e
..
a5ed3b1
100644
(file)
--- a/
dali-toolkit/internal/feedback/feedback-style.cpp
+++ b/
dali-toolkit/internal/feedback/feedback-style.cpp
@@
-94,8
+94,6
@@
struct FeedbackStyleInfo
SignalFeedbackInfoContainer mSignalFeedbackInfoList;
};
SignalFeedbackInfoContainer mSignalFeedbackInfoList;
};
-static const FeedbackStyleInfo DEFAULT_FEEDBACK_STYLE_INFO;
-
FeedbackStyle::FeedbackStyle()
{
mFeedback = Dali::FeedbackPlayer::Get();
FeedbackStyle::FeedbackStyle()
{
mFeedback = Dali::FeedbackPlayer::Get();
@@
-180,6
+178,7
@@
const FeedbackStyleInfo& FeedbackStyle::GetStyleInfo(const std::string& type) co
}
else
{
}
else
{
+ static const FeedbackStyleInfo DEFAULT_FEEDBACK_STYLE_INFO;
return DEFAULT_FEEDBACK_STYLE_INFO;
}
}
return DEFAULT_FEEDBACK_STYLE_INFO;
}
}