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

equal deleted inserted replaced

-:11d3954df52a
+:627c4a0fd0e7
 #include <hbtoolbutton.h>
 #include <hbabstractbutton.h>
 #include <hbabstractedit.h>
 #include <hbtextedit.h>
 #include <hblineedit.h>
+#include <hbinputvirtualrocker.h>
 #include <hbabstractslidercontrol.h>
 #include <hbprogressslider.h>
 #include <hbscrollbar.h>
 #include <hbabstractviewitem.h>
 #include <hbabstractitemview.h>
 effect = HbFeedback::BasicButton;
 }
 }
 }
-if (widget->type() == HbPrivate::ItemType_NavigationButton
+if (widget->type() == HbPrivate::ItemType_NavigationButton ||
-// Commented out until use cases are clarified
+widget->type() == Hb::ItemType_ToolButton) {
-/*|| widget->type() == HbPrivate::ItemType_IndicatorButton*/) {
 effect = HbFeedback::BasicButton;
 }
 // input widget special case
 if (widget->type() == Hb::ItemType_InputButtonGroup) {
 }
 else if (widget->type() == Hb::ItemType_InputFunctionButton) {
 effect = HbFeedback::BasicKeypad;
 }
 else if (widget->type() == Hb::ItemType_CheckBox) {
-effect = HbFeedback::None; // Checkbox deferred to release
+effect = HbFeedback::BasicButton;
 }
 // title pane specific special case
 if (widget->type() == HbPrivate::ItemType_TitlePane) {
 if (isOptionsMenuEmpty(widget)) {
 case HbFeedbackEffectUtils::List:
 if (modifiers & (Hb::ModifierExpandedItem | Hb::ModifierCollapsedItem)) {
 effect = HbFeedback::BasicItem;
 }
 else {
+effect = HbFeedback::BasicItem;
+}
+if (widget->type() == Hb::ItemType_DataFormViewItem) {
 effect = HbFeedback::SensitiveItem;
 }
+else if (widget->type() == HbPrivate::ItemType_DataGroup) {
+effect = HbFeedback::None;
+}
 break;
 case HbFeedbackEffectUtils::Grid:
-effect = HbFeedback::SensitiveItem;
+effect = HbFeedback::BasicItem;
 break;
 case HbFeedbackEffectUtils::Slider:
 // slider track default
-effect = HbFeedback::SensitiveSlider;
+effect = HbFeedback::BasicSlider;
 // special cases
 if (const HbProgressSlider *progressSlider = qobject_cast<const HbProgressSlider *>(widget)) {
 Q_UNUSED(progressSlider)
 effect = HbFeedback::BasicSlider;
 effect = HbFeedback::SensitiveSlider;
 }
 // slider handle
 if (modifiers & Hb::ModifierSliderHandle) {
-effect = HbFeedback::SensitiveSlider;
+effect = HbFeedback::BasicSlider;
 }
 // slider elements
 if (modifiers & Hb::ModifierSliderElement) {
-effect = HbFeedback::SensitiveButton;
+effect = HbFeedback::BasicButton;
 }
 break;
 case HbFeedbackEffectUtils::Popup:
 // item view specific special cases
 if ( const HbAbstractViewItem * viewItem = qobject_cast<const HbAbstractViewItem *>(widget)) {
 const HbAbstractItemView* itemView = viewItem->itemView();
 if (itemView) {
-// checkable item is checked with a press
+// Different press feedbacks for single and multiselection list items
 switch (itemView->selectionMode()) {
 case HbAbstractItemView::SingleSelection:
 case HbAbstractItemView::MultiSelection: {
-effect = HbFeedback::SensitiveItem;
+effect = HbFeedback::BasicButton;
 break;
 }
 case HbAbstractItemView::NoSelection:
 if (const HbListView * listView = qobject_cast<const HbListView *>(itemView)) {
 if (listView->arrangeMode()
 break;
 default:
 break;
 }
-// radio button list works like a normal list item
+// radio button list behaves like an item view on press
 if (viewItem->type() == Hb::ItemType_RadioButtonListViewItem) {
-effect = HbFeedback::SensitiveItem;
+effect = HbFeedback::BasicItem;
 }
 else if(viewItem->type() == Hb::ItemType_TumbleViewItem ) {
 effect = HbFeedback::SensitiveItem;
 }
 effect = HbFeedback::SensitiveItem;
 }
 }
 }
 }
+if (widget->type() == Hb::ItemType_VirtualTrackPoint) {
+effect = HbFeedback::BasicButton;
+}
 if (modifiers & Hb::ModifierScrolling) {
 effect = HbFeedback::StopFlick;
 }
 return effect;
 effect = HbFeedback::BasicButton;
 }
 }
 }
