FCL/sf/mw/hb: comparison src/hbplugins/feedback/feedbackeffectplugin/hbfeedbackeffectengine.cpp

equal deleted inserted replaced

-:f7ac710697a9
+:06ff229162e9
 ****************************************************************************/
 #include "hbfeedbackeffectengine.h"
 #include "hbfeedbackeffectutils.h"
-#include <hbfeedbackplayer.h>
 #include <hbinstantfeedback.h>
 #include <hbcontinuousfeedback.h>
 #include <hbwidget.h>
 #include <hbabstractitemview.h>
 #include <hbabstractedit.h>
 #include "hbmenucontainer_p.h"
 #include "hbinputvirtualrocker.h"
 #include <hbnamespace_p.h>
-/*!
+/*
 Constructor
 */
 HbFeedbackEffectEngine::HbFeedbackEffectEngine() : activelyScrollingItemView(0), previousCursorPosition(0)
 {
-// initialize
+instantFeedback = new HbInstantFeedback(HbFeedback::None);
-HbFeedbackPlayer::instance();
+}
-}
+/*
-/*!
 Destructor
 */
 HbFeedbackEffectEngine::~HbFeedbackEffectEngine()
 {
-if (hbFeedbackPlayer) {
+if(instantFeedback)
-foreach(int identifier, continuousFeedbacks) {
+delete instantFeedback;
-hbFeedbackPlayer->cancelContinuousFeedback(identifier);
+foreach(HbContinuousFeedback *feedback, continuousFeedbacks) {
-}
+feedback->stop();
+delete feedback;
 }
 continuousFeedbacks.clear();
 boundaryWidgets.clear();
 }
 bool HbFeedbackEffectEngine::widgetOverridesModalities(const HbWidget *widget,Hb::ContinuousInteraction interaction) {
 return (widget == overrider.widget && overrider.overridesModalities && overrider.continuousInteraction == interaction);
 }
-/*!
+/*
 Called by the feedback manager when an interaction is triggered.
 */
 void HbFeedbackEffectEngine::triggered(const HbWidget *widget, Hb::InstantInteraction interaction, Hb::InteractionModifiers modifiers)
 {
 // use default values for unspecified effect/modalities
 HbFeedbackEngine::triggered(widget,interaction,modifiers);
 }
 }
-/*!
+/*
 Called by the feedback manager when a widget is pressed.
 */
 void HbFeedbackEffectEngine::pressed(const HbWidget *widget)
 {
 HbFeedback::InstantEffect effect = HbFeedback::None;
 }
 playInstantFeedback(widget, effect, modalities);
 }
-/*!
+/*
 Called by the feedback manager when a widget is released.
 */
 void HbFeedbackEffectEngine::released(const HbWidget *widget)
 {
 HbFeedback::InstantEffect effect = HbFeedback::None;
 playInstantFeedback(widget,effect, modalities);
 // normally touch end feedback effect is initiated with a clicked signal
 }
-/*!
+/*
 Called by the feedback manager when a long press is detected for a widget.
 */
 void HbFeedbackEffectEngine::longPressed(const HbWidget *widget)
 {
 HbFeedback::InstantEffect effect = HbFeedback::None;
 if(widgetOverridesEffect(widget, interaction)) {
 effect = overrider.newInstantEffect;
 } else {
 effect = HbFeedback::None;
-if (widget->type() == Hb::ItemType_InputCharacterButton) {
+if (widget->type() == Hb::ItemType_InputButtonGroup) {
 effect = HbFeedback::SensitiveKeypad;
 }
 else {
 effect = HbFeedback::LongPress;
 }
 playInstantFeedback(widget, effect, modalities);
 }
-/*!
+/*
 Called by the feedback manager when a widget is clicked.
 */
 void HbFeedbackEffectEngine::clicked(const HbWidget *widget)
 {
 HbFeedback::InstantEffect effect = HbFeedback::None ;
 }
 playInstantFeedback(widget, effect, modalities);
 }
-/*!
+/*
 Called by the feedback manager when keyrepeats are detected for a widget.
 */
 void HbFeedbackEffectEngine::keyRepeated(const HbWidget *widget)
 {
 HbFeedback::InstantEffect effect = HbFeedback::None ;
 }
 playInstantFeedback(widget, effect, modalities);
 }
