From: “Bumseung Date: Tue, 2 Apr 2013 01:58:16 +0000 (+0900) Subject: [P130329-8999] Touch sound problem on messagebox is fixed. X-Git-Tag: accepted/tizen_2.1/20130425.033138~551^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=94aa5b2e209d54cd0fe6091dc906f6b348153554;p=platform%2Fframework%2Fnative%2Fuifw.git [P130329-8999] Touch sound problem on messagebox is fixed. Change-Id: Ib5ccfd00ac2a9b51823fdd7ba1181261a2981b04 Signed-off-by: “Bumseung --- diff --git a/src/ui/FUi_ResourceManager.cpp b/src/ui/FUi_ResourceManager.cpp index 03b3fb0..235c1d7 100755 --- a/src/ui/FUi_ResourceManager.cpp +++ b/src/ui/FUi_ResourceManager.cpp @@ -1624,10 +1624,16 @@ _ResourceManager::AcquireFeedback(void) void _ResourceManager::ReleaseFeedback(void) { - --__feedbackAcquireCount >0; + __feedbackAcquireCount >0 ? --__feedbackAcquireCount : __feedbackAcquireCount = 0; if(__feedbackAcquireCount == 0) { __feedbackStatus = _RESOURCE_FEEDBACK_STATUS_INIT; } } +void +_ResourceManager::ResetFeedback(void) +{ + __feedbackAcquireCount = 0; + __feedbackStatus = _RESOURCE_FEEDBACK_STATUS_INIT; +} }}//Tizen::Ui diff --git a/src/ui/FUi_TouchManager.cpp b/src/ui/FUi_TouchManager.cpp index 2d0aa59..6acfd5e 100644 --- a/src/ui/FUi_TouchManager.cpp +++ b/src/ui/FUi_TouchManager.cpp @@ -32,6 +32,7 @@ #include "FUi_Control.h" #include "FUi_TouchManager.h" #include "FUi_ControlImpl.h" +#include "FUi_ResourceManager.h" using namespace Tizen::Base::Collection; using namespace Tizen::Graphics; @@ -859,6 +860,7 @@ _TouchManager::SetTouchCanceled(bool canceled, bool onlyTouchEvent) delete pFingerInfoList; } SetLastResult(E_SUCCESS); + _ResourceManager::GetInstance()->ResetFeedback(); } } diff --git a/src/ui/inc/FUi_ResourceManager.h b/src/ui/inc/FUi_ResourceManager.h index 508607c..57cf243 100644 --- a/src/ui/inc/FUi_ResourceManager.h +++ b/src/ui/inc/FUi_ResourceManager.h @@ -182,6 +182,8 @@ public: bool IsFeedbackPlayed(void); void AcquireFeedback(void); void ReleaseFeedback(void); + void ResetFeedback(void); + private: _ResourceManager(void); ~_ResourceManager(void);