-if (widget->type() == HbPrivate::ItemType_NavigationButton
+if (widget->type() == HbPrivate::ItemType_NavigationButton ||
-// Commented out until use cases are clarified
+widget->type() == Hb::ItemType_ToolButton) {
-/*|| widget->type() == HbPrivate::ItemType_IndicatorButton*/) {
 effect = HbFeedback::BasicButton;
 }
 // input widget special case
 if (widget->type() == Hb::ItemType_InputButtonGroup
 || widget->type() == Hb::ItemType_InputFunctionButton) {
 effect = HbFeedback::SensitiveKeypad;
 } else if (widget->type() == Hb::ItemType_CheckBox) {
-effect = HbFeedback::Checkbox; // deferred from press
+effect = HbFeedback::Checkbox;
 }
 // title pane specific special case
 if (widget->type() == HbPrivate::ItemType_TitlePane) {
-if (isOptionsMenuEmpty(widget)) {
+effect = HbFeedback::None;
-effect = HbFeedback::None;
-}
 }
 if (widget->type() == Hb::ItemType_ComboBox) {
 effect = HbFeedback::PopupOpen;
 }
 case HbFeedbackEffectUtils::List:
 if (modifiers & (Hb::ModifierExpandedItem | Hb::ModifierCollapsedItem)) {
 effect = HbFeedback::BasicItem;
 }
 else {
-effect = HbFeedback::SensitiveItem;
+effect = HbFeedback::BasicItem;
 }
-// menu items give popop closed feedback on release
+// menu items give popup close feedback on release
 if (widget->type() == Hb::ItemType_MenuItem) {
 effect = HbFeedback::None;
 }
+else if (widget->type() == Hb::ItemType_DataFormViewItem) {
+effect = HbFeedback::None;
+}
 break;
 case HbFeedbackEffectUtils::Grid:
-effect = HbFeedback::SensitiveItem;
+effect = HbFeedback::BasicItem;
 break;
 case HbFeedbackEffectUtils::Slider:
 // slider track default
-effect = HbFeedback::SensitiveSlider;
+effect = HbFeedback::BasicSlider;
 // slider handle
 if (modifiers & Hb::ModifierSliderHandle) {
-effect = HbFeedback::SensitiveSlider;
+effect = HbFeedback::BasicSlider;
 }
 // slider elements
 if (modifiers & Hb::ModifierSliderElement) {
-effect = HbFeedback::SensitiveButton;
+effect = HbFeedback::None;
 }
 break;
 case HbFeedbackEffectUtils::Editor:
 effect = HbFeedback::None;
 if ( const HbAbstractViewItem * viewItem = qobject_cast<const HbAbstractViewItem *>(widget)) {
 const HbAbstractItemView* itemView = viewItem->itemView();
 if (itemView) {
 switch (itemView->selectionMode()) {
 case HbAbstractItemView::SingleSelection:
-effect = HbFeedback::Checkbox; // deferred from press
+effect = HbFeedback::Checkbox;
 break;
 case HbAbstractItemView::MultiSelection: {
 effect = HbFeedback::None;
 break;
 }
 break;
 }
 }
-// radio button list works like a normal list item
+// radio button list has checkbox feedback behaviour on release
 if (viewItem->type() == Hb::ItemType_RadioButtonListViewItem) {
-effect = HbFeedback::SensitiveItem;
+effect = HbFeedback::Checkbox;
 }
 else if(viewItem->type() == Hb::ItemType_TumbleViewItem ) {
 effect = HbFeedback::SensitiveItem;
 }
 }
 }
 if (widget->type() == Hb::ItemType_VirtualTrackPoint) {
 effect = HbFeedback::Editor;
 }
 if (widget->type() == Hb::ItemType_Menu) {
 effect = HbFeedback::ItemScroll;
 }
 return effect;
 }
 /*!
 Returns the instant feedback effect on editor highlighting.
 else {
 effect = HbFeedback::TextSelection;
 }
 }
 }
+else if (const HbInputVirtualRocker *trackPoint = qobject_cast<const HbInputVirtualRocker *>(widget)) {
+QGraphicsItem* graphicsItem = trackPoint->mainWindow()->scene()->focusItem();
+if (graphicsItem->isWidget() && (static_cast<QGraphicsWidget*>(graphicsItem)->inherits("QGraphicsWebView"))) {
+QVariant v;
+v = graphicsItem->scene()->inputMethodQuery( Qt::ImCursorPosition );
+if ( v.isValid() && v.canConvert<int>()) {
+int index;
+index = v.toInt();
+QVariant varSurrText;
+varSurrText = graphicsItem->scene()->inputMethodQuery( Qt::ImSurroundingText );
+if ( varSurrText.isValid() ) {
+QString text = varSurrText.toString();
+// Index (current cursor position) can be equal to the
+// length of the string (for e.g. when the cursor is at the end)
+// So we make sure we bring index within the bounds of the string
+if (!text.isEmpty() && index <= text.count()) {
+dist = abs(index - previousCursorPosition);
+if (previousCursorPosition < index || index == text.count()) {
+index--;
+}
+QChar character = text.at(index);
+emptyline = character.category() == QChar::Separator_Paragraph;
+if (emptyline) {
+effect = HbFeedback::EmptyLineSelection;
+}
+else if (dist > 1) {
+effect = HbFeedback::LineSelection;
+}
+else if (character.isSpace()) {
+effect = HbFeedback::BlankSelection;
+}
+else {
+effect = HbFeedback::TextSelection;
+}
+}
+}
+}
+}
+}
 return effect;
 }
 /*!
 Checks if feedback is allowed for certain types of popup widgets.
 */
 bool HbFeedbackEffectUtils::isFeedbackAllowedForPopup(const HbWidget *widget)
 {
 bool feedbackAllowed(false);
 if (widgetFamily(widget) == HbFeedbackEffectUtils::Popup) {
 feedbackAllowed = true;
 if (widget->type() == HbPrivate::ItemType_ToolTipLabel
-|| widget->type() == Hb::ItemType_InputCharPreviewPane
+|| widget->type() == Hb::ItemType_InputCharPreviewPane) {
-|| widget->type() == Hb::ItemType_InputVkbWidget) {
 feedbackAllowed = false;
 }
 else if (QString(widget->metaObject()->className()) == "HbSelectionControl") {
 feedbackAllowed = false;
 }
 }
 else if (QString(widget->metaObject()->className()) == "HbComboDropDown") {
 feedbackAllowed = true;
 }
 return feedbackAllowed;
+}
+/*!
+Returns the instant feedback effect for popup open event.
+*/
+HbFeedback::InstantEffect HbFeedbackEffectUtils::instantOnPopupOpened(const HbWidget *widget) {
+HbFeedback::InstantEffect effect = HbFeedback::None;
+if (QString(widget->metaObject()->className()) == "HbDeviceNotificationDialogWidget") {
+effect = HbFeedback::PopUp;
+}
+else {
+effect = HbFeedback::PopupOpen;
+}
+return effect;
+}
+/*!
+Returns the instant feedback effect for popup close event.
+*/
+HbFeedback::InstantEffect HbFeedbackEffectUtils::instantOnPopupClosed(const HbWidget *widget) {
+HbFeedback::InstantEffect effect = HbFeedback::None;
+if (QString(widget->metaObject()->className()) == "HbDeviceNotificationDialogWidget") {
+effect = HbFeedback::None;
+}
+else {
+effect = HbFeedback::PopupClose;
+}
+return effect;
 }
 /*!
 Returns the instant feedback effect on key press interaction.
 */
 /*!
 Returns the instant feedback effect on selection changed events.
 */
 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)) {
 const HbAbstractItemView* itemView = viewItem->itemView();
 if (itemView) {
 // Single selection is handled with a release
 effect = HbFeedback::None;
 break;
 }
 case HbAbstractItemView::MultiSelection: {
-effect = HbFeedback::MultipleCheckbox;
+effect = HbFeedback::Checkbox;
 break;
 }
 default:
 break;
 }
 		}
 	}
