FCL/sf/app/homescreen: comparison homescreenapp/hsdomainmodel/src/hspage.cpp

equal deleted inserted replaced

-:03646e8da489
+:30f14686fb04
 #include <QGraphicsLinearLayout>
 #include <HbInstance>
 #include "hsdomainmodeldatastructures.h"
 #include "hspage.h"
+#include "hspagenewwidgetlayout.h"
 #include "hsscene.h"
 #include "hsdatabase.h"
 #include "hswidgethost.h"
 #include "hswallpaper.h"
 #include "hswidgetpositioningonwidgetadd.h"
 #include "hswidgetpositioningonorientationchange.h"
+#include "hsconfiguration.h"
 /*!
 \class HsPage
-\ingroup group_hsutils
+\ingroup group_hsdomainmodel
 \brief Represents a page in the framework.
 HsPage is a parent for a group of widgets. HsPage can have a wallpaper.
 */
 /*!
 \a aFlags Window flags.
 */
 HsPage::HsPage(QGraphicsItem* parent)
 : HbWidget(parent),
 mDatabaseId(-1),
+mWallpaper(0),
 mRemovable(true)
 {
 setFlag(QGraphicsItem::ItemHasNoContents);
 setSizePolicy(QSizePolicy(QSizePolicy::Ignored,
 QSizePolicy::Ignored));
 /*!
 Destructor.
 */
 HsPage::~HsPage()
 {
+delete mWallpaper;
 }
 /*!
 Returns the database id.
 */
 HsDatabase *db = HsDatabase::instance();
 QList<HsWidgetData> datas;
 if (!db->widgets(mDatabaseId, datas)) {
 return false;
+}
+if (HSCONFIGURATION_GET(sceneType) == HsConfiguration::PageWallpapers) {
+mWallpaper = new HsPageWallpaper(this);
 }
 foreach (HsWidgetData data, datas) {
 HsWidgetHost *widget = new HsWidgetHost(data.id);
 mWidgets.append(widget);
 connectWidget(widget);
 widget->setPage(this);
 widget->setParentItem(this);
-widget->startWidget();
+widget->startWidget(isDefaultPage());
 }
 connect(HsScene::mainWindow(),
 SIGNAL(orientationChanged(Qt::Orientation)),
 SLOT(onOrientationChanged(Qt::Orientation)));
 return true;
+}
+/*!
+Return wallpaper.
+*/
+HsWallpaper *HsPage::wallpaper() const
+{
+return mWallpaper;
 }
 bool HsPage::addExistingWidget(HsWidgetHost *widgetHost)
 {
 if (!widgetHost) {
 rects << newWidget->rect();
 }
 HsWidgetPositioningOnWidgetAdd *algorithm =
 HsWidgetPositioningOnWidgetAdd::instance();
+QRectF pageRect = HsScene::mainWindow()->layoutRect();
+// chrome needs to be removed from the rect.
+pageRect.adjust( (qreal)0,(qreal)64,(qreal)0,(qreal)0);
 QList<QRectF> calculatedRects =
-algorithm->convert(HsScene::mainWindow()->layoutRect(), rects, QPointF());
+algorithm->convert(pageRect, rects, QPointF());
+HsPageNewWidgetLayout *newWidgetLayout = static_cast<HsPageNewWidgetLayout *>(layout());
+if (!newWidgetLayout) {
+newWidgetLayout = new HsPageNewWidgetLayout();
+setLayout(newWidgetLayout);
+}
 updateZValues();
 HsWidgetHost *widget = 0;
 for (int i = 0; i < mNewWidgets.count(); ++i) {
 widget = mNewWidgets.at(i);
+newWidgetLayout->addItem(widget);
 widget->setGeometry(calculatedRects.at(i));
 widget->savePresentation();
 widget->setPage(this);
 widget->setParentItem(this);
 widget->showWidget();
 {
 foreach (HsWidgetHost *widget, mWidgets) {
 widget->remove();
 }
 mWidgets.clear();
 foreach (HsWidgetHost *widget, mNewWidgets) {
 widget->remove();
 }
 mNewWidgets.clear();
 Sets removable flag to \a removable.
 */
 void HsPage::setRemovable(bool removable)
 {
 mRemovable = removable;
+}
+bool HsPage::isDefaultPage() const
+{
+return mDatabaseId == HSCONFIGURATION_GET(defaultPageId);
 }
 bool HsPage::isActivePage() const
 {
 return this == HsScene::instance()->activePage();
 {
 onWidgetFinished();
 }
 /*!
-Calculates new widget position on page when widget size changes
+Calculates new widget position on page when widget size changes. If page has layout then there are new widgets
+and we use layout to calculate new widget positions.
 */
 void HsPage::onWidgetResized()
 {
+if ( !layout() ) {
+HsWidgetHost *widget = qobject_cast<HsWidgetHost *>(sender());
+QRectF widgetRect = widget->geometry();
+QRectF pageRect = HsScene::mainWindow()->layoutRect();
+qreal widgetX = qBound(qreal(0), widgetRect.x(), pageRect.width() - widgetRect.width());
+qreal widgetY = qBound(qreal(64), widgetRect.y(), pageRect.height() - widgetRect.height());
+widget->setPos(widgetX, widgetY);
+} else {
+layout()->invalidate();
+}
+}
+void HsPage::onWidgetAvailable()
+{
 HsWidgetHost *widget = qobject_cast<HsWidgetHost *>(sender());
-QRectF widgetRect = widget->geometry();
-QRectF pageRect = HsScene::mainWindow()->layoutRect();
-qreal lowerBoundX = 0;
-qreal upperBoundX = pageRect.width() - widgetRect.width() / 2 - 10;
-upperBoundX = pageRect.width() - widgetRect.width();
-qreal widgetX = qBound(lowerBoundX, widgetRect.x(), upperBoundX);
-qreal widgetY = qBound(qreal(64), widgetRect.y(), pageRect.height() - widgetRect.height());
-widget->setPos(widgetX, widgetY);
-}
-void HsPage::onWidgetAvailable()
-{
-HsWidgetHost *widget = qobject_cast<HsWidgetHost *>(sender());
 mUnavailableWidgets.removeOne(widget);
 mWidgets.append(widget);
 widget->setParentItem(this);
 widget->startWidget(isActivePage());
 widget->show();
 }
 void HsPage::onWidgetUnavailable()
 {
 HsWidgetHost *widget = qobject_cast<HsWidgetHost *>(sender());
 if (mWidgets.contains(widget)) {
 widget->setParentItem(0);
 }
 void HsPage::onOrientationChanged(Qt::Orientation orientation)
 {
 QRectF rect = HsScene::mainWindow()->layoutRect();
 HsWidgetPositioningOnOrientationChange *converter =
 HsWidgetPositioningOnOrientationChange::instance();
 qreal chrome = 64;
 QRectF from(0, chrome, rect.height(), rect.width() - chrome);
 widget->savePresentation();
 } else {
 widget->setPos(presentation.pos());
 widget->setZValue(presentation.zValue);
 }
 }
 }
+/*!
+Clears new widgets list and resets layout.
+*/
+void HsPage::resetNewWidgets()
+{
+mNewWidgets.clear();
+setLayout(0);
+}

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