uifw/EikStd/coctlsrc/EIKLBX.CPP
changeset 14 3320e4e6e8bb
parent 0 2f259fa3e83a
--- a/uifw/EikStd/coctlsrc/EIKLBX.CPP	Tue Feb 02 01:00:49 2010 +0200
+++ b/uifw/EikStd/coctlsrc/EIKLBX.CPP	Fri Apr 16 15:13:44 2010 +0300
@@ -73,7 +73,7 @@
 #include <akncollection.h>
 #include <aknitemactionmenu.h>
 #include <aknlongtapdetector.h>
-#include <aknpriv.hrh>
+#include <AknPriv.hrh>
 #include "akntrace.h"
 
 // timeout for long keypress used in markable lists
@@ -2427,8 +2427,6 @@
     if(iItemDrawer && (iItemDrawer->MinimumCellSize().iHeight != 0))
         iItemHeight = iItemDrawer->MinimumCellSize().iHeight;
 
-    CheckCreateExtensionL();
-    
     if ( iListBoxExt->iLongTapDetector
             && iListBoxFlags & EDisableItemSpecificMenu )
         {
@@ -4613,7 +4611,7 @@
     
     // Handle empty list area events
     if ( aPointerEvent.iType == TPointerEvent::EButton1Up &&
-            !iListBoxExt->iScrolling && !iListBoxExt->iIsDownOnItem )
+            !iListBoxExt->iScrolling )
         {
         if ( listEmpty )
             {
@@ -4651,18 +4649,18 @@
             iView->DrawItem( iView->CurrentItemIndex() );
             }
 
-        iListBoxExt->iFeedbackType = ETouchFeedbackList;
+        iListBoxExt->iFeedbackType = ETouchFeedbackBasicItem;
 
         if ( itemIndex != iView->CurrentItemIndex() ||
              iListBoxFlags & ES60StyleMultiselection )
             {
-            iListBoxExt->iFeedbackType = ETouchFeedbackSensitiveList;
+            iListBoxExt->iFeedbackType = ETouchFeedbackSensitiveItem;
             }
 
         if ( iListBoxExt->iPhysics &&
              iListBoxExt->iPhysics->OngoingPhysicsAction() == CAknPhysics::EAknPhysicsActionFlicking )
             {
-            iListBoxExt->iFeedbackType = ETouchFeedbackList;
+            iListBoxExt->iFeedbackType = ETouchFeedbackBasicItem;
             }
         
         if ( !iListBoxExt->iPhysics || itemIndex == iView->CurrentItemIndex() )
@@ -4991,7 +4989,7 @@
             _AKNTRACE("TPointerEvent::EButton1Up");
             if ( iListBoxExt->FeedbackEnabledOnUpEvent() && iListBoxExt->iClickEventsAllowed )
                 {
-                TTouchLogicalFeedback fbType = ETouchFeedbackList;
+                TTouchLogicalFeedback fbType = ETouchFeedbackBasicItem;
                 if ( iListBoxFlags & ES60StyleMultiselection )
                     {
                     fbType = ETouchFeedbackCheckbox;
@@ -6238,7 +6236,7 @@
                     if ( CAknPhysics::EAknPhysicsActionFlicking == iListBoxExt->iPhysics->OngoingPhysicsAction() || 
                          CAknPhysics::EAknPhysicsActionBouncing == iListBoxExt->iPhysics->OngoingPhysicsAction() )
                         {
-                        iListBoxExt->ImmediateFeedback( ETouchFeedbackSensitiveList,
+                        iListBoxExt->ImmediateFeedback( ETouchFeedbackSensitiveItem,
                                                         TTouchFeedbackType( ETouchFeedbackVibra ),
                                                         TPointerEvent() );
                         }
@@ -6356,7 +6354,6 @@
                         {
                         iListBoxExt->iLastDownTappedItem = tappedItemIndex;
                         iListBoxExt->iMarkingDisabled = ETrue;
-                        iListBoxFlags|=ELeftDownInViewRect;                        
                         blockEvent = ETrue;
                         }
                     }