+else if (const HbAbstractItemView* itemView = qobject_cast<const HbAbstractItemView*>(widget)) {
+if (itemView->selectionMode() == HbAbstractItemView::MultiSelection && (modifiers & Hb::ModifierScrolling)) {
+effect = HbFeedback::MultipleCheckbox;
+}
+}
 return effect;
 }
 /*!
 Returns the instant continuous feedback effect for a continuous interaction.
 Returns the default modalities to be used when playing feedback effect asociated with this \a widget, \a interaction, \a modifiers.
 */
 HbFeedback::Modalities HbFeedbackEffectUtils::modalities(const HbWidget *widget, Hb::InstantInteraction interaction, Hb::InteractionModifiers modifiers )
 {
 Q_UNUSED(modifiers)
+Q_UNUSED(widget)
 HbFeedback::Modalities modalities = 0;
 switch( interaction ) {
 modalities =  HbFeedback::Tactile;
 break;
 case Hb::InstantClicked:
 modalities = HbFeedback::Tactile;
-if(widget->type() == Hb::ItemType_CheckBox) {
-modalities |= HbFeedback::Audio;
-}
 break;
 case Hb::InstantKeyRepeated:
 modalities = HbFeedback::Tactile | HbFeedback::Audio;
 break;

changeset 5	627c4a0fd0e7
parent 3	11d3954df52a
child 7	923ff622b8b9