FCL/sf/app/homescreen: comparison homescreenapp/stateplugins/hshomescreenstateplugin/src/hsidlestate.cpp

equal deleted inserted replaced

-:e4f038c420f7
+:3ac3aaebaee5
 {
 // States
 QState *state_waitInput = new QState(this);
 setInitialState(state_waitInput);
 QState *state_moveWidget = new QState(this);
+QState *state_moveWidgetMoving = new QState(state_moveWidget);
+QState *state_moveWidgetDelete = new QState(state_moveWidget);
+state_moveWidget->setInitialState(state_moveWidgetMoving);
 QState *state_moveScene = new QState(this);
 HsWallpaperSelectionState *state_wallpaperSelectionState =
 new HsWallpaperSelectionState(this);
 QState *state_addPage = new QState(this);
 QState *state_preRemovePage = new QState(this);
 state_waitInput->addTransition(
 this, SIGNAL(event_moveScene()), state_moveScene);
 state_waitInput->addTransition(
 this, SIGNAL(event_moveWidget()), state_moveWidget);
-state_moveWidget->addTransition(
+state_moveWidgetMoving->addTransition(
+this, SIGNAL(event_waitInput()), state_waitInput);
+state_moveWidgetMoving->addTransition(
+this, SIGNAL(event_MoveWidgetDelete()), state_moveWidgetDelete);
+state_moveWidgetDelete->addTransition(
 this, SIGNAL(event_waitInput()), state_waitInput);
 state_moveScene->addTransition(
 this, SIGNAL(event_waitInput()), state_waitInput);
 ENTRY_ACTION(state_moveWidget, action_moveWidget_reparentToControlLayer)
 ENTRY_ACTION(state_moveWidget, action_moveWidget_startWidgetDragEffect)
 ENTRY_ACTION(state_moveWidget, action_moveWidget_connectGestureHandlers)
 ENTRY_ACTION(state_moveWidget, action_moveWidget_connectOrientationChangeEventHandler)
 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_disableInteractive)
 EXIT_ACTION(state_moveWidget, action_moveWidget_disconnectGestureHandlers)
 EXIT_ACTION(state_moveWidget, action_moveWidget_disconnectOrientationChangeEventHandler)
 EXIT_ACTION(state_moveWidget, action_moveWidget_preventZoneAnimation)
 EXIT_ACTION(state_moveWidget, action_moveWidget_deleteWidgetSnap)
+ENTRY_ACTION(state_moveWidgetDelete, action_moveWidgetDelete_deleteWidgetOnTrashbin)
 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)
 Starts the page change animation based on the given \a targetPageIndex
 and \a duration.
 */
 void HsIdleState::startPageChangeAnimation(int targetPageIndex, int duration)
 {
-hbInstance->allMainWindows().first()->setInteractive(false);
+if (!HsScene::instance()->activeWidget()) {
+hbInstance->allMainWindows().first()->setInteractive(false);
+}
 HsPropertyAnimationWrapper *animation = HsGui::instance()->pageChangeAnimation();
 if (animation->isRunning()) {
 animation->stop();
 }
 animation->disconnect(this);
 }
 void HsIdleState::onWidgetTapStarted(QPointF point, HsWidgetHost *widget)
 {
 HsScene *scene = HsScene::instance();
-scene->setActiveWidget(widget);
 HsPage *page = scene->activePage();
 QMetaObject::invokeMethod(page, "updateZValues", Qt::QueuedConnection);
 HbVkbHost::HbVkbStatus status = HbVkbHostBridge::instance()->keypadStatus();
 if ( status == HbVkbHost::HbVkbStatusOpened && !isEditor(point, widget) ) {
 closeVirtualKeyboard();
 void HsIdleState::onWidgetMoveFinished(const QPointF &scenePos, HsWidgetHost *widget)
 {
 Q_UNUSED(scenePos)
 Q_UNUSED(widget)
-emit event_waitInput();
+emit event_MoveWidgetDelete();
 }
 /*!
 Lays out the active page's new widgets that were added
 from the application library.
 }
 void HsIdleState::action_idle_orientationChanged()
 {
 HsScene::instance()->activePage()->resetNewWidgets();
+stopPageChangeAnimations();
 action_idle_showActivePage();
 }
 /*!
 Installs the event filter.
 {
 HsPropertyAnimationWrapper *pageCrawlingAnimation =
 HsGui::instance()->pageCrawlingAnimation();
 if (pageCrawlingAnimation->isRunning()&&
 pageCrawlingAnimation->isForward()) {
 pageCrawlingAnimation->setDuration(HSCONFIGURATION_GET(pageChangeZoneReverseAnimationDuration));
 pageCrawlingAnimation->setBackward();
 }
 HsScene *scene = HsScene::instance();
 HsPage *page = scene->activePage();
 HsWidgetHost *widget = scene->activeWidget();
-if (HsGui::instance()->idleWidget()->trashBin()->isUnderMouse()) {
+if (widget) {
-HbInstantFeedback::play(HSCONFIGURATION_GET(widgetDropToTrashbinFeedbackEffect));
-widget->page()->removeWidget(widget);
-widget->remove();
-scene->setActiveWidget(0);
-} else {
 if (widget->page() != page) {
 widget->page()->removeWidget(widget);
 page->addExistingWidget(widget);
 if (HsGui::instance()->orientation() == Qt::Horizontal) {
 widget->removePresentation(Qt::Vertical);
 QPointF adjustedWidgetPosition = page->adjustedWidgetPosition(widgetRect);
 widget->visual()->setPos(adjustedWidgetPosition);
 widget->savePresentation();
 page->updateZValues();
-}
+widget->visual()->setParentItem(HsScene::instance()->activePage()->visual());
-widget->visual()->setParentItem(HsScene::instance()->activePage()->visual());
+}
 HsGui::instance()->idleWidget()->showPageIndicator();
+emit event_waitInput();
+}
+/*!
+Reparents the active widget to the active page.
+*/
+void HsIdleState::action_moveWidgetDelete_deleteWidgetOnTrashbin()
+{
+HsScene *scene = HsScene::instance();
+HsWidgetHost *widget = scene->activeWidget();
+if ( widget && HsGui::instance()->idleWidget()->trashBin()->isUnderMouse() ) {
+HbInstantFeedback::play(HSCONFIGURATION_GET(widgetDropToTrashbinFeedbackEffect));
+widget->page()->removeWidget(widget);
+widget->remove();
+scene->setActiveWidget(0);
+}
+emit event_waitInput();
 }
 /*!
 Starts the widget drop effect.
 */
 void HsIdleState::action_moveWidget_startWidgetDropEffect()
 {
 HsWidgetHost *widget = HsScene::instance()->activeWidget();
 if (widget) {
 widget->startDropEffect();
+}
+}
+/*!
+Set interactive to false.
+*/
+void HsIdleState::action_moveWidget_disableInteractive()
+{
+HsWidgetHost *widget = HsScene::instance()->activeWidget();
+if (widget) {
+HsPropertyAnimationWrapper *animation = HsGui::instance()->pageChangeAnimation();
+if (animation->isRunning()) {
+hbInstance->allMainWindows().first()->setInteractive(false);
+}
+HsScene::instance()->setActiveWidget(0);
 }
 }
 /*!
 Disconnects gesture handlers
 qobject_cast<QGraphicsWidget *>(widget->visual()->widget())->isAncestorOf(item);
 }
 }
 return isWidgetEditor;
 }
+/*!
+Stops page change and page crawling animations.
+*/
+void HsIdleState::stopPageChangeAnimations()
+{
+HsPropertyAnimationWrapper *animation = HsGui::instance()->pageChangeAnimation();
+if (animation->isRunning()) {
+animation->stop();
+hbInstance->allMainWindows().first()->setInteractive(true);
+}
+animation->disconnect(this);
+HsPropertyAnimationWrapper *pageCrawlingAnimation =
+HsGui::instance()->pageCrawlingAnimation();
+if (pageCrawlingAnimation->isRunning()) {
+pageCrawlingAnimation->stop();
+}
+}

changeset 90	3ac3aaebaee5
parent 86	e4f038c420f7
child 95	32e56106abf2