equal
deleted
inserted
replaced
144 if ( aPointerEvent.iType == TPointerEvent::EButton1Up ) |
144 if ( aPointerEvent.iType == TPointerEvent::EButton1Up ) |
145 { |
145 { |
146 iPressedDown = EFalse; |
146 iPressedDown = EFalse; |
147 TPoint adjustedPosition( aPointerEvent.iPosition + TPoint(0, Offset() ) ); |
147 TPoint adjustedPosition( aPointerEvent.iPosition + TPoint(0, Offset() ) ); |
148 TInt item = iPopUpMenuContent->ContainingItem( adjustedPosition ); |
148 TInt item = iPopUpMenuContent->ContainingItem( adjustedPosition ); |
149 if ( item != KNoItemSelected ) |
|
150 { |
|
151 MTouchFeedback* feedback = MTouchFeedback::Instance(); |
|
152 if ( feedback ) |
|
153 { |
|
154 feedback->InstantFeedback( NULL, |
|
155 ETouchFeedbackList, |
|
156 ETouchFeedbackVibra, |
|
157 aPointerEvent ); |
|
158 } |
|
159 } |
|
160 |
149 |
161 TPoint distance( 0, iStartPosition.iY - aPointerEvent.iPosition.iY ); |
150 TPoint distance( 0, iStartPosition.iY - aPointerEvent.iPosition.iY ); |
162 if ( iPhysics->StartPhysics( distance, iStartTime ) ) |
151 if ( iPhysics->StartPhysics( distance, iStartTime ) ) |
163 { |
152 { |
164 return; |
153 return; |
168 if ( !iPanningActivated && |
157 if ( !iPanningActivated && |
169 iPopUpMenuContent->CurrentItem() != KNoItemSelected ) |
158 iPopUpMenuContent->CurrentItem() != KNoItemSelected ) |
170 { |
159 { |
171 if ( iViewRect.Contains( aPointerEvent.iPosition ) ) |
160 if ( iViewRect.Contains( aPointerEvent.iPosition ) ) |
172 { |
161 { |
|
162 if( AknLayoutUtils::PenEnabled() ) |
|
163 { |
|
164 MTouchFeedback* feedback = MTouchFeedback::Instance(); |
|
165 if( feedback ) |
|
166 { |
|
167 feedback->InstantFeedback( NULL, ETouchFeedbackList, |
|
168 ETouchFeedbackVibra, aPointerEvent ); |
|
169 } |
|
170 } |
173 iPopUpMenuContent->SelectItemL( |
171 iPopUpMenuContent->SelectItemL( |
174 iPopUpMenuContent->CurrentItem() ); |
172 iPopUpMenuContent->CurrentItem() ); |
175 } |
173 } |
176 else |
174 else |
177 { |
175 { |