-/*!
+/*
 Called by the feedback manager when a dragged over event is detected for a widget.
 */
 void HbFeedbackEffectEngine::draggedOver(const HbWidget *widget)
 {
 HbFeedback::InstantEffect effect = HbFeedback::None ;
 }
 playInstantFeedback(widget, effect, modalities);
 }
-/*!
+/*
 Called by the feedback manager when a widget is flicked.
 */
 void HbFeedbackEffectEngine::flicked(const HbWidget *widget)
 {
 HbFeedback::InstantEffect effect = HbFeedback::None ;
 }
 playInstantFeedback(widget, effect, modalities);
 }
-/*!
+/*
 Called by the feedback manager when a scroll area widget is flicked or dragged and the boundary reached.
 */
 void HbFeedbackEffectEngine::boundaryReached(const HbWidget *widget)
 {
 boundaryWidgets.append(widget);
 }
-/*!
+/*
 Called by the feedback manager when a rotate gesture is recognized for a widget.
 */
 void HbFeedbackEffectEngine::rotated90Degrees(const HbWidget *widget)
 {
 HbFeedback::InstantEffect effect = HbFeedback::None ;
 }
 playInstantFeedback(widget, effect, modalities);
 }
-/*!
+/*
 Called by the feedback manager when a popup opens.
 */
 void HbFeedbackEffectEngine::popupOpened(const HbWidget *widget)
 {
 HbFeedback::Modalities modalities = 0 ;
 playInstantFeedback(widget, HbFeedback::PopupOpen, modalities);
 }
 }
 }
-/*!
+/*
 Called by the feedback manager when a popup closes.
 */
 void HbFeedbackEffectEngine::popupClosed(const HbWidget *widget)
 {
 HbFeedback::Modalities modalities = 0 ;
 playInstantFeedback(widget, HbFeedback::PopupClose, modalities);
 }
 }
 }
-/*!
+/*
 Called by the feedback manager when an item view selection has changed.
 */
 void HbFeedbackEffectEngine::selectionChanged(const HbWidget *widget)
 {
 HbFeedback::InstantEffect effect = HbFeedback::None ;
 }
 playInstantFeedback(widget, effect, modalities);
 }
-/*!
+/*
 Called by the feedback manager when multitouch is activated.
 */
 void HbFeedbackEffectEngine::multitouchActivated(const HbWidget *widget)
 {
 HbFeedback::InstantEffect effect = HbFeedback::None ;
 }
 playInstantFeedback(widget, effect, modalities);
 }
-/*!
+/*
 Called by the feedback manager when a continuous interaction is triggered.
 */
 void HbFeedbackEffectEngine::continuousTriggered(const HbWidget *widget, Hb::ContinuousInteraction interaction, QPointF delta)
 {
 HbFeedback::ContinuousEffect effect = HbFeedback::ContinuousNone ;
 }
 if (widget != activelyScrollingItemView){
 activelyScrollingItemView = widget;
 newItemFound = false;
 }
+// To prevent the uninitialized list to cause false new item detections
+if (oldVisibleIndexes.empty()) {
+newItemFound = false;
+}
 oldVisibleIndexes.clear();
 oldVisibleIndexes = visibleIndexes;
 if (newItemFound) {
 const HbListView* listView = qobject_cast<const HbListView*>(widget);
 }
 }
 }
-/*!
+/*
 Called by the feedback manager when a continuous interaction is stopped.
 */
 void HbFeedbackEffectEngine::continuousStopped(const HbWidget *widget, Hb::ContinuousInteraction interaction)
 {
 HbFeedback::InstantEffect effect = HbFeedback::None;
 }
 playInstantFeedback(widget, effect, modalities);
 }
 }
