Revision: 201017 RCL_3
authorDremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
Tue, 11 May 2010 16:42:11 +0300
branchRCL_3
changeset 14 03228bb411ae
parent 12 1ff7a906e138
child 15 125793e17004
Revision: 201017 Kit: 201019
mulwidgets/alfscrollbarwidget/src/alfscrollbarcontrol.cpp
mulwidgets/mulcoverflowwidget/src/mulcoverflowcontrol.cpp
mulwidgets/mulsliderwidget/src/mulslidercontrol.cpp
--- a/mulwidgets/alfscrollbarwidget/src/alfscrollbarcontrol.cpp	Tue Apr 27 17:11:16 2010 +0300
+++ b/mulwidgets/alfscrollbarwidget/src/alfscrollbarcontrol.cpp	Tue May 11 16:42:11 2010 +0300
@@ -102,7 +102,7 @@
   {
     CCoeControl* ccoecntrl = static_cast<CCoeControl*>(Display()->ObjectProvider());
     TInt intensity = 50;
-    TTimeIntervalMicroSeconds32 timespan = 1000000;
+    TTimeIntervalMicroSeconds32 timespan = 400000;
     mTactilefdbInstance->StartFeedback(ccoecntrl,ETouchContinuousSlider,&aEvent.PointerEvent(),intensity,timespan);
     mDragTactileFeedbackStarted = true;
   }
--- a/mulwidgets/mulcoverflowwidget/src/mulcoverflowcontrol.cpp	Tue Apr 27 17:11:16 2010 +0300
+++ b/mulwidgets/mulcoverflowwidget/src/mulcoverflowcontrol.cpp	Tue May 11 16:42:11 2010 +0300
@@ -1287,6 +1287,7 @@
         	{
         	MUL_LOG_INFO("MUL::MulCoverFlowControl:HandleNormalGestureEvents EGestureTap ");
             HandleSingleTap(aEvent); 
+            mFeedback->InstantFeedback(ETouchFeedbackList);
             break;   
         	}
         
@@ -1317,7 +1318,7 @@
                 }
             doubleTapData.mDoubleTapPoint = aEvent.CurrentPos();
             
-            mFeedback->InstantFeedback(ETouchFeedbackBasic); 
+            mFeedback->InstantFeedback(ETouchFeedbackList); 
             CAlfWidgetControl::processEvent ( TAlfEvent ( ETypeDoubleTap,
                     uint(&doubleTapData)));
             break;  
@@ -1367,6 +1368,7 @@
            {
             MUL_LOG_INFO("MUL::MulCoverFlowControl:HandleNormalGestureEvents EGestureMultiTouchStart");
             mData->mBaseElement->StopDoodling(0);
+            mFeedback->InstantFeedback(ETouchFeedbackMultiTouchRecognized);
             break;
           }
         case EGestureMultiTouchReleased:
@@ -1379,8 +1381,7 @@
         case EGestureReleased:
         	{
         	 MUL_LOG_INFO("MUL::MulCoverFlowControl:HandleNormalGestureEvents EGestureReleased");
-        	 mFeedback->InstantFeedback(ETouchFeedbackBasic);
-         	 break;
+        	 break;
 			}
         default:
             break;
@@ -1525,7 +1526,7 @@
     CAlfVisual* hitVisual = aEvent.Visual();
     if((hitVisual && hitVisual->Tag() == KCoverflowIcon) || (mData->mCoverFlow2DTemplate->IsUiOnOffFlagEnabled() )) 
         {
-        mFeedback->InstantFeedback(ETouchFeedbackBasic);  
+        mFeedback->InstantFeedback(ETouchFeedbackList);  
         }    
     }
 // ---------------------------------------------------------------------------
@@ -1586,9 +1587,10 @@
 		HandleNavigationEvent( event );
 		env.SetRefreshMode(oldRefreshMode);			
 		}
-	// Commented feedback for swipe event
-	//mFeedback->InstantFeedback(ETouchFeedbackBasic);
+	
 	HandleNavigationEvent( event );
+	// Feedback for swipe event
+	mFeedback->InstantFeedback(ETouchFeedbackList);
     }
 
 // ---------------------------------------------------------------------------	
--- a/mulwidgets/mulsliderwidget/src/mulslidercontrol.cpp	Tue Apr 27 17:11:16 2010 +0300
+++ b/mulwidgets/mulsliderwidget/src/mulslidercontrol.cpp	Tue May 11 16:42:11 2010 +0300
@@ -248,7 +248,7 @@
   {
     CCoeControl* ccoecntrl = static_cast<CCoeControl*>(Display()->ObjectProvider());
     TInt intensity = 50;
-    TTimeIntervalMicroSeconds32 timespan = 1000000;
+    TTimeIntervalMicroSeconds32 timespan = 400000;
     mTactilefdbInstance->StartFeedback(ccoecntrl,ETouchContinuousSlider,&aEvent.PointerEvent(),intensity,timespan);
     mDragTactileFeedbackStarted = true;
    }