equal
deleted
inserted
replaced
4273 if ( iListBoxObserver ) |
4273 if ( iListBoxObserver ) |
4274 { |
4274 { |
4275 TBool allowed = ETrue; |
4275 TBool allowed = ETrue; |
4276 |
4276 |
4277 if ( iListBoxExt && iListBoxExt->iPhysics |
4277 if ( iListBoxExt && iListBoxExt->iPhysics |
4278 && aEvent != MEikListBoxObserver::EEventFlickStopped ) |
4278 && aEvent != MEikListBoxObserver::EEventFlickStopped |
|
4279 && aEvent != MEikListBoxObserver::EEventFlickStarted ) |
4279 { |
4280 { |
4280 allowed = iListBoxExt->iClickEventsAllowed; |
4281 allowed = iListBoxExt->iClickEventsAllowed; |
4281 } |
4282 } |
4282 |
4283 |
4283 if ( MarkingMode() && allowed ) |
4284 if ( MarkingMode() && allowed ) |
5147 iListBoxExt->iIsDownOnItem = pointerIsOverAnItem; |
5148 iListBoxExt->iIsDownOnItem = pointerIsOverAnItem; |
5148 iListBoxExt->iLastPoint = pointerPos; |
5149 iListBoxExt->iLastPoint = pointerPos; |
5149 |
5150 |
5150 // update index of the last down tapped item |
5151 // update index of the last down tapped item |
5151 iListBoxExt->iLastDownTappedItem = itemIndex; |
5152 iListBoxExt->iLastDownTappedItem = itemIndex; |
|
5153 iListBoxExt->iMarkableListShiftKeyPressed = EFalse; |
5152 |
5154 |
5153 if ((! (Rect().Contains(aPointerEvent.iPosition))) && (iListBoxFlags & EPopout)) |
5155 if ((! (Rect().Contains(aPointerEvent.iPosition))) && (iListBoxFlags & EPopout)) |
5154 { |
5156 { |
5155 ReportEventL(MCoeControlObserver::EEventRequestCancel); |
5157 ReportEventL(MCoeControlObserver::EEventRequestCancel); |
5156 iListBoxExt->iEventModifiers = 0; |
5158 iListBoxExt->iEventModifiers = 0; |
5310 { |
5312 { |
5311 iListBoxExt->iMarkableListShiftKeyPressed = EFalse; |
5313 iListBoxExt->iMarkableListShiftKeyPressed = EFalse; |
5312 } |
5314 } |
5313 } |
5315 } |
5314 |
5316 |
5315 if ( itemIndex == oldCurrentItemIndex ) |
5317 if ( itemIndex == oldCurrentItemIndex && !iListBoxExt->iSingleClickEnabled ) |
5316 { |
5318 { |
5317 if ( shiftKeyPressed ) |
5319 if ( shiftKeyPressed ) |
5318 { |
5320 { |
5319 #ifdef RD_UI_TRANSITION_EFFECTS_LIST |
5321 #ifdef RD_UI_TRANSITION_EFFECTS_LIST |
5320 iListBoxExt->iAnchor = oldCurrentItemIndex; |
5322 iListBoxExt->iAnchor = oldCurrentItemIndex; |
7148 |
7150 |
7149 iView->SetItemIndex( aItemIndex ); |
7151 iView->SetItemIndex( aItemIndex ); |
7150 |
7152 |
7151 if ( iListBoxExt && iListBoxExt->iMarkableListMarking ) |
7153 if ( iListBoxExt && iListBoxExt->iMarkableListMarking ) |
7152 { |
7154 { |
7153 if ( iListBoxExt->iMarkableListShiftKeyPressed ) |
7155 if ( iListBoxExt->iSingleClickEnabled ) |
|
7156 { |
|
7157 if ( iListBoxExt->iMarkableListShiftKeyPressed ) |
|
7158 { |
|
7159 iView->ToggleItemL( iView->CurrentItemIndex() ); |
|
7160 iListBoxExt->iClickEventsAllowed = EFalse; |
|
7161 } |
|
7162 } |
|
7163 else if ( iListBoxExt->iMarkableListShiftKeyPressed ) |
7154 { |
7164 { |
7155 #ifdef RD_UI_TRANSITION_EFFECTS_LIST |
7165 #ifdef RD_UI_TRANSITION_EFFECTS_LIST |
7156 iListBoxExt->iAnchor = oldCurrentItemIndex; |
7166 iListBoxExt->iAnchor = oldCurrentItemIndex; |
7157 iListBoxExt->iSelect = |
7167 iListBoxExt->iSelect = |
7158 !iView->ItemIsSelected( iView->CurrentItemIndex() ); |
7168 !iView->ItemIsSelected( iView->CurrentItemIndex() ); |