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

equal deleted inserted replaced

-:03646e8da489
+:30f14686fb04
 /*!
 \class HsIdleWidget
 \ingroup group_hshomescreenstateplugin
 \brief View part of the home screen idle state.
 Maintains the idle view ui layers and takes care of
 receiving user input and communicating it to the idle
 state for further processing.
 */
 /*!
 Constructs a new idle widget with the given \a parent.
 */
 HsIdleWidget::HsIdleWidget(QGraphicsItem *parent)
 : HbWidget(parent),
-mControlLayer(0), mPageLayer(0), mSceneLayer(0),
+mControlLayer(0), mPageLayer(0), mPageWallpaperLayer(0),
-mDelayedPressEvent(0),
+mSceneLayer(0), mDelayedPressEvent(0),
 mTrashBin(0), mPageIndicator(0)
 {
 setFlag(ItemHasNoContents);
 loadControlLayer();
 QGraphicsLinearLayout *linearLayout = 0;
 linearLayout = new QGraphicsLinearLayout(Qt::Horizontal);
 linearLayout->setContentsMargins(0, 0, 0, 0);
 linearLayout->setSpacing(0);
 mPageLayer = new HbWidget(this);
 mPageLayer->setLayout(linearLayout);
-mPageLayer->setZValue(1);
+mPageLayer->setZValue(2);
+linearLayout = new QGraphicsLinearLayout(Qt::Horizontal);
+linearLayout->setContentsMargins(0, 0, 0, 0);
+linearLayout->setSpacing(0);
+mPageWallpaperLayer = new HbWidget(this);
+mPageWallpaperLayer->setLayout(linearLayout);
+mPageWallpaperLayer->setZValue(1);
 linearLayout = new QGraphicsLinearLayout(Qt::Horizontal);
 linearLayout->setContentsMargins(0, 0, 0, 0);
 linearLayout->setSpacing(0);
 mSceneLayer = new HbWidget(this);
 foreach (HsPage *page, pages) {
 page->setParentItem(0);
 if (page->scene()) {
 page->scene()->removeItem(page);
 }
-}
+HsWallpaper *pageWallpaper = page->wallpaper();
+if (pageWallpaper) {
-HsWallpaper *wallpaper = HsScene::instance()->wallpaper();
+pageWallpaper->setParentItem(0);
-wallpaper->setParentItem(0);
+if (pageWallpaper->scene()) {
-if (wallpaper->scene()) {
+pageWallpaper->scene()->removeItem(pageWallpaper);
-wallpaper->scene()->removeItem(wallpaper);
+}
+}
+}
+HsWallpaper *sceneWallpaper = HsScene::instance()->wallpaper();
+if (sceneWallpaper) {
+sceneWallpaper->setParentItem(0);
+if (sceneWallpaper->scene()) {
+sceneWallpaper->scene()->removeItem(sceneWallpaper);
+}
+}
+}
+qreal HsIdleWidget::sceneX() const
+{
+return mPageLayer->x();
+}
+void HsIdleWidget::setSceneX(qreal x)
+{
+if (HSCONFIGURATION_GET(sceneType) == HsConfiguration::SceneWallpaper) {
+mPageLayer->setX(x);
+mSceneLayer->setX((parallaxFactor() * x) - HSCONFIGURATION_GET(bounceEffect) / 2);
+} else {
+mPageLayer->setX(x);
+mPageWallpaperLayer->setX(x);
 }
 }
 /*!
 Layouts the ui layers according to the given \a rect.
 int n = HsScene::instance()->pages().count();
 	QRectF layoutRect(HsScene::instance()->mainWindow()->layoutRect());
 if (layoutRect == rect || (layoutRect.height() == rect.width() && layoutRect.width() == rect.height())) {
 mControlLayer->resize(rect.size());
 		mPageLayer->resize(n * rect.width(), rect.height());
-		mSceneLayer->resize(2 * rect.width() + HsConfiguration::bounceEffect(), rect.height());
+if (HSCONFIGURATION_GET(sceneType) == HsConfiguration::PageWallpapers) {
+mPageWallpaperLayer->resize(n * rect.width(), rect.height());
+}
+		mSceneLayer->resize(2 * rect.width() + HSCONFIGURATION_GET(bounceEffect), rect.height());
 		HbWidget::setGeometry(rect);
 	} else {
 		QRectF sceneRect = mapToScene(rect).boundingRect();
 		sceneRect.setTop(-sceneRect.top());
 		HbWidget::setGeometry(sceneRect);
 */
 void HsIdleWidget::sendDelayedPress()
 {
 if (mDelayedPressEvent) {
 QApplication::sendEvent(HsScene::mainWindow()->viewport(), mDelayedPressEvent);
 clearDelayedPress();
 }
 }
 /*!
 Deletes the stored mouse press event.
 */
 void HsIdleWidget::clearDelayedPress()
 {
 if (mDelayedPressEvent) {
 delete mDelayedPressEvent;
 mDelayedPressEvent = 0;
 }
 }
 /*!
 Sets the active page \a index to the page
 indicator.
 */
 void HsIdleWidget::setActivePage(int index)
 {
 mPageIndicator->setActiveItemIndex(index);
 Inserts the given \a page at index position
 \a index in the page layer.
 */
 void HsIdleWidget::insertPage(int index, HsPage *page)
 {
 QGraphicsLinearLayout *layout =
 static_cast<QGraphicsLinearLayout *>(mPageLayer->layout());
 layout->insertItem(index, page);
 mPageLayer->resize(
 layout->count() * size().width(), size().height());
+if (HSCONFIGURATION_GET(sceneType) == HsConfiguration::PageWallpapers) {
+QGraphicsLinearLayout *layout =
+static_cast<QGraphicsLinearLayout *>(mPageWallpaperLayer->layout());
+layout->insertItem(index, page->wallpaper());
+mPageWallpaperLayer->resize(
+layout->count() * size().width(), size().height());
+}
 }
 /*!
 Removes the page at index position
 \a index in the page layer.
 */
 void HsIdleWidget::removePage(int index)
 {
 QGraphicsLinearLayout *layout =
 static_cast<QGraphicsLinearLayout *>(mPageLayer->layout());
 layout->removeAt(index);
 mPageLayer->resize(
 layout->count() * size().width(), size().height());
+if (HSCONFIGURATION_GET(sceneType) == HsConfiguration::PageWallpapers) {
+QGraphicsLinearLayout *layout =
+static_cast<QGraphicsLinearLayout *>(mPageWallpaperLayer->layout());
+layout->removeAt(index);
+mPageWallpaperLayer->resize(
+layout->count() * size().width(), size().height());
+}
 }
 /*!
 \fn HsIdleWidget::controlLayer() const
 /*!
 \fn HsIdleWidget::mousePressed(QGraphicsItem *, QGraphicsSceneMouseEvent *, bool &)
 The idle state connects to this signal for handling mouse
 press events. It 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.
 */
 /*!
 \fn HsIdleWidget::mouseMoved(QGraphicsItem *, QGraphicsSceneMouseEvent *, bool &)
 The idle state connects to this signal for handling mouse
 move events. It 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.
 */
 /*!
 \fn HsIdleWidget::mouseReleased(QGraphicsItem *, QGraphicsSceneMouseEvent *, bool &)
 The idle state connects to this signal for handling mouse
 release events. It 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.
 */
 /*!
 Sets the trashbin visible and hides the page indicator.
 void HsIdleWidget::showTrashBin()
 {
 mPageIndicator->hide();
 mTrashBin->show();
 }
 /*!
 Sets the page indicator visible and hides the trashbin.
 */
 void HsIdleWidget::showPageIndicator()
 {
 mTrashBin->hide();
 mTrashBin->deactivate();
-mPageIndicator->setSpacing(HsConfiguration::pageIndicatorSpacing()); // for usability optimization widget, can be removed later on
+mPageIndicator->setSpacing(HSCONFIGURATION_GET(pageIndicatorSpacing)); // for usability optimization widget, can be removed later on
 mPageIndicator->setVisible(1 < mPageIndicator->itemCount());
 }
 /*!
 Filters the main window's graphics scene (\a object) \a event.
 */
 bool HsIdleWidget::eventFilter(QObject *object, QEvent *event)
 {
 Q_UNUSED(object)
-if (HbVkbHost::activeVkbHost()) {
-setFiltersChildEvents(false);
-return false;
-}
 bool filtered = false;
 switch (event->type()) {
 case QEvent::GraphicsSceneMousePress:
+if (HbVkbHost::activeVkbHost()) {
+setFiltersChildEvents(false);
+break;
+}
 if (mDelayedPressEvent &&
 scene()->mouseGrabberItem()) {
 scene()->mouseGrabberItem()->ungrabMouse();
 }
 setFiltersChildEvents(!mDelayedPressEvent);
 break;
 case QEvent::GraphicsSceneMouseMove:
 emit mouseMoved(0, static_cast<QGraphicsSceneMouseEvent *>(event), filtered);
 break;
 case QEvent::GraphicsSceneMouseRelease:
-setItemsFocusable();
 emit mouseReleased(0, static_cast<QGraphicsSceneMouseEvent *>(event), filtered);
 if (filtered && scene()->mouseGrabberItem()) {
 scene()->mouseGrabberItem()->ungrabMouse();
 }
 break;
 default:
 break;
 }
 bool filtered = false;
 switch (event->type()) {
 case QEvent::GraphicsSceneMousePress:
 emit mousePressed(watched, static_cast<QGraphicsSceneMouseEvent *>(event), filtered);
-if (filtered) {
+break;
-setItemsUnfocusable(static_cast<QGraphicsSceneMouseEvent *>(event));
-}
-break;
 default:
 break;
 }
 return filtered;
 void HsIdleWidget::polishEvent()
 {
 HsScene *scene = HsScene::instance();
 Q_ASSERT(scene);
-QGraphicsLinearLayout *layout =
+QGraphicsLinearLayout *pageLayout =
 static_cast<QGraphicsLinearLayout *>(mPageLayer->layout());
 QList<HsPage *> pages = scene->pages();
 foreach (HsPage *page, pages) {
-layout->addItem(page);
+pageLayout->addItem(page);
-}
+if (HSCONFIGURATION_GET(sceneType) == HsConfiguration::PageWallpapers) {
+QGraphicsLinearLayout *pageWallpaperLayout =
-layout = static_cast<QGraphicsLinearLayout *>(mSceneLayer->layout());
+static_cast<QGraphicsLinearLayout *>(mPageWallpaperLayer->layout());
-HsWallpaper *wallpaper = HsScene::instance()->wallpaper();
+pageWallpaperLayout->addItem(page->wallpaper());
-layout->addItem(wallpaper);
+}
+}
+if (HSCONFIGURATION_GET(sceneType) == HsConfiguration::SceneWallpaper) {
+QGraphicsLinearLayout *sceneLayout =
+static_cast<QGraphicsLinearLayout *>(mSceneLayer->layout());
+	HsWallpaper *wallpaper = HsScene::instance()->wallpaper();
+sceneLayout->addItem(wallpaper);
+}
 mPageIndicator->initialize(pages.count(), scene->activePageIndex());
 showPageIndicator();
 HsScene::mainWindow()->scene()->installEventFilter(this);
 loader.load(file, &loaded);
 if (!loaded) {
 loader.load(fallbackPath, &loaded);
 }
 } else {
 loader.load(fallbackPath, &loaded);
 }
 if (loaded) {
 mControlLayer = qobject_cast<HbWidget *>(loader.findWidget(gControlLayerName));
-mControlLayer->setZValue(2);
+mControlLayer->setZValue(3);
 mControlLayer->setParentItem(this);
 mTrashBin = qobject_cast<HsTrashBinWidget *>(loader.findWidget(gTrashBinName));
 mTrashBin->setZValue(1e6);
 } else {
 // TODO: Handle error.
 }
 }
