FCL/sf/mw/hb: comparison src/hbcore/gui/hbmainwindow.cpp

equal deleted inserted replaced

-:923ff622b8b9
+:4633027730f5
 #include <QGraphicsView>
 #include <QGraphicsWidget>
 #include <QGraphicsItem>
 #include <QGraphicsScene>
+#include <QApplication>
 #include "hbaction.h"
 #include "hbbackgrounditem_p.h"
+#include "hbscreenshotitem_p.h"
 #include "hbdeviceprofile_p.h"
 #include "hbindicatorgroup_p.h"
 #include "hbinstance.h"
 #include "hbinstance_p.h"
 #include "hbgraphicsscene.h"
 #include "hbmainwindoworientation_p.h"
 #include "hbfeaturemanager_r.h"
 #include "hboogmwatcher_p.h"
 #include "hbwindowobscured_p.h"
 #include "hbsleepmodelistener_p.h"
+#include "hbforegroundwatcher_p.h"
 #ifdef Q_OS_SYMBIAN
 #include <coecntrl.h>
 #include <w32std.h>
 #include "hbnativewindow_sym_p.h"
 Q_D(HbMainWindow);
 d->q_ptr = this;
 // No need for any default (e.g. blank white) background for this window.
 setAttribute(Qt::WA_NoSystemBackground);
+viewport()->setAttribute(Qt::WA_NoSystemBackground);
 setOptimizationFlag(QGraphicsView::DontSavePainterState);
 // Continue with basic initialization. Note: Prefer doing everything that is
 // not absolutely compulsory in _q_delayedConstruction instead.
 } else {
 d->mOrientation = d->mDefaultOrientation;
 d->mAutomaticOrientationSwitch = false;
 }
-#if defined(Q_WS_S60) || defined(HB_Q_WS_MAEMO)
+#if defined(Q_OS_SYMBIAN) || defined(HB_Q_WS_MAEMO)
 setWindowState(Qt::WindowFullScreen);
-#endif//Q_WS_S60
+#endif
 setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 setFrameStyle(QFrame::NoFrame);
 d->addBackgroundItem();
 }
 // add clipping item
 d->mClippingItem = new HbScreen;
+//makes sure clipiingItem layout is activated before any of its childitems.
+QApplication::postEvent(d->mClippingItem, new QEvent(QEvent::LayoutRequest));
 d->mClippingItem->setParentItem(d->mRootItem);
 d->mClippingItem->setZValue(HbPrivate::ContentZValue);
 // create content (stacked) widget
 d->mViewStackWidget = new HbContentWidget(this, d->mClippingItem);
 // are routed to it properly).
 HbOogmWatcher::instance();
 // Make sure the sleep mode listener instance is created.
 HbSleepModeListener::instance();
+// Have also the foregroundwatcher up and running.
+HbForegroundWatcher::instance();
 HbWindowObscured::installWindowEventFilter();
 #ifdef HB_GESTURE_FW
 // @todo remove after view auto-subscribes to gestures
 Q_D(HbMainWindow);
 HbView *oldView = currentView();
 // Switching to null view or to the one that is current will do nothing.
 if (view && oldView != view) {
 emit aboutToChangeView(oldView, view);
+if (isObscured()) {
+animate = false;
+}
 if (oldView && animate) {
 if (flags & Hb::ViewSwitchFullScreen) {
 flags |= Hb::ViewSwitchSequential;
 }
 if (flags & Hb::ViewSwitchUseBackAnim) {
 if (currentView()) {
 action = currentView()->navigationAction();
 }
 event->accept();
 break;
+#ifdef __WINSCW__
+// Support for testing orientation change on the winscw emulator: When enabled,
+// pressing '9' will toggle (and force) the orientation.
+case Qt::Key_9:
+if (QFile::exists("c:/resource/hb_ori_simu")) {
+if (orientation() == Qt::Horizontal) {
+setOrientation(Qt::Vertical);
+} else {
+setOrientation(Qt::Horizontal);
+}
+}
+QGraphicsView::keyPressEvent(event);
+break;
+#endif
 default:
 QGraphicsView::keyPressEvent(event);
 break;
 }
 QSize newSize(event->size());
 setSceneRect(0, 0, newSize.width(), newSize.height());
 d->mClippingItem->resize(newSize);
 if (d->mBgItem) {
 d->mBgItem->resize(newSize);
+}
+if (d->mScreenshotItem) {
+d->mScreenshotItem->resize(newSize);
 }
 }
 }
 /*!
 {
 #ifdef Q_OS_SYMBIAN
 // Enable surface transparency if QWidget did not do it already. This is a
 // workaround for having non-transparent surfaces filled automatically with
 // black color. The showEvent is a suitable place because the native control
-// is already created at this point, but it is not too late either.
+// is already created at this point, but it is not too late either. Note
+// that while this is meant to be a workaround, the system transition
+// effects may actually rely on (and require) this behavior.
 if (!testAttribute(Qt::WA_TranslucentBackground)) {
+// The Qt::WA_TranslucentBackground attribute cannot be used here
+// because that can only be enabled, disabling does not seem to be
+// supported.
 RWindow *const window = static_cast<RWindow *>(effectiveWinId()->DrawableWindow());
 window->SetSurfaceTransparency(true);
 }
 #endif
 QGraphicsView::showEvent(event);
 }
 /*!
-Reimplemented from QAbstractScrollArea::scrollContentsBy().
+\reimp
 */
 void HbMainWindow::scrollContentsBy(int dx, int dy)
 {
 // ignore scrolling attempt
 Q_UNUSED(dx);
 return d->mObscuredState;
 }
 /*
-// reimplemented from QWidget
+\reimp
 */
 bool HbMainWindow::event(QEvent *event)
 {
 Q_D(HbMainWindow);
 if (event->type() == HbEvent::WindowObscuredChanged) {
 HbWindowObscuredChangedEvent *wosEvent = static_cast<HbWindowObscuredChangedEvent *>(event);
 d->setObscuredState(wosEvent->obscuredState());
 }
 return QGraphicsView::event(event);
+}
+/*
+\reimp
+*/
+void HbMainWindow::drawBackground(QPainter *painter, const QRectF &rect)
+{
+QGraphicsView::drawBackground(painter, rect);
+// The background item's paint() does not get called automatically so call
+// it directly and optimize it by setting a proper clipping rectangle.
+Q_D(HbMainWindow);
+if (d->mBgItem) {
+// No need to save/restore the painter state here.
+if (d->mBgItem->imageMode() != Hb::DoNotDrawBackground &&
+(!qFuzzyCompare(rect.height(), d->mBgItem->boundingRect().height()) ||
+!qFuzzyCompare(rect.width(), d->mBgItem->boundingRect().width()))) {
+painter->setClipRect(rect, Qt::ReplaceClip);
+}
+d->mBgItem->paint(painter, 0, 0);
+}
 }
 HbRootItem::HbRootItem(QGraphicsItem *parent)
 : HbWidget(parent)
 {

changeset 21	4633027730f5
parent 7	923ff622b8b9
child 23	e6ad4ef83b23