-/*!
+/*
 Plays the instant feedback.
 */
 void HbFeedbackEffectEngine::playInstantFeedback(const HbWidget* widget, HbFeedback::InstantEffect effect, HbFeedback::Modalities modalities)
 {
 const QGraphicsView* view = widget->mainWindow();
+if (view && HbFeedbackEffectUtils::isFeedbackAllowed(widget) && instantFeedback) {
+instantFeedback->setInstantEffect(effect);
+instantFeedback->setRect(widget, view);
+instantFeedback->setOwningWindow(view);
+instantFeedback->setModalities(modalities);
+if (instantFeedback->isLocated()) {
+instantFeedback->play();
+}
+}
+}
+/*
+Plays the continuous feedback.
+*/
+void HbFeedbackEffectEngine::playContinuousFeedback(const HbWidget* widget, HbFeedback::ContinuousEffect effect, int intensity, HbFeedback::Modalities modalities)
+{
+const QGraphicsView* view = widget->mainWindow();
+// if feedback can be played
 if (view && HbFeedbackEffectUtils::isFeedbackAllowed(widget)) {
-HbInstantFeedback feedback(effect);
-feedback.setRect(widget, view);
+// if this widget has been playing
-feedback.setOwningWindow(view);
+if (continuousFeedbacks.contains(widget)) {
-feedback.setModalities(modalities);
+HbContinuousFeedback* feedback = continuousFeedbacks.value(widget);
-if (hbFeedbackPlayer && feedback.isLocated()) {
+// if this feedback is already playing then only its effect and intensity are updated
-hbFeedbackPlayer->playInstantFeedback(feedback);
+feedback->setModalities(modalities);
-}
+feedback->setOwningWindow(view);
-}
+feedback->setRect(widget, view);
-}
+feedback->setContinuousEffect(effect);
+feedback->setIntensity(intensity);
-/*!
+// if this feedback is not being played, play it
-Plays the continuous feedback.
+if (!feedback->isPlaying()) {
-*/
+feedback->play();
-void HbFeedbackEffectEngine::playContinuousFeedback(const HbWidget* widget, HbFeedback::ContinuousEffect effect, int intensity, HbFeedback::Modalities modalities)
+}
-{
+} else {
-const QGraphicsView* view = widget->mainWindow();
+// this widget has not played anything before
-if (view && HbFeedbackEffectUtils::isFeedbackAllowed(widget)) {
+HbContinuousFeedback *feedback = new HbContinuousFeedback();
-HbContinuousFeedback feedback(effect,view);
+feedback->setModalities(modalities);
-feedback.setRect(widget, view);
+feedback->setOwningWindow(view);
-feedback.setIntensity(intensity);
+feedback->setRect(widget, view);
-feedback.setModalities(modalities);
+feedback->setContinuousEffect(effect);
+feedback->setIntensity(intensity);
-if (hbFeedbackPlayer && feedback.isLocated()) {
+continuousFeedbacks.insert(widget, feedback);
-// if continuous feedback is still active and not stopped by continuous feedback timeout
+feedback->play();
-if (continuousFeedbacks.contains(widget)
+}
-&& hbFeedbackPlayer->continuousFeedbackOngoing(continuousFeedbacks.value(widget))) {
+}
-hbFeedbackPlayer->updateContinuousFeedback(continuousFeedbacks.value(widget), feedback);
+}
-} else {
-// if timeout has happened remove the item from the map storing continuous feedback identifiers
+/*
-if (continuousFeedbacks.contains(widget)) {
-continuousFeedbacks.remove(widget);
-}
-// create a new continuous feedback
-continuousFeedbacks.insert(widget, hbFeedbackPlayer->startContinuousFeedback(feedback));
-}
-}
-}
-}
-/*!
 Cancels the playing of a continuous feedback.
 */
 void HbFeedbackEffectEngine::cancelContinuousFeedback(const HbWidget* widget)
 {
-if (hbFeedbackPlayer && continuousFeedbacks.contains(widget)) {
+if (continuousFeedbacks.contains(widget)) {
-hbFeedbackPlayer->cancelContinuousFeedback(continuousFeedbacks.take(widget));
+HbContinuousFeedback *feedback = continuousFeedbacks.take(widget);
-}
+feedback->stop();
-}
+delete feedback;
+}
+}

changeset 2	06ff229162e9
parent 1	f7ac710697a9
child 5	627c4a0fd0e7