-/*!
+qreal HsIdleWidget::parallaxFactor() const
-Sets the items under the given mouse \a event scene position
+{
-unfocusable and stores the items.
+qreal clw = mControlLayer->size().width();
-*/
+qreal slw = mSceneLayer->size().width() - HSCONFIGURATION_GET(bounceEffect);
-void HsIdleWidget::setItemsUnfocusable(QGraphicsSceneMouseEvent *event)
+int n = HsScene::instance()->pages().count();
-{
+if (n < 2) {
-mFocusableItems.clear();
+return 1;
+} else {
-if (!scene()) {
+return (slw - clw) / ((n - 1) * clw);
-return;
+}
 }
-QList<QGraphicsItem *> items = scene()->items(event->scenePos());
-if (items.isEmpty()) {
-return;
-}
-int i = 0;
-for (; i < items.count(); ++i) {
-if (mPageLayer->isAncestorOf(items[i])) {
-++i;
-break;
-}
-}
-HsPage *page = HsScene::instance()->activePage();
-QList<HsWidgetHost *> widgets = page->widgets();
-for (; i < items.count(); ++i) {
-QGraphicsItem *item = items.at(i);
-if (page->isAncestorOf(item)) {
-foreach (HsWidgetHost *widget, widgets) {
-if ((item == widget || widget->isAncestorOf(item))&& item->isEnabled() && (item->flags() & QGraphicsItem::ItemIsFocusable)) {
-if (!item->isWidget() || static_cast<QGraphicsWidget *>(item)->focusPolicy() & Qt::ClickFocus) {
-item->setFlag(QGraphicsItem::ItemIsFocusable, false);
-mFocusableItems.append(item);
-}
-}
-}
-}
-}
-}
-/*!
-Sets the stored items focusable.
-*/
-void HsIdleWidget::setItemsFocusable()
-{
-foreach (QGraphicsItem *item, mFocusableItems) {
-item->setFlag(QGraphicsItem::ItemIsFocusable);
-}
-mFocusableItems.clear();
-}

changeset 60	30f14686fb04
parent 55	03646e8da489
child 61	2b1b11a301d2