--- a/homescreenapp/stateplugins/hshomescreenstateplugin/src/hsidlestate.cpp Wed Jun 23 18:03:36 2010 +0300
+++ b/homescreenapp/stateplugins/hshomescreenstateplugin/src/hsidlestate.cpp Tue Jul 06 14:06:53 2010 +0300
@@ -17,25 +17,26 @@
#include <QStateMachine>
#include <QGraphicsSceneMouseEvent>
-#include <QGraphicsLinearLayout>
-#include <QParallelAnimationGroup>
#include <QPropertyAnimation>
#include <QApplication>
-#include <QDir>
+#include <QVariantHash>
#include <HbMainWindow>
#include <HbView>
#include <HbMenu>
#include <HbAction>
-#include <HbIcon>
#include <HbMessageBox>
#include <HbLabel>
#include <HbInstantFeedback>
#include <HbContinuousFeedback>
+#include <HbPanGesture>
+#include <HbTapAndHoldGesture>
+
#ifdef Q_OS_SYMBIAN
#include <XQSettingsManager>
#include <startupdomainpskeys.h>
#endif
+
#include "hsidlestate.h"
#include "hsidlewidget.h"
#include "hsdomainmodeldatastructures.h"
@@ -59,15 +60,6 @@
#define EXIT_ACTION(state, action) \
connect(state, SIGNAL(exited()), SLOT(action()));
-// Helper macros for connecting and disconnecting mouse event handlers.
-#define CONNECT_MOUSE_EVENT_HANDLER(signal, slot) \
- connect(mUiWidget, SIGNAL(signal(QGraphicsItem*,QGraphicsSceneMouseEvent*,bool&)), \
- SLOT(slot(QGraphicsItem*,QGraphicsSceneMouseEvent*,bool&)));
-#define DISCONNECT_MOUSE_EVENT_HANDLER(signal, slot) \
- disconnect(mUiWidget, SIGNAL(signal(QGraphicsItem*,QGraphicsSceneMouseEvent*,bool&)), \
- this, SLOT(slot(QGraphicsItem*,QGraphicsSceneMouseEvent*,bool&)));
-
-
namespace
{
const char gApplicationLibraryIconName[] = "qtg_mono_applications_all";
@@ -130,19 +122,22 @@
mContinuousFeedback(0),
mTrashBinFeedbackAlreadyPlayed(false),
mDeltaX(0),
- mSceneMenu(0)
+ mSceneMenu(0),
+ mSnapBorderGap(0.0)
#ifdef Q_OS_SYMBIAN
,mSettingsMgr(0)
#endif
{
setupStates();
- mTimer.setSingleShot(true);
mTitleResolver = new HsTitleResolver(this);
-
+
// TODO: Uncomment when updated API available
//mContinuousFeedback = new HbContinuousFeedback;
//mContinuousFeedback->setContinuousEffect(HbFeedback::ContinuousSmooth);
//mContinuousFeedback->setIntensity(HbFeedback::IntensityFull );
+
+ mVerticalSnapLineTimer.setSingleShot(true);
+ mHorizontalSnapLineTimer.setSingleShot(true);
}
/*!
@@ -165,7 +160,6 @@
action_idle_layoutNewWidgets();
break;
case QEvent::ApplicationDeactivate:
- mUiWidget->clearDelayedPress();
emit event_waitInput();
break;
default:
@@ -187,18 +181,6 @@
*/
/*!
- \fn HsIdleState::event_widgetInteraction()
-
- This signal initiates a transition to the widgetInteraction state.
-*/
-
-/*!
- \fn HsIdleState::event_sceneInteraction()
-
- This signal initiates a transition to the sceneInteraction state.
-*/
-
-/*!
\fn HsIdleState::event_moveWidget()
This signal initiates a transition to the moveWidget state.
@@ -211,12 +193,6 @@
*/
/*!
- \fn HsIdleState::event_sceneMenu()
-
- This signal initiates a transition to the sceneMenu state.
-*/
-
-/*!
\fn HsIdleState::event_selectWallpaper()
This signal initiates a transition to the selectSceneWallpaper state.
@@ -250,11 +226,8 @@
QState *state_waitInput = new QState(this);
setInitialState(state_waitInput);
- QState *state_widgetInteraction = new QState(this);
- QState *state_sceneInteraction = new QState(this);
QState *state_moveWidget = new QState(this);
QState *state_moveScene = new QState(this);
- QState *state_sceneMenu = new QState(this);
HsWallpaperSelectionState *state_wallpaperSelectionState =
new HsWallpaperSelectionState(this);
QState *state_addPage = new QState(this);
@@ -264,10 +237,6 @@
// Transitions
state_waitInput->addTransition(
- this, SIGNAL(event_widgetInteraction()), state_widgetInteraction);
- state_waitInput->addTransition(
- this, SIGNAL(event_sceneInteraction()), state_sceneInteraction);
- state_waitInput->addTransition(
this, SIGNAL(event_addPage()), state_addPage);
state_waitInput->addTransition(
this, SIGNAL(event_removePage()), state_removePage);
@@ -275,20 +244,10 @@
this, SIGNAL(event_toggleConnection()), state_toggleConnection);
state_waitInput->addTransition(
this, SIGNAL(event_selectWallpaper()), state_wallpaperSelectionState);
-
- state_widgetInteraction->addTransition(
- this, SIGNAL(event_waitInput()), state_waitInput);
- state_widgetInteraction->addTransition(
- this, SIGNAL(event_moveWidget()), state_moveWidget);
- state_widgetInteraction->addTransition(
+ state_waitInput->addTransition(
this, SIGNAL(event_moveScene()), state_moveScene);
-
- state_sceneInteraction->addTransition(
- this, SIGNAL(event_waitInput()), state_waitInput);
- state_sceneInteraction->addTransition(
- this, SIGNAL(event_moveScene()), state_moveScene);
- state_sceneInteraction->addTransition(
- this, SIGNAL(event_sceneMenu()), state_sceneMenu);
+ state_waitInput->addTransition(
+ this, SIGNAL(event_moveWidget()), state_moveWidget);
state_moveWidget->addTransition(
this, SIGNAL(event_waitInput()), state_waitInput);
@@ -296,13 +255,6 @@
state_moveScene->addTransition(
this, SIGNAL(event_waitInput()), state_waitInput);
- state_sceneMenu->addTransition(
- this, SIGNAL(event_waitInput()), state_waitInput);
- state_sceneMenu->addTransition(
- this, SIGNAL(event_selectWallpaper()), state_wallpaperSelectionState);
- state_sceneMenu->addTransition(
- this, SIGNAL(event_addPage()), state_addPage);
-
state_wallpaperSelectionState->addTransition(
state_wallpaperSelectionState, SIGNAL(event_waitInput()), state_waitInput);
@@ -326,47 +278,31 @@
EXIT_ACTION(this, action_idle_uninstallEventFilter)
ENTRY_ACTION(state_waitInput, action_waitInput_updateOptionsMenu)
- ENTRY_ACTION(state_waitInput, action_waitInput_connectMouseEventHandlers)
+ ENTRY_ACTION(state_waitInput, action_waitInput_connectGestureHandlers)
ENTRY_ACTION(state_waitInput, action_waitInput_publishIdleKey)
- EXIT_ACTION(state_waitInput, action_waitInput_disconnectMouseEventHandlers)
+ EXIT_ACTION(state_waitInput, action_waitInput_disconnectGestureHandlers)
EXIT_ACTION(state_waitInput, action_waitInput_resetNewWidgets)
- ENTRY_ACTION(state_widgetInteraction, action_widgetInteraction_connectMouseEventHandlers)
- ENTRY_ACTION(state_widgetInteraction, action_widgetInteraction_connectGestureTimers)
- EXIT_ACTION(state_widgetInteraction, action_widgetInteraction_disconnectMouseEventHandlers)
- EXIT_ACTION(state_widgetInteraction, action_widgetInteraction_disconnectGestureTimers)
-
- ENTRY_ACTION(state_sceneInteraction, action_sceneInteraction_connectMouseEventHandlers)
- ENTRY_ACTION(state_sceneInteraction, action_sceneInteraction_connectGestureTimers)
- EXIT_ACTION(state_sceneInteraction, action_sceneInteraction_disconnectMouseEventHandlers)
- EXIT_ACTION(state_sceneInteraction, action_sceneInteraction_disconnectGestureTimers)
-
ENTRY_ACTION(state_moveWidget, action_moveWidget_reparentToControlLayer)
ENTRY_ACTION(state_moveWidget, action_moveWidget_startWidgetDragEffect)
- ENTRY_ACTION(state_moveWidget, action_moveWidget_connectMouseEventHandlers)
+ ENTRY_ACTION(state_moveWidget, action_moveWidget_connectGestureHandlers)
+ ENTRY_ACTION(state_moveWidget, action_moveWidget_setWidgetSnap)
EXIT_ACTION(state_moveWidget, action_moveWidget_reparentToPage)
EXIT_ACTION(state_moveWidget, action_moveWidget_startWidgetDropEffect)
- EXIT_ACTION(state_moveWidget, action_moveWidget_disconnectMouseEventHandlers)
+ EXIT_ACTION(state_moveWidget, action_moveWidget_disconnectGestureHandlers)
EXIT_ACTION(state_moveWidget, action_moveWidget_preventZoneAnimation)
-
- ENTRY_ACTION(state_moveScene, action_moveScene_connectMouseEventHandlers)
- EXIT_ACTION(state_moveScene, action_moveScene_moveToNearestPage)
- EXIT_ACTION(state_moveScene, action_moveScene_disconnectMouseEventHandlers)
-
- ENTRY_ACTION(state_sceneMenu, action_sceneMenu_showMenu)
+ EXIT_ACTION(state_moveWidget, action_moveWidget_deleteWidgetSnap)
- ENTRY_ACTION(state_addPage, action_disableUserInteraction)
+ ENTRY_ACTION(state_moveScene, action_moveScene_connectGestureHandlers)
+ EXIT_ACTION(state_moveScene, action_moveScene_moveToNearestPage)
+ EXIT_ACTION(state_moveScene, action_moveScene_disconnectGestureHandlers)
+
ENTRY_ACTION(state_addPage, action_addPage_addPage)
- EXIT_ACTION(state_addPage, action_enableUserInteraction)
- ENTRY_ACTION(state_removePage, action_disableUserInteraction)
ENTRY_ACTION(state_removePage, action_removePage_removePage)
- EXIT_ACTION(state_removePage, action_enableUserInteraction)
- ENTRY_ACTION(state_toggleConnection, action_disableUserInteraction)
ENTRY_ACTION(state_toggleConnection, action_toggleConnection_toggleConnection)
- EXIT_ACTION(state_toggleConnection, action_enableUserInteraction)
}
/*!
@@ -394,7 +330,8 @@
mPageChangeAnimation->setDuration(duration);
connect(mPageChangeAnimation,
SIGNAL(finished()),
- SLOT(pageChangeAnimationFinished()));
+ SLOT(pageChangeAnimationFinished()),
+ Qt::UniqueConnection);
mPageChangeAnimation->start();
HbInstantFeedback::play(HSCONFIGURATION_GET(pageChangeFeedbackEffect));
@@ -421,10 +358,6 @@
return;
}
- if (targetPageIndex >= HSCONFIGURATION_GET(maximumPageCount)){
- return;
- }
-
if (!mZoneAnimation) {
mZoneAnimation = new QPropertyAnimation(mUiWidget, "sceneX");
}
@@ -442,6 +375,7 @@
connect(mZoneAnimation,
SIGNAL(finished()),
SLOT(zoneAnimationFinished()));
+
mZoneAnimation->start();
}
@@ -461,7 +395,7 @@
*/
bool HsIdleState::isInLeftPageChangeZone()
{
- return mTouchScenePos.x() < HSCONFIGURATION_GET(pageChangeZoneWidth);
+ return mWidgetHotSpot.x() < HSCONFIGURATION_GET(pageChangeZoneWidth);
}
/*!
@@ -471,7 +405,7 @@
bool HsIdleState::isInRightPageChangeZone()
{
qreal pageWidth = HsScene::mainWindow()->layoutRect().width();
- return mTouchScenePos.x() > pageWidth - HSCONFIGURATION_GET(pageChangeZoneWidth);
+ return mWidgetHotSpot.x() > pageWidth - HSCONFIGURATION_GET(pageChangeZoneWidth);
}
/*!
@@ -493,25 +427,21 @@
void HsIdleState::updateZoneAnimation()
{
if (isInPageChangeZone() && mAllowZoneAnimation) {
- if (!mZoneAnimation
- && ( !mPageChangeAnimation
- || mPageChangeAnimation->state() == QAbstractAnimation::Stopped )) {
+ if (!mZoneAnimation && (!mPageChangeAnimation
+ || mPageChangeAnimation->state() == QAbstractAnimation::Stopped )) {
startPageChangeZoneAnimation(HSCONFIGURATION_GET(pageChangeZoneAnimationDuration));
}
- }
- else if (mZoneAnimation && !isInPageChangeZone()) {
+ } else if (mZoneAnimation && !isInPageChangeZone()) {
if (mZoneAnimation->state() == QAbstractAnimation::Running) {
if (mZoneAnimation->direction() == QAbstractAnimation::Forward) {
- mZoneAnimation->setDuration(HSCONFIGURATION_GET(pageChangeZoneReverseAnimationDuration));
- mZoneAnimation->setDirection(QAbstractAnimation::Backward);
+ mZoneAnimation->setDuration(HSCONFIGURATION_GET(pageChangeZoneReverseAnimationDuration));
+ mZoneAnimation->setDirection(QAbstractAnimation::Backward);
}
- }
- else {
+ } else {
// Out of the page change zone. Delete animation.
deleteZoneAnimation();
}
- }
- else if (!isInPageChangeZone()) {
+ } else if (!isInPageChangeZone()) {
if (mZoneAnimation) {
mZoneAnimation->stop();
}
@@ -577,22 +507,6 @@
}
/*!
- Disables the main window user interaction.
-*/
-void HsIdleState::action_disableUserInteraction()
-{
- HsScene::mainWindow()->setInteractive(false);
-}
-
-/*!
- Enables the main window user interaction.
-*/
-void HsIdleState::action_enableUserInteraction()
-{
- HsScene::mainWindow()->setInteractive(true);
-}
-
-/*!
If called for the first time, setups the idle view.
Updates the soft key action and sets the idle view
as the current view to the main window.
@@ -607,6 +521,7 @@
mNavigationAction = new HbAction(this);
mNavigationAction->setIcon(HbIcon(gApplicationLibraryIconName));
+ mNavigationAction->setObjectName("applib_navigation_action");
connect(mNavigationAction, SIGNAL(triggered()), SIGNAL(event_applicationLibrary()));
idleView->setNavigationAction(mNavigationAction);
@@ -625,11 +540,11 @@
Sets the idle view's title.
*/
void HsIdleState::action_idle_setupTitle()
-{
- qDebug() << "HsIdleState::action_idle_setupTitle() - ENTRY";
+{
onTitleChanged(mTitleResolver->title());
- connect(mTitleResolver, SIGNAL(titleChanged(QString)), SLOT(onTitleChanged(QString)));
- qDebug() << "HsIdleState::action_idle_setupTitle() - EXIT";
+ connect(mTitleResolver,
+ SIGNAL(titleChanged(QString)),
+ SLOT(onTitleChanged(QString)));
}
/*!
@@ -644,10 +559,24 @@
/*!
*/
-void HsIdleState::onAddContentActionTriggered()
+void HsIdleState::onAddContentFromContextMenuActionTriggered()
+{
+ /* include position information in homescreen data,
+ which passed around in applib and returned when adding content
+ */
+ QVariant homescreenData(mPageHotSpot);
+ machine()->postEvent(
+ HsMenuEventFactory::createOpenAppLibraryEvent(AddHsMenuMode, homescreenData));
+ mPageHotSpot = QPointF();
+}
+
+/*!
+
+*/
+void HsIdleState::onAddContentFromOptionsMenuActionTriggered()
{
machine()->postEvent(
- HsMenuEventFactory::createOpenAppLibraryEvent(AddHsMenuMode));
+ HsMenuEventFactory::createOpenAppLibraryEvent(AddHsMenuMode));
}
/*!
@@ -658,6 +587,168 @@
mTitleResolver->disconnect(this);
}
+#ifdef COVERAGE_MEASUREMENT
+#pragma CTC SKIP
+#endif //COVERAGE_MEASUREMENT
+/*!
+
+*/
+void HsIdleState::onPageTapAndHoldFinished(QGestureEvent *event)
+{
+ mPageHotSpot = qobject_cast<HbTapAndHoldGesture *>(
+ event->gesture(Qt::TapAndHoldGesture))->scenePosition();
+
+ mSceneMenu = new HbMenu();
+ mSceneMenu->setObjectName("hs_ctx_menu");
+ mSceneMenu->setAttribute(Qt::WA_DeleteOnClose);
+
+ HbAction *action = mSceneMenu->addAction(hbTrId(hsLocTextId_ContextMenu_AddContent), this,
+ SLOT(onAddContentFromContextMenuActionTriggered()));
+ action->setObjectName("action_add_content_ctx_menu");
+
+ HsScene *scene = HsScene::instance();
+ if (scene->pages().count() < HSCONFIGURATION_GET(maximumPageCount)) {
+ action = mSceneMenu->addAction(hbTrId(hsLocTextId_OptionsMenu_AddPage), this, SIGNAL(event_addPage()));
+ action->setObjectName("action_add_page_ctx_menu");
+ }
+
+ action = mSceneMenu->addAction(hbTrId(hsLocTextId_ContextMenu_ChangeWallpaper), this, SIGNAL(event_selectWallpaper()));
+ action->setObjectName("action_change_wallpaper_ctx_menu");
+ mSceneMenu->setPreferredPos(mPageHotSpot);
+ mSceneMenu->open();
+}
+#ifdef COVERAGE_MEASUREMENT
+#pragma CTC ENDSKIP
+#endif //COVERAGE_MEASUREMENT
+
+void HsIdleState::onPagePanStarted(QGestureEvent *event)
+{
+ Q_UNUSED(event)
+ emit event_moveScene();
+}
+
+void HsIdleState::onPagePanUpdated(QGestureEvent *event)
+{
+ HbPanGesture *gesture = qobject_cast<HbPanGesture *>(
+ event->gesture(Qt::PanGesture));
+
+ mDeltaX = gesture->sceneOffset().x();
+
+ HsScene *scene = HsScene::instance();
+ int bounceEffect = HSCONFIGURATION_GET(bounceEffect);
+ qreal x = qBound(pageLayerXPos(scene->pages().count() - 1) - bounceEffect / 2 / mUiWidget->parallaxFactor(),
+ pageLayerXPos(scene->activePageIndex()) + mDeltaX,
+ pageLayerXPos(0) + (bounceEffect / 2 / mUiWidget->parallaxFactor()));
+
+ mUiWidget->setSceneX(x);
+}
+
+void HsIdleState::onPagePanFinished(QGestureEvent *event)
+{
+ HbPanGesture *gesture = qobject_cast<HbPanGesture *>(
+ event->gesture(Qt::PanGesture));
+ mDeltaX = gesture->sceneOffset().x();
+ emit event_waitInput();
+}
+
+void HsIdleState::onWidgetTapStarted(HsWidgetHost *widget)
+{
+ HsScene *scene = HsScene::instance();
+ scene->setActiveWidget(widget);
+ HsPage *page = scene->activePage();
+ QMetaObject::invokeMethod(page, "updateZValues", Qt::QueuedConnection);
+}
+
+void HsIdleState::onWidgetTapAndHoldFinished(QGestureEvent *event, HsWidgetHost *widget)
+{
+ HsScene *scene = HsScene::instance();
+ scene->setActiveWidget(widget);
+
+ mWidgetHotSpot = qobject_cast<HbTapAndHoldGesture *>(
+ event->gesture(Qt::TapAndHoldGesture))->scenePosition();
+ mWidgetHotSpotOffset = mWidgetHotSpot - widget->pos();
+
+ emit event_moveWidget();
+}
+
+void HsIdleState::onWidgetMoveUpdated(const QPointF &scenePos, HsWidgetHost *widget)
+{
+ HsScene *scene = HsScene::instance();
+ QRectF widgetRect = widget->geometry();
+
+ // Move widget to new position.
+ mWidgetHotSpot = scenePos;
+
+ widgetRect.moveTopLeft(mWidgetHotSpot - mWidgetHotSpotOffset);
+
+ // Widget can be moved over the pages left border.
+ qreal lowerBoundX = -widgetRect.width();
+ HsPage *page = scene->activePage();
+ QRectF pageRect = HsGui::idleView()->rect();
+ // Widget can be moved over the pages right border.
+ qreal upperBoundX = pageRect.width();
+
+ // Notice that chrome height is 64 pixels.
+ qreal lowerBoundY = qreal(64) - widgetRect.height();
+ // Widget can be moved over the pages down border.
+ qreal upperBoundY = pageRect.height();
+
+ qreal widgetX = qBound(lowerBoundX, widgetRect.x(), upperBoundX);
+ qreal widgetY = qBound(lowerBoundY, widgetRect.y(), upperBoundY);
+ // If using ItemClipsChildrenToShape-flag in widgethost then
+ // setPos does not update position here, however setGeometry does it, QT bug?
+ widget->setGeometry(widgetX, widgetY, widgetRect.width(), widgetRect.height());
+
+ if (HSCONFIGURATION_GET(isSnapEnabled)) {
+ mSnapResult = HsWidgetPositioningOnWidgetMove::instance()->run(widget->sceneBoundingRect());
+
+ if (HSCONFIGURATION_GET(isSnapEffectsEnabled)) {
+ if (mSnapResult.hasHorizontalSnap) {
+ showVerticalLine();
+ }
+ else {
+ hideVerticalLine();
+ }
+ if (mSnapResult.hasVerticalSnap) {
+ showHorizontalLine();
+ }
+ else {
+ hideHorizontalLine();
+ }
+ }
+
+ mPreviousSnapResult = mSnapResult;
+ }
+
+
+ int bounceFeedbackEffectDistance = HSCONFIGURATION_GET(bounceFeedbackEffectDistance);
+ // Handle effects:
+ // User is indicated by a tactile feedback if he/she is trying to move
+ // widget over the first or the last page.
+ if( (page == scene->pages().first() && mWidgetHotSpot.x() < bounceFeedbackEffectDistance ) ||
+ (page == scene->pages().last() && scene->pages().count() == HSCONFIGURATION_GET(maximumPageCount)
+ && mWidgetHotSpot.x() > pageRect.width() - bounceFeedbackEffectDistance)) {
+ HbInstantFeedback::play(HSCONFIGURATION_GET(widgetMoveBlockedFeedbackEffect));
+ // TODO: use code below when Orbit has updated ContinuousFeedback API
+ //if (!mContinuousFeedback->isPlaying()) {
+ // mContinuousFeedback->play();
+ //}
+ }
+ else /*if (mContinuousFeedback->isPlaying())*/ {
+ //mContinuousFeedback->stop();
+ }
+
+ updateZoneAnimation();
+ showTrashBin();
+}
+
+void HsIdleState::onWidgetMoveFinished(const QPointF &scenePos, HsWidgetHost *widget)
+{
+ Q_UNUSED(scenePos)
+ Q_UNUSED(widget)
+ emit event_waitInput();
+}
+
/*!
Lays out the active page's new widgets that were added
from the application library.
@@ -687,7 +778,7 @@
page is shown.
*/
void HsIdleState::action_idle_showActivePage()
-{
+{
HsScene *scene = HsScene::instance();
QApplication::instance()->installEventFilter(scene);
scene->activePage()->showWidgets();
@@ -702,7 +793,13 @@
{
connect(HsScene::mainWindow(),
SIGNAL(orientationChanged(Qt::Orientation)),
- SLOT(action_idle_showActivePage()));
+ SLOT(action_idle_orientationChanged()));
+}
+
+void HsIdleState::action_idle_orientationChanged()
+{
+ HsScene::instance()->activePage()->resetNewWidgets();
+ action_idle_showActivePage();
}
/*!
@@ -742,16 +839,11 @@
QApplication::instance()->removeEventFilter(scene);
scene->activePage()->hideWidgets();
- if (mUiWidget) {
- mUiWidget->clearDelayedPress();
- }
-
//Close options menu on view change
HsGui::idleView()->setMenu(NULL);
//Close context menu on view change
if (mSceneMenu) {
- disconnect(mSceneMenu, SIGNAL(aboutToClose()), this, SLOT(onSceneMenuAboutToClose()));
mSceneMenu->close();
}
}
@@ -763,7 +855,7 @@
{
disconnect(HsScene::mainWindow(),
SIGNAL(orientationChanged(Qt::Orientation)),
- this, SLOT(action_idle_showActivePage()));
+ this, SLOT(action_idle_orientationChanged()));
}
/*!
@@ -782,57 +874,77 @@
HsScene *scene = HsScene::instance();
HbMenu *menu = new HbMenu();
-
+ menu->setObjectName("hs_menu");
// Task switcher
- menu->addAction(hbTrId(hsLocTextId_OptionsMenu_TaskSwitcher),
+ HbAction *action = menu->addAction(hbTrId(hsLocTextId_OptionsMenu_TaskSwitcher),
this, SLOT(openTaskSwitcher()));
-
+ action->setObjectName("action_open_task_switcher");
// Add content
- menu->addAction(hbTrId(hsLocTextId_ContextMenu_AddContent),
- this, SLOT(onAddContentActionTriggered()));
-
+ action = menu->addAction(hbTrId(hsLocTextId_ContextMenu_AddContent),
+ this, SLOT(onAddContentFromOptionsMenuActionTriggered()));
+ action->setObjectName("action_add_content");
// Add page
if (scene->pages().count() < HSCONFIGURATION_GET(maximumPageCount)) {
- menu->addAction(hbTrId(hsLocTextId_OptionsMenu_AddPage),
+ action = menu->addAction(hbTrId(hsLocTextId_OptionsMenu_AddPage),
this, SIGNAL(event_addPage()));
+ action->setObjectName("action_add_page");
+
}
// Change wallpaper
- menu->addAction(hbTrId(hsLocTextId_ContextMenu_ChangeWallpaper),
+ action = menu->addAction(hbTrId(hsLocTextId_ContextMenu_ChangeWallpaper),
this, SIGNAL(event_selectWallpaper()));
-
+ action->setObjectName("action_change_wallpaper");
// Remove page
if (scene->activePage()->isRemovable()) {
- menu->addAction(hbTrId(hsLocTextId_OptionsMenu_RemovePage),
+ action = menu->addAction(hbTrId(hsLocTextId_OptionsMenu_RemovePage),
this, SIGNAL(event_removePage()));
+ action->setObjectName("action_remove_page");
}
// Online / Offline
if (scene->isOnline()) {
- menu->addAction(hbTrId(hsLocTextId_OptionsMenu_HsToOffline),
+ action = menu->addAction(hbTrId(hsLocTextId_OptionsMenu_HsToOffline),
this, SIGNAL(event_toggleConnection()));
+ action->setObjectName("action_to_offline");
} else {
- menu->addAction(hbTrId(hsLocTextId_OptionsMenu_HsToOnline),
+ action = menu->addAction(hbTrId(hsLocTextId_OptionsMenu_HsToOnline),
this, SIGNAL(event_toggleConnection()));
+ action->setObjectName("action_to_online");
}
HsGui::idleView()->setMenu(menu);
}
-/*!
- Connects the waitInput state's mouse event handlers.
-*/
-void HsIdleState::action_waitInput_connectMouseEventHandlers()
+void HsIdleState::action_waitInput_connectGestureHandlers()
{
- CONNECT_MOUSE_EVENT_HANDLER(mousePressed, waitInput_onMousePressed)
+ HsScene *scene = HsScene::instance();
+
+ connect(scene,
+ SIGNAL(pageTapAndHoldFinished(QGestureEvent*)),
+ SLOT(onPageTapAndHoldFinished(QGestureEvent*)),
+ Qt::UniqueConnection);
+
+ connect(scene,
+ SIGNAL(pagePanStarted(QGestureEvent*)),
+ SLOT(onPagePanStarted(QGestureEvent*)),
+ Qt::UniqueConnection);
+
+ connect(scene,
+ SIGNAL(widgetTapStarted(HsWidgetHost*)),
+ SLOT(onWidgetTapStarted(HsWidgetHost*)),
+ Qt::UniqueConnection);
+
+ connect(scene,
+ SIGNAL(widgetTapAndHoldFinished(QGestureEvent*,HsWidgetHost*)),
+ SLOT(onWidgetTapAndHoldFinished(QGestureEvent*,HsWidgetHost*)),
+ Qt::UniqueConnection);
}
-/*!
- Disconnects the waitInput state's mouse event handlers.
-*/
-void HsIdleState::action_waitInput_disconnectMouseEventHandlers()
+void HsIdleState::action_waitInput_disconnectGestureHandlers()
{
- DISCONNECT_MOUSE_EVENT_HANDLER(mousePressed, waitInput_onMousePressed)
+ HsScene *scene = HsScene::instance();
+ scene->disconnect(this);
}
/*!
@@ -844,82 +956,6 @@
}
/*!
- Connects the widgetInteraction state's mouse event handlers.
-*/
-void HsIdleState::action_widgetInteraction_connectMouseEventHandlers()
-{
- CONNECT_MOUSE_EVENT_HANDLER(mouseMoved, widgetInteraction_onMouseMoved)
- CONNECT_MOUSE_EVENT_HANDLER(mouseReleased, widgetInteraction_onMouseReleased)
-}
-
-/*!
- Connects the widgetInteraction state's gesture timers.
-*/
-void HsIdleState::action_widgetInteraction_connectGestureTimers()
-{
- mTimer.setInterval(HSCONFIGURATION_GET(widgetTapAndHoldTimeout));
- connect(&mTimer, SIGNAL(timeout()),
- SLOT(widgetInteraction_onTapAndHoldTimeout()));
- mTimer.start();
-}
-
-/*!
- Disconnects the widgetInteraction state's mouse event handlers.
-*/
-void HsIdleState::action_widgetInteraction_disconnectMouseEventHandlers()
-{
- DISCONNECT_MOUSE_EVENT_HANDLER(mouseMoved, widgetInteraction_onMouseMoved)
- DISCONNECT_MOUSE_EVENT_HANDLER(mouseReleased, widgetInteraction_onMouseReleased)
-}
-
-/*!
- Disconnects the widgetInteraction state's gesture timers.
-*/
-void HsIdleState::action_widgetInteraction_disconnectGestureTimers()
-{
- disconnect(&mTimer, SIGNAL(timeout()),
- this, SLOT(widgetInteraction_onTapAndHoldTimeout()));
-}
-
-/*!
- Connects the sceneInteraction state's mouse event handlers.
-*/
-void HsIdleState::action_sceneInteraction_connectMouseEventHandlers()
-{
- CONNECT_MOUSE_EVENT_HANDLER(mouseMoved, sceneInteraction_onMouseMoved)
- CONNECT_MOUSE_EVENT_HANDLER(mouseReleased, sceneInteraction_onMouseReleased)
-}
-
-/*!
- Connects the sceneInteraction state's gesture timers.
-*/
-void HsIdleState::action_sceneInteraction_connectGestureTimers()
-{
- mTimer.setInterval(HSCONFIGURATION_GET(sceneTapAndHoldTimeout));
- connect(&mTimer, SIGNAL(timeout()),
- SLOT(sceneInteraction_onTapAndHoldTimeout()));
- mTimer.start();
-}
-
-/*!
- Disconnects the sceneInteraction state's mouse event handlers.
-*/
-void HsIdleState::action_sceneInteraction_disconnectMouseEventHandlers()
-{
- DISCONNECT_MOUSE_EVENT_HANDLER(mouseMoved, sceneInteraction_onMouseMoved)
- DISCONNECT_MOUSE_EVENT_HANDLER(mouseReleased, sceneInteraction_onMouseReleased)
-}
-
-/*!
- Disconnects the sceneInteraction state's gesture timers.
-*/
-void HsIdleState::action_sceneInteraction_disconnectGestureTimers()
-{
- disconnect(&mTimer, SIGNAL(timeout()),
- this, SLOT(sceneInteraction_onTapAndHoldTimeout()));
-}
-
-/*!
Reparents the active widget to the control layer.
*/
void HsIdleState::action_moveWidget_reparentToControlLayer()
@@ -942,13 +978,77 @@
mAllowZoneAnimation = true;
}
+void HsIdleState::action_moveWidget_connectGestureHandlers()
+{
+ HsScene *scene = HsScene::instance();
+
+ connect(scene,
+ SIGNAL(widgetMoveUpdated(const QPointF&,HsWidgetHost*)),
+ SLOT(onWidgetMoveUpdated(const QPointF&,HsWidgetHost*)),
+ Qt::UniqueConnection);
+
+ connect(scene,
+ SIGNAL(widgetMoveFinished(const QPointF&,HsWidgetHost*)),
+ SLOT(onWidgetMoveFinished(const QPointF&,HsWidgetHost*)),
+ Qt::UniqueConnection);
+}
+
/*!
- Connects the moveWidget state's mouse event handlers.
+ Initializes the presentation to the snapping algorithm
+ Connects the SIGNAL for changing the presentation on active page changed
+ Connects the timer for showing the snap lines
*/
-void HsIdleState::action_moveWidget_connectMouseEventHandlers()
+void HsIdleState::action_moveWidget_setWidgetSnap()
{
- CONNECT_MOUSE_EVENT_HANDLER(mouseMoved, moveWidget_onMouseMoved)
- CONNECT_MOUSE_EVENT_HANDLER(mouseReleased, moveWidget_onMouseReleased)
+ if (HSCONFIGURATION_GET(isSnapEnabled)) {
+ mSnapBorderGap = HSCONFIGURATION_GET(snapBorderGap);
+
+ QVariantHash snapConfiguration;
+ snapConfiguration[SNAPENABLED] = QString::number(HSCONFIGURATION_GET(isSnapEnabled));
+ snapConfiguration[SNAPFORCE] = QString::number(HSCONFIGURATION_GET(snapForce));
+ snapConfiguration[SNAPGAP] = QString::number(HSCONFIGURATION_GET(snapGap));
+ snapConfiguration[SNAPBORDERGAP] = mSnapBorderGap;
+ HsWidgetPositioningOnWidgetMove::instance()->setConfiguration(snapConfiguration);
+
+
+ updatePagePresentationToWidgetSnap();
+
+ connect(HsScene::instance(), SIGNAL(activePageChanged()),
+ SLOT(onActivePageChanged()));
+
+ if (HSCONFIGURATION_GET(isSnapEffectsEnabled)) {
+ mVerticalSnapLineTimer.setInterval(HSCONFIGURATION_GET(snapTimeout));
+ mHorizontalSnapLineTimer.setInterval(HSCONFIGURATION_GET(snapTimeout));
+
+ connect(&mVerticalSnapLineTimer, SIGNAL(timeout()),
+ SLOT(onVerticalSnapLineTimerTimeout()));
+ connect(&mHorizontalSnapLineTimer, SIGNAL(timeout()),
+ SLOT(onHorizontalSnapLineTimerTimeout()));
+
+ }
+ }
+}
+
+/*!
+ Create the list of inactive rectangles on the page.
+*/
+QList<QRectF> HsIdleState::createInactiveWidgetRects()
+{
+ HsScene *scene = HsScene::instance();
+ HsPage *activePage = scene->activePage();
+ HsWidgetHost *activeWidget = scene->activeWidget();
+
+ QList<QRectF> incativeWidgetRects;
+
+ foreach (HsWidgetHost* widget, activePage->widgets()) {
+ //If the above function returns the active widget, skip over it as widget and mMovingRect represent same widget.
+ if (widget == activeWidget) {
+ continue;
+ }
+ QRectF widgetRect = widget->geometry();
+ incativeWidgetRects.append(widgetRect);
+ }
+ return incativeWidgetRects;
}
/*!
@@ -956,8 +1056,6 @@
*/
void HsIdleState::action_moveWidget_reparentToPage()
{
- mTimer.stop();
-
if (mZoneAnimation
&& mZoneAnimation->state() == QAbstractAnimation::Running
&& mZoneAnimation->direction() == QAbstractAnimation::Forward) {
@@ -987,8 +1085,18 @@
QRectF widgetRect = widget->geometry();
QRectF pageRect = page->rect();
- qreal widgetX = qBound(qreal(0), widgetRect.x(), pageRect.width() - widgetRect.width());
- qreal widgetY = qBound(qreal(64), widgetRect.y(), pageRect.height() - widgetRect.height());
+
+ //Set the snap position of the widget and save the position
+ if (mSnapResult.hasHorizontalSnap) {
+ widgetRect.moveLeft(mSnapResult.horizontalSnapPosition);
+ }
+ if (mSnapResult.hasVerticalSnap) {
+ widgetRect.moveTop(mSnapResult.verticalSnapPosition);
+ }
+
+ //if snapBorderGap is defined, the widget is bounded in the rectangle which is smaller by snapBorderGap on all sides
+ qreal widgetX = qBound(qreal(0) + mSnapBorderGap, widgetRect.x(), (pageRect.width() - mSnapBorderGap) - widgetRect.width());
+ qreal widgetY = qBound(qreal(64) + mSnapBorderGap, widgetRect.y(), (pageRect.height() - mSnapBorderGap) - widgetRect.height());
// play feedback effect if user drops widget between pages and it needs to be repositioned back to original page
if( widgetX != widgetRect.x() || widgetY != widgetRect.y()) {
@@ -1016,13 +1124,32 @@
}
}
+void HsIdleState::action_moveWidget_disconnectGestureHandlers()
+{
+ HsScene *scene = HsScene::instance();
+ scene->disconnect(this);
+}
+
/*!
- Disconnects the moveWidget state's mouse event handlers.
+ Resets the snap position
+ Disconnect the Active Page Changed SIGNAL
+ Disconnects the timers to show snap lines
*/
-void HsIdleState::action_moveWidget_disconnectMouseEventHandlers()
+void HsIdleState::action_moveWidget_deleteWidgetSnap()
{
- DISCONNECT_MOUSE_EVENT_HANDLER(mouseMoved, moveWidget_onMouseMoved)
- DISCONNECT_MOUSE_EVENT_HANDLER(mouseReleased, moveWidget_onMouseReleased)
+ if (HSCONFIGURATION_GET(isSnapEnabled)) {
+ resetSnapPosition();
+
+ disconnect(HsScene::instance(), SIGNAL(activePageChanged()),
+ this, SLOT(onActivePageChanged()));
+
+ if (HSCONFIGURATION_GET(isSnapEffectsEnabled)) {
+ disconnect(&mVerticalSnapLineTimer, SIGNAL(timeout()),
+ this, SLOT(onVerticalSnapLineTimerTimeout()));
+ disconnect(&mHorizontalSnapLineTimer, SIGNAL(timeout()),
+ this, SLOT(onHorizontalSnapLineTimerTimeout()));
+ }
+ }
}
/*!
@@ -1033,13 +1160,19 @@
mAllowZoneAnimation = false;
}
-/*!
- Connects the moveScene state's mouse event handlers.
-*/
-void HsIdleState::action_moveScene_connectMouseEventHandlers()
+void HsIdleState::action_moveScene_connectGestureHandlers()
{
- CONNECT_MOUSE_EVENT_HANDLER(mouseMoved, moveScene_onMouseMoved)
- CONNECT_MOUSE_EVENT_HANDLER(mouseReleased, moveScene_onMouseReleased)
+ HsScene *scene = HsScene::instance();
+
+ connect(scene,
+ SIGNAL(pagePanUpdated(QGestureEvent*)),
+ SLOT(onPagePanUpdated(QGestureEvent*)),
+ Qt::UniqueConnection);
+
+ connect(scene,
+ SIGNAL(pagePanFinished(QGestureEvent*)),
+ SLOT(onPagePanFinished(QGestureEvent*)),
+ Qt::UniqueConnection);
}
/*!
@@ -1063,43 +1196,11 @@
startPageChangeAnimation(pageIndex, HSCONFIGURATION_GET(pageChangeAnimationDuration));
}
-/*!
- Disconnects the moveScene state's mouse event handlers.
-*/
-void HsIdleState::action_moveScene_disconnectMouseEventHandlers()
-{
- DISCONNECT_MOUSE_EVENT_HANDLER(mouseMoved, moveScene_onMouseMoved)
- DISCONNECT_MOUSE_EVENT_HANDLER(mouseReleased, moveScene_onMouseReleased)
-}
-
-#ifdef COVERAGE_MEASUREMENT
-#pragma CTC SKIP
-#endif //COVERAGE_MEASUREMENT
-/*!
- Shows the scene menu.
-*/
-void HsIdleState::action_sceneMenu_showMenu()
+void HsIdleState::action_moveScene_disconnectGestureHandlers()
{
- mSceneMenu = new HbMenu();
- mSceneMenu->setAttribute(Qt::WA_DeleteOnClose);
- mSceneMenu->setDismissPolicy(HbDialog::TapOutside);
- //This is used to check if any action is not triggered ( == menu is dismissed by user or timeout).
- connect(mSceneMenu, SIGNAL(aboutToClose()), this, SLOT(onSceneMenuAboutToClose()));
-
- mSceneMenu->addAction(hbTrId(hsLocTextId_ContextMenu_AddContent), this, SLOT(onAddContentActionTriggered()));
-
HsScene *scene = HsScene::instance();
- if (scene->pages().count() < HSCONFIGURATION_GET(maximumPageCount)) {
- mSceneMenu->addAction(hbTrId(hsLocTextId_OptionsMenu_AddPage), this, SIGNAL(event_addPage()));
- }
-
- mSceneMenu->addAction(hbTrId(hsLocTextId_ContextMenu_ChangeWallpaper), this, SIGNAL(event_selectWallpaper()));
- mSceneMenu->setPreferredPos(mTouchScenePos);
- mSceneMenu->open(this, SLOT(onSceneMenuTriggered(HbAction *)));
+ scene->disconnect(this);
}
-#ifdef COVERAGE_MEASUREMENT
-#pragma CTC ENDSKIP
-#endif //COVERAGE_MEASUREMENT
/*!
Adds a new page to the scene.
@@ -1135,13 +1236,11 @@
QAction *buttonOk = box->actions().at(0);
//We are keen only from OK button. Cancel is not connected to any slot.
connect(buttonOk, SIGNAL(triggered()), SLOT(onRemovePageConfirmationOk()));
-
- HsScene::mainWindow()->setInteractive(true);
-
+
box->open();
-#endif //HOMESCREEN_TEST
+#endif // HOMESCREEN_TEST
} else {
- //Empty page can be removed without confirmation
+ // Empty page can be removed without confirmation
removeActivePage();
}
}
@@ -1155,291 +1254,6 @@
scene->setOnline(!scene->isOnline());
}
-/*!
- Handles mouse press events for the waitInput state.
- Filters events for the item \a watched. \a event is the
- filtered event. Sets the \a filtered true if the event
- was filtered by this handler.
-*/
-void HsIdleState::waitInput_onMousePressed(
- QGraphicsItem *watched, QGraphicsSceneMouseEvent *event, bool &filtered)
-{
- filtered = true;
-
- HsScene *scene = HsScene::instance();
- HsPage *page = scene->activePage();
- QList<HsWidgetHost *> widgets = page->widgets();
-
- if (mUiWidget->controlLayer() == watched ||
- mUiWidget->controlLayer()->isAncestorOf(watched)) {
- filtered = false;
- return;
- }
-
- mUiWidget->captureDelayedPress(event);
-
- foreach (HsWidgetHost *widget, widgets) {
- if (widget == watched || widget->isAncestorOf(watched)) {
- scene->setActiveWidget(widget);
- emit event_widgetInteraction();
- return;
- }
- }
-
- mTouchScenePos = event->scenePos();
- emit event_sceneInteraction();
-}
-
-/*!
- Handles mouse move events for the widgetInteraction state.
- Filters events for the item \a watched. \a event is the
- filtered event. Sets the \a filtered true if the event
- was filtered by this handler.
-*/
-void HsIdleState::widgetInteraction_onMouseMoved(
- QGraphicsItem *watched, QGraphicsSceneMouseEvent *event, bool &filtered)
-{
- Q_UNUSED(watched)
- Q_UNUSED(filtered)
-
- if (!mTimer.isActive()) {
- return;
- }
-
- filtered = true;
-
- QPointF point =
- event->scenePos() - event->buttonDownScenePos(Qt::LeftButton);
- if (HSCONFIGURATION_GET(tapAndHoldDistance) < point.manhattanLength()) {
- // Threshold area for tap exceeded. This is pan or swipe
- mTimer.stop();
- if (HsScene::instance()->activeWidget()->isPannable(event)) {
- // let widget get first press
- mUiWidget->sendDelayedPress();
- } else {
- // Widget doesn't consume pan or swipe gestures
- mUiWidget->clearDelayedPress();
- emit event_moveScene();
- }
- }
-}
-
-/*!
- Handles mouse release events for the widgetInteraction state.
- Filters events for the item \a watched. \a event is the
- filtered event. Sets the \a filtered true if the event
- was filtered by this handler.
-*/
-void HsIdleState::widgetInteraction_onMouseReleased(
- QGraphicsItem *watched, QGraphicsSceneMouseEvent *event, bool &filtered)
-{
- Q_UNUSED(watched)
- Q_UNUSED(event)
- Q_UNUSED(filtered)
-
- if (mTimer.isActive()) {
- mTimer.stop();
- mUiWidget->sendDelayedPress();
- }
-
- HsPage *page = HsScene::instance()->activePage();
- QMetaObject::invokeMethod(page, "updateZValues", Qt::QueuedConnection);
-
- emit event_waitInput();
-}
-
-/*!
- Handles mouse move events for the sceneInteraction state.
- Filters events for the item \a watched. \a event is the
- filtered event. Sets the \a filtered true if the event
- was filtered by this handler.
-*/
-void HsIdleState::sceneInteraction_onMouseMoved(
- QGraphicsItem *watched, QGraphicsSceneMouseEvent *event, bool &filtered)
-{
- Q_UNUSED(watched)
- Q_UNUSED(filtered)
-
- mTouchScenePos = event->scenePos();
-
- if (!mTimer.isActive()) {
- return;
- }
-
- filtered = true;
-
- QPointF point =
- event->scenePos() - event->buttonDownScenePos(Qt::LeftButton);
- if (HSCONFIGURATION_GET(tapAndHoldDistance) < point.manhattanLength()) {
- mTimer.stop();
- mUiWidget->clearDelayedPress();
- emit event_moveScene();
- }
-}
-
-/*!
- Handles mouse release events for the sceneInteraction state.
- Filters events for the item \a watched. \a event is the
- filtered event. Sets the \a filtered true if the event
- was filtered by this handler.
-*/
-void HsIdleState::sceneInteraction_onMouseReleased(
- QGraphicsItem *watched, QGraphicsSceneMouseEvent *event, bool &filtered)
-{
- Q_UNUSED(watched)
- Q_UNUSED(event)
- Q_UNUSED(filtered)
-
- filtered = true;
-
- if (mTimer.isActive()) {
- mTimer.stop();
- mUiWidget->clearDelayedPress();
- }
-
- emit event_waitInput();
-}
-
-/*!
- Handles mouse move events for the moveWidget state.
- Filters events for the item \a watched. \a event is the
- filtered event. Sets the \a filtered true if the event
- was filtered by this handler.
-*/
-void HsIdleState::moveWidget_onMouseMoved(
- QGraphicsItem *watched, QGraphicsSceneMouseEvent *event, bool &filtered)
-{
- Q_UNUSED(watched)
-
- HsScene *scene = HsScene::instance();
- HsWidgetHost *widget = scene->activeWidget();
- QRectF widgetRect = widget->geometry();
-
- //Move widget to new position:
- mTouchScenePos = event->scenePos();
- QPointF delta(event->scenePos() - event->lastScenePos());
- widgetRect.moveTopLeft(widgetRect.topLeft() + delta);
-
- //Widget can be moved over the pages left border
- qreal lowerBoundX = -widgetRect.width();
- HsPage *page = scene->activePage();
- QRectF pageRect = HsGui::idleView()->rect();
- //Widget can be moved over the pages right border
- qreal upperBoundX = pageRect.width();
-
- //Notice that chrome height is 64 pixels
- qreal lowerBoundY = qreal(64) - widgetRect.height();
- //Widget can be moved over the pages down border
- qreal upperBoundY = pageRect.height();
-
- qreal widgetX = qBound(lowerBoundX, widgetRect.x(), upperBoundX);
- qreal widgetY = qBound(lowerBoundY, widgetRect.y(), upperBoundY);
- /* if using ItemClipsChildrenToShape-flag in widgethost then
- setPos does not update position here, however setGeometry does it, QT bug?
- */
- widget->setGeometry(widgetX, widgetY, widgetRect.width(), widgetRect.height());
-
- int bounceFeedbackEffectDistance = HSCONFIGURATION_GET(bounceFeedbackEffectDistance);
- //Handle effects:
- //User is indicated by a tactile feedback if he/she is trying to move
- //widget over the first or the last page.
- if( (page == scene->pages().first() && mTouchScenePos.x() < bounceFeedbackEffectDistance ) ||
- (page == scene->pages().last() && scene->pages().count() == HSCONFIGURATION_GET(maximumPageCount)
- && mTouchScenePos.x() > pageRect.width() - bounceFeedbackEffectDistance)) {
- HbInstantFeedback::play(HSCONFIGURATION_GET(widgetMoveBlockedFeedbackEffect));
- // TODO: use code below when Orbit has updated ContinuousFeedback API
- //if (!mContinuousFeedback->isPlaying()) {
- // mContinuousFeedback->play();
- //}
- }
- else /*if (mContinuousFeedback->isPlaying())*/ {
- //mContinuousFeedback->stop();
- }
-
- updateZoneAnimation();
- showTrashBin();
-
- filtered = true;
-}
-
-/*!
- Handles mouse release events for the moveWidget state.
- Filters events for the item \a watched. \a event is the
- filtered event. Sets the \a filtered true if the event
- was filtered by this handler.
-*/
-void HsIdleState::moveWidget_onMouseReleased(
- QGraphicsItem *watched, QGraphicsSceneMouseEvent *event, bool &filtered)
-{
- Q_UNUSED(watched)
- Q_UNUSED(event)
-
- filtered = true;
- emit event_waitInput();
-}
-
-/*!
- Handles mouse move events for the moveScene state.
- Filters events for the item \a watched. \a event is the
- filtered event. Sets the \a filtered true if the event
- was filtered by this handler.
-*/
-void HsIdleState::moveScene_onMouseMoved(
- QGraphicsItem *watched, QGraphicsSceneMouseEvent *event, bool &filtered)
-{
- Q_UNUSED(watched)
- Q_UNUSED(filtered)
-
- filtered = true;
-
- HsScene *scene = HsScene::instance();
- mDeltaX = event->scenePos().x() - event->buttonDownScenePos(Qt::LeftButton).x();
-
- int bounceEffect = HSCONFIGURATION_GET(bounceEffect);
-
- qreal x = qBound(pageLayerXPos(scene->pages().count() - 1) - bounceEffect / 2 / mUiWidget->parallaxFactor(),
- pageLayerXPos(scene->activePageIndex()) + mDeltaX,
- pageLayerXPos(0) + (bounceEffect / 2 / mUiWidget->parallaxFactor()));
-
- mUiWidget->setSceneX(x);
-}
-
-/*!
- Handles mouse release events for the moveScene state.
- Filters events for the item \a watched. \a event is the
- filtered event. Sets the \a filtered true if the event
- was filtered by this handler.
-*/
-void HsIdleState::moveScene_onMouseReleased(
- QGraphicsItem *watched, QGraphicsSceneMouseEvent *event, bool &filtered)
-{
- Q_UNUSED(watched)
- Q_UNUSED(filtered)
- filtered = true;
-
- mDeltaX = event->scenePos().x() - event->buttonDownScenePos(Qt::LeftButton).x();
-
- emit event_waitInput();
-}
-
-/*!
- Handles tap-and-hold events for the widgetInteraction state.
-*/
-void HsIdleState::widgetInteraction_onTapAndHoldTimeout()
-{
- mUiWidget->clearDelayedPress();
- emit event_moveWidget();
-}
-
-/*!
- Handles tap-and-hold events for the sceneInteraction state.
-*/
-void HsIdleState::sceneInteraction_onTapAndHoldTimeout()
-{
- mUiWidget->clearDelayedPress();
- emit event_sceneMenu();
-}
-
#ifdef COVERAGE_MEASUREMENT
#pragma CTC SKIP
#endif //COVERAGE_MEASUREMENT
@@ -1468,12 +1282,10 @@
if (isInLeftPageChangeZone() &&
0 < pageIndex) {
--pageIndex;
- }
- else if (isInRightPageChangeZone() &&
- pageIndex < scene->pages().count()) {
+ } else if (isInRightPageChangeZone() &&
+ pageIndex < scene->pages().count()) {
++pageIndex;
}
-
if (pageIndex == scene->pages().count()) {
if (pageIndex < HSCONFIGURATION_GET(maximumPageCount)) {
addPageToScene(pageIndex);
@@ -1483,11 +1295,11 @@
}
scene->setActivePageIndex(pageIndex);
startPageChangeAnimation(pageIndex, HSCONFIGURATION_GET(pageChangeAnimationDuration));
- }
- else {
+ } else {
scene->setActivePageIndex(pageIndex);
mUiWidget->setActivePage(pageIndex);
}
+
deleteZoneAnimation();
}
@@ -1500,21 +1312,6 @@
}
/*!
- Handles the close of the scene menu when menu is dismissed.
- While dismissed menu should be triggered with NULL action.
- Actions on menu are connected stright to desired slot or signal.
-*/
-void HsIdleState::onSceneMenuTriggered(HbAction *action)
-{
- //We check if menu was dismissed either by user tap in outside of the menu,
- //menu's dismiss timer timeouts or state_sceneMenu was exited by any other reason
- //than triggered action, e.g. applib activated while context menu is active.
- if(!action) {
- emit event_waitInput();
- }
-}
-
-/*!
Handles the close of remove page confirmation dialog for page having content.
*/
void HsIdleState::onRemovePageConfirmationOk()
@@ -1523,20 +1320,102 @@
}
/*!
- Handles the close of the scene menu.
+ Provides the page presentation to the Widget Snap algorithm
+*/
+void HsIdleState::updatePagePresentationToWidgetSnap()
+{
+ QRectF containerRect = HsScene::instance()->activePage()->rect();
+ containerRect.setTop(qreal(64));
+ HsWidgetHost *activeWidget = HsScene::instance()->activeWidget();
+ HsWidgetPositioningOnWidgetMove::instance()->setPagePresentation(containerRect, createInactiveWidgetRects(), activeWidget->geometry());
+}
- This workaround is needed since HbMenu does not trigger empty action in case of
- dismission of menu dialog. That functionality will be added in near future. Thereafter
- onSceneMenuTriggered() can handle dismissions (HbMenu::triggered() emitted with NULL
- action). This workaround can be removed at that time.
+/*!
+ Reset Snap position, hide the snap lines
*/
-void HsIdleState::onSceneMenuAboutToClose() {
- //We need to check if menu is dismissed either by user tap in outside of the menu or
- //menu's dismiss timer timeouts. There is active action if any action tapped otherwise
- //menu was dissmised.
- HbMenu *menu = static_cast<HbMenu*>(sender());
- if(!menu->activeAction()) {
- //mSceneMenu = 0; //Menu deletes itself at the close
- emit event_waitInput();
+void HsIdleState::resetSnapPosition()
+{
+ mSnapResult = HsWidgetPositioningOnWidgetMove::Result();
+ mPreviousSnapResult = HsWidgetPositioningOnWidgetMove::Result();
+ hideVerticalLine();
+ hideHorizontalLine();
+}
+
+/*!
+ Show the Vertical line for Snap guidance
+*/
+void HsIdleState::showVerticalLine()
+{
+ if (mPreviousSnapResult.verticalSnapLine.x1() != mSnapResult.verticalSnapLine.x1()) {
+ hideVerticalLine();
+ mVerticalSnapLineTimer.start();
+ }
+ else {
+ //As the Vertical Line position is at the same place,
+ //the timer was started when vertical line positions were at different locations
+ //the line will be shown when the timer expires.
+ //If timer has already expired, just show the line, which is redrawn to new geometry.
+ if (!mVerticalSnapLineTimer.isActive()) {
+ mUiWidget->showVerticalSnapLine(mSnapResult.verticalSnapLine);
+ }
}
}
+
+/*!
+ Timer for showing the Vertical line expires
+*/
+void HsIdleState::onVerticalSnapLineTimerTimeout()
+{
+ mUiWidget->showVerticalSnapLine(mSnapResult.verticalSnapLine);
+}
+
+/*!
+ Hide the Vertical line for Snap guidance
+*/
+void HsIdleState::hideVerticalLine()
+{
+ mUiWidget->hideVerticalSnapLine();
+ mVerticalSnapLineTimer.stop();
+}
+
+/*!
+ Show the Horizontal line for Snap guidance
+*/
+void HsIdleState::showHorizontalLine()
+{
+ if (mPreviousSnapResult.horizontalSnapLine.y1() != mSnapResult.horizontalSnapLine.y1()) {
+ hideHorizontalLine();
+ mHorizontalSnapLineTimer.start();
+ }
+ else {
+ if (!mHorizontalSnapLineTimer.isActive()) {
+ mUiWidget->showHorizontalSnapLine(mSnapResult.horizontalSnapLine);
+ }
+ }
+}
+
+/*!
+ Timer for showing the Horizontal line expires
+*/
+void HsIdleState::onHorizontalSnapLineTimerTimeout()
+{
+ mUiWidget->showHorizontalSnapLine(mSnapResult.horizontalSnapLine);
+}
+
+/*!
+ Hide the Horizontal line for Snap guidance
+*/
+void HsIdleState::hideHorizontalLine()
+{
+ mUiWidget->hideHorizontalSnapLine();
+ mHorizontalSnapLineTimer.stop();
+}
+
+/*!
+ Handles updating the Snap algorithm with page presentation on page change
+*/
+void HsIdleState::onActivePageChanged()
+{
+ updatePagePresentationToWidgetSnap();
+ resetSnapPosition();
+}