src/hbplugins/feedback/feedbackeffectplugin/hbfeedbackeffectutils.cpp
changeset 3 11d3954df52a
parent 2 06ff229162e9
child 5 627c4a0fd0e7
--- a/src/hbplugins/feedback/feedbackeffectplugin/hbfeedbackeffectutils.cpp	Fri May 14 16:09:54 2010 +0300
+++ b/src/hbplugins/feedback/feedbackeffectplugin/hbfeedbackeffectutils.cpp	Thu May 27 13:10:59 2010 +0300
@@ -279,8 +279,10 @@
 
         case HbFeedbackEffectUtils::Slider:
 
-            // slider area
-            effect = HbFeedback::None;
+            // slider track default
+            effect = HbFeedback::SensitiveSlider;
+
+            // special cases
             if (const HbProgressSlider *progressSlider = qobject_cast<const HbProgressSlider *>(widget)) {
                 Q_UNUSED(progressSlider)
                 effect = HbFeedback::BasicSlider;
@@ -318,11 +320,6 @@
             break;
     }
 
-    if (widget->type() == Hb::ItemType_MenuItem) {
-        if (modifiers & Hb::ModifierScrolling) {
-            effect = HbFeedback::StopFlick;
-        }
-    }
     // item view specific special cases
     if ( const HbAbstractViewItem * viewItem = qobject_cast<const HbAbstractViewItem *>(widget)) {
         const HbAbstractItemView* itemView = viewItem->itemView();
@@ -331,7 +328,7 @@
             switch (itemView->selectionMode()) {
                 case HbAbstractItemView::SingleSelection:
                 case HbAbstractItemView::MultiSelection: {
-                    effect = HbFeedback::None;
+                    effect = HbFeedback::SensitiveItem;
                     break;
                 }
                 case HbAbstractItemView::NoSelection:
@@ -363,14 +360,10 @@
                     effect = HbFeedback::SensitiveItem;
                 }
             }
-
-            if (modifiers & Hb::ModifierScrolling) {
-                effect = HbFeedback::StopFlick;
-            }
         }
     }
-    if (widget->type() == Hb::ItemType_VirtualTrackPoint) {
-        effect = HbFeedback::Editor;
+    if (modifiers & Hb::ModifierScrolling) {
+        effect = HbFeedback::StopFlick;
     }
 
     return effect;
@@ -458,8 +451,8 @@
  
          case HbFeedbackEffectUtils::Slider:
 
-            // slider area
-             effect = HbFeedback::None;
+            // slider track default
+             effect = HbFeedback::SensitiveSlider;
 
             // slider handle
             if (modifiers & Hb::ModifierSliderHandle) {
@@ -473,7 +466,7 @@
             break;
 
         case HbFeedbackEffectUtils::Editor:
-            effect = HbFeedback::Editor;
+            effect = HbFeedback::None;
             break;
 
         default:
@@ -523,6 +516,11 @@
             }
         }
     }
+
+    if (widget->type() == Hb::ItemType_VirtualTrackPoint) {
+        effect = HbFeedback::Editor;
+    }
+
     return effect;
 }
 
@@ -704,9 +702,10 @@
 */
 HbFeedback::InstantEffect HbFeedbackEffectUtils::instantOnSelectionChanged(const HbWidget *widget, Hb::InteractionModifiers modifiers)
 {
+    Q_UNUSED(modifiers);
     HbFeedback::InstantEffect effect = HbFeedback::None;
 
-    if ( const HbAbstractViewItem * viewItem = qobject_cast<const HbAbstractViewItem *>(widget)) {
+    if (const HbAbstractViewItem * viewItem = qobject_cast<const HbAbstractViewItem *>(widget)) {
         const HbAbstractItemView* itemView = viewItem->itemView();
         if (itemView) {
             switch (itemView->selectionMode()) {
@@ -722,13 +721,9 @@
                 default:
                     break;
             }
-            if (modifiers == Hb::ModifierScrolling) {
-                effect = HbFeedback::StopFlick;
-            }
 		}
 	}
-
-        return effect;
+    return effect;
 }
 
 /*!