equal
deleted
inserted
replaced
128 aFeedback == ETouchFeedbackSubMenuClosed ) && |
128 aFeedback == ETouchFeedbackSubMenuClosed ) && |
129 ( iLastFeedback == ETouchFeedbackBasicButton || |
129 ( iLastFeedback == ETouchFeedbackBasicButton || |
130 iLastFeedback == ETouchFeedbackSensitiveButton || |
130 iLastFeedback == ETouchFeedbackSensitiveButton || |
131 iLastFeedback == ETouchFeedbackSensitiveList || |
131 iLastFeedback == ETouchFeedbackSensitiveList || |
132 iLastFeedback == ETouchFeedbackList || |
132 iLastFeedback == ETouchFeedbackList || |
133 iLastFeedback == ETouchFeedbackCheckbox ) ) |
133 iLastFeedback == ETouchFeedbackCheckbox ) ); |
134 || ( |
|
135 aFeedback == ETouchFeedbackPopUp && |
|
136 (iLastFeedback == ETouchFeedbackIncreasingPopUp || |
|
137 iLastFeedback == ETouchFeedbackOptionsMenuOpened || |
|
138 iLastFeedback == ETouchFeedbackSubMenuOpened) |
|
139 ); |
|
140 } |
134 } |
141 |
135 |
142 // --------------------------------------------------------------------------- |
136 // --------------------------------------------------------------------------- |
143 // We play feedback in case all three conditions are met: |
137 // We play feedback in case all three conditions are met: |
144 // |
138 // |
170 willPlay = ETrue; |
164 willPlay = ETrue; |
171 } |
165 } |
172 else if ( IsHigherThanPlaying( aFeedback ) ) |
166 else if ( IsHigherThanPlaying( aFeedback ) ) |
173 { |
167 { |
174 willPlay = ETrue; |
168 willPlay = ETrue; |
|
169 StopFeedback(); |
175 } |
170 } |
176 |
171 |
177 if ( willPlay ) |
172 if ( willPlay ) |
178 { |
173 { |
179 // First store the timestamp of this feedback playing moment. |
174 // First store the timestamp of this feedback playing moment. |
372 iHapticsPlayer->ModifyFeedback( aIntensity ); |
367 iHapticsPlayer->ModifyFeedback( aIntensity ); |
373 } |
368 } |
374 } |
369 } |
375 |
370 |
376 // --------------------------------------------------------------------------- |
371 // --------------------------------------------------------------------------- |
377 // Stop continuous feedback. |
372 // Stop feedback. |
378 // --------------------------------------------------------------------------- |
373 // --------------------------------------------------------------------------- |
379 // |
374 // |
380 void CTactileFeedbackResolver::StopFeedback() |
375 void CTactileFeedbackResolver::StopFeedback() |
381 { |
376 { |
382 if ( iHapticsPlayer ) |
377 if ( iHapticsPlayer ) |