MCL/sf/mw/classicui: comparison uifw/ganes/src/HgScroller.cpp

equal deleted inserted replaced

-:3d340a0166ff
+:941195f2d488
 #include <aknitemactionmenu.h>
 #include <aknappui.h>
 #include <featdiscovery.h>
-const TInt KIntensity = 100; // 100%
 // ============================ MEMBER FUNCTIONS ===============================
 // -----------------------------------------------------------------------------
 // CHgScroller::ConstructL()
 // Symbian 2nd phase constructor can leave.
 :  iDefaultIcon( aDefaultIcon ),
 iItemCount(aItemCount),
 iCurrentRow(-1),
 iSelectedIndex(KErrNotFound),
 iScrollBarType( EHgScrollerScrollBar ),
-iFirstTime(ETrue)
+iFirstTime(ETrue),
+iOldWinPos(KErrNotFound)
 {
 // No implementation required
 }
 // -----------------------------------------------------------------------------
 TSize(iWidth, iHeight),
 iLandscapeScrolling);
 }
 // -----------------------------------------------------------------------------
-// CHgGrid::Draw()
+// CHgScroller::Draw()
 // Draws the display.
 // -----------------------------------------------------------------------------
 //
 void CHgScroller::Draw ( const TRect& aRect ) const
 {
 if( iDetector
 && iSelectedIndex != KErrNotFound
 && !HasHighlight()
 && iActionMenu->InitMenuL() )
+{
 iDetector->PointerEventL( aEvent );
+}
 }
 // Drag
 else if( aEvent.iType == TPointerEvent::EDrag && iPointerDown )
 {
 HandleDragEventL( aEvent );
 if ( feedback )
 {
 feedback->InstantFeedback( this, ETouchFeedbackSlider, aEvent );
 }
 }
-// Drag
-else if( aEvent.iType == TPointerEvent::EDrag
-&& iScrollbar->IsDragging() )
-{
-// Smooth continuous tactile feedback is produced
-// during thumb dragging. The tactile feedback API
-// filters out possible re-startings of the effect.
-if ( feedback )
-{
-TTimeIntervalMicroSeconds32 timeout( 300000 );
-feedback->StartFeedback( this,
-ETouchContinuousSlider,
-&aEvent,
-KIntensity, // intensity
-timeout );
-}
-}
-// End drag
 else if( aEvent.iType == TPointerEvent::EButton1Up )
 {
 // Stop the continuous tactile feedback that may be playing
 // at the time due to possible previous thumb dragging.
 if ( feedback )
 {
 LaunchHighlightTimer();
 }
 else if( !iPanning )
 {
+// to get Handle Selected to be called for sure in single touch
+iSelectedIndex = KErrNotFound;
 SetHighlightL();
 }
 MTouchFeedback* feedback = MTouchFeedback::Instance();
 if ( feedback && iSelectedIndex != KErrNotFound )
 {
 delta = delta < 0 ? -delta : delta;
 iPanning = delta >= iPhysics->DragThreshold();
 }
+//if user has dragged onto another item
+if( !iPanning && GetSelected(iStart) != GetSelected(aEvent.iPosition) )
+{
+// after setting iPanning true, longtap is cancelled
+iPanning = ETrue;
+}
 if( prevPanning != iPanning )
+{
+iPrev = aEvent.iPosition;
 DrawDeferred(); // to clear highlight
+}
 if(iPanning)
 {
 TPoint delta = iPrev - aEvent.iPosition;
 if(iLandscapeScrolling && AknLayoutUtils::LayoutMirrored())
 {
 if(iItemCount)
 {
 iItems.ResetAndDestroy();
 iItemCount = 0;
-iSelectedIndex = -1;
+iSelectedIndex = KErrNotFound;
 if( iManager )
 {
 iManager->ResetBuffer( iSelectedIndex, iItemCount );
 }
 // -----------------------------------------------------------------------------
 //
 void CHgScroller::HandleGainingForeground()
 {
 iSelectionMode = ENoSelection;
-TRect rect( PositionRelativeToScreen(), Size() );
-TRAP_IGNORE( InitScreenL( rect ); )
 iScrollbar->Reset();
 }
 // -----------------------------------------------------------------------------
 // CHgScroller::HandleLosingForeground()
 // -----------------------------------------------------------------------------
 //
 void CHgScroller::HandleLosingForeground()
 {
-iPointerDown = EFalse;
+if( iOldWinPos == KErrNotFound
+|| iOldWinPos == DrawableWindow()->OrdinalPosition() )
+{
+iPointerDown = EFalse;
+}
 iPopupText1.Zero();
 iPopupText2.Zero();
 }
 // ---------------------------------------------------------------------------
 TInt index = GetSelected(iStart);
 if((index != KErrNotFound || !HasHighlight())
 && iPointerDown )
 {
-iSelectionToFocusedItem = index == iSelectedIndex;
+iSelectionToFocusedItem = (index == iSelectedIndex);
 iSelectedIndex = index;
 iFocusedIndex = index;
 // Selection has changed to valid item
 if( !iSelectionToFocusedItem && iSelectedIndex != KErrNotFound )
 {
 // When skin changes the indicator icons must be reloaded.
 if ( aType == KAknsMessageSkinChange )
 {
 delete iIndicatorManager; iIndicatorManager = NULL;
 iIndicatorManager = CHgIndicatorManager::NewL();
+delete iScrollbar; iScrollbar = NULL;
+iScrollbar = CHgScrollbar::NewL(*this);
+InitScrollbarL();
 InitGraphicsL();
 }
 )
 }
 void CHgScroller::HandleLongTapEventL( const TPoint& /*aPenEventLocation*/,
 const TPoint& aPenEventScreenLocation)
 {
 if( iActionMenu )
 {
+iOldWinPos = DrawableWindow()->OrdinalPosition();
+iActionMenu->ShowMenuL(aPenEventScreenLocation);
 iPointerDown = EFalse;
-iActionMenu->ShowMenuL(aPenEventScreenLocation);
 }
 }
 // ---------------------------------------------------------------------------
 // CHgScroller::CollectionState()
 //
 TUint CHgScroller::CollectionState() const
 {
 TUint ret = 0;
-if(IsFocused()) ret |= MAknCollection::EStateCollectionVisible;
+if( IsFocused() )
+{
-if(HasHighlight()) ret |= MAknCollection::EStateHighlightVisible;
+ret |= MAknCollection::EStateCollectionVisible;
+}
-if( iFlags & EHgScrollerSelectionMode ) ret |= MAknCollection::EStateMultipleSelection;
+if( HasHighlight() )
+{
+ret |= MAknCollection::EStateHighlightVisible;
+}
+if( iFlags & EHgScrollerSelectionMode )
+{
+ret |= MAknCollection::EStateMultipleSelection;
+for( TInt i = 0; i < iItems.Count(); ++i )
+{
+if( iItems[i]->Flags() & CHgItem::EHgItemFlagMarked )
+{
+ret |= MAknCollection::EStateMarkedItems;
+break;
+}
+}
+}
 return ret;
 }
 // ---------------------------------------------------------------------------
 // CHgScroller::CollectionState()
 // ---------------------------------------------------------------------------
 //
 void CHgScroller::ItemActionMenuClosed()
 {
+iOldWinPos = KErrNotFound;
 DrawDeferred();
 }
 // ---------------------------------------------------------------------------
 // CHgScroller::CollectionState()

branch	RCL_3
changeset 12	941195f2d488
parent 10	3d340a0166ff
child 13	a8834a2e9a96