MCL/sf/mw/qt: comparison src/gui/kernel/qwidget

equal deleted inserted replaced

-:56cd8111b7f7
+:41300fa6a67c
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtGui of the Qt Toolkit.
+** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
 ** This file contains pre-release code and may not be distributed.
 ** You may use this file in accordance with the terms and conditions
 Q_ASSERT(q->testAttribute(Qt::WA_WState_Created));
 if ((q->windowType() == Qt::Desktop))
 return;
+QPoint oldPos(q->pos());
+QSize oldSize(q->size());
+QRect oldGeom(data.crect);
+// Lose maximized status if deliberate resize
+if (w != oldSize.width() || h != oldSize.height())
+data.window_state &= ~Qt::WindowMaximized;
 if (extra) {                                // any size restrictions?
 w = qMin(w,extra->maxw);
 h = qMin(h,extra->maxh);
 w = qMax(w,extra->minw);
 h = qMax(h,extra->minh);
 uint s = data.window_state;
 s &= ~(Qt::WindowMaximized | Qt::WindowFullScreen);
 data.window_state = s;
 }
-QPoint oldPos(q->pos());
-QSize oldSize(q->size());
-QRect oldGeom(data.crect);
 bool isResize = w != oldSize.width() || h != oldSize.height();
 if (!isMove && !isResize)
 return;
-if (isResize)
-data.window_state &= ~Qt::WindowMaximized;
 if (q->isWindow()) {
 if (w == 0 || h == 0) {
 q->setAttribute(Qt::WA_OutsideWSRange, true);
 if (q->isVisible() && q->testAttribute(Qt::WA_Mapped))
 if (!q->testAttribute(Qt::WA_Moved) && !q->testAttribute(Qt::WA_DontShowOnScreen))
 data.crect.moveTopLeft(QPoint(clientRect.iTl.iX, clientRect.iTl.iY));
 QScopedPointer<QSymbianControl> control( q_check_ptr(new QSymbianControl(q)) );
 QT_TRAP_THROWING(control->ConstructL(true, desktop));
+control->SetMopParent(static_cast<CEikAppUi*>(S60->appUi()));
 // Symbian windows are always created in an inactive state
 // We perform this assignment for the case where the window is being re-created
 // as aa result of a call to setParent_sys, on either this widget or one of its
 // ancestors.
 RDrawableWindow *const drawableWindow = control->DrawableWindow();
 // Request mouse move events.
 drawableWindow->PointerFilter(EPointerFilterEnterExit
 | EPointerFilterMove | EPointerFilterDrag, 0);
-if (q->isVisible() && q->testAttribute(Qt::WA_Mapped))
+if (q->isVisible() && q->testAttribute(Qt::WA_Mapped)) {
 activateSymbianWindow(control.data());
+control->MakeVisible(true);
+}
 // We wait until the control is fully constructed before calling setWinId, because
 // this generates a WinIdChanged event.
 setWinId(control.take());
 }
 id->MakeVisible(true);
 if(q->isWindow())
 id->setFocusSafely(true);
-// Force setting of the icon after window is made visible,
-// this is needed even WA_SetWindowIcon is not set, as in that case we need
-// to reset to the application level window icon
-if(q->isWindow())
-setWindowIcon_sys(true);
 }
 invalidateBuffer(q->rect());
 }
 void QWidgetPrivate::lower_sys()
 {
 Q_Q(QWidget);
 Q_ASSERT(q->testAttribute(Qt::WA_WState_Created));
-if (q->internalWinId())
+if (q->internalWinId()) {
-q->internalWinId()->DrawableWindow()->SetOrdinalPosition(-1);
+// If toplevel widget, lower app to background
+if (q->isWindow())
+S60->wsSession().SetWindowGroupOrdinalPosition(S60->windowGroup().Identifier(), -1);
+else
+q->internalWinId()->DrawableWindow()->SetOrdinalPosition(-1);
+}
 if (!q->isWindow())
 invalidateBuffer(q->rect());
 }
 window->SetBackgroundColor(TRgb(255, 255, 255, 0));
 } else
 window->SetTransparentRegion(TRegionFix<1>());
 }
-CFbsBitmap* qt_pixmapToNativeBitmap(QPixmap pixmap, bool invert)
-{
-CFbsBitmap* fbsBitmap = q_check_ptr(new CFbsBitmap);    // CBase derived object needs check on new
-TSize size(pixmap.size().width(), pixmap.size().height());
-TDisplayMode mode(EColor16MU);
-bool isNull = pixmap.isNull();
-int depth = pixmap.depth();
-// TODO: dummy assumptions from bit amounts for each color
-// Will fix later on when native pixmap is implemented
-switch(pixmap.depth()) {
-case 1:
-mode = EGray2;
-break;
-case 4:
-mode = EColor16;
-break;
-case 8:
-mode = EColor256;
-break;
-case 12:
-mode = EColor4K;
-break;
-case 16:
-mode = EColor64K;
-break;
-case 24:
-mode = EColor16M;
-break;
-case 32:
-case EColor16MU:
-break;
-default:
-qFatal("Unsupported pixmap depth");
-break;
-}
-qt_symbian_throwIfError(fbsBitmap->Create(size, mode));
-fbsBitmap->LockHeap();
-QImage image = pixmap.toImage();
-if (invert)
-image.invertPixels();
-int height = pixmap.size().height();
-for(int i=0;i<height;i++ )
-{
-TPtr8 scanline(image.scanLine(i), image.bytesPerLine(), image.bytesPerLine());
-fbsBitmap->SetScanLine( scanline, i );
-}
-fbsBitmap->UnlockHeap();
-return fbsBitmap;
-}
 void QWidgetPrivate::setWindowIcon_sys(bool forceReset)
 {
 #ifdef Q_WS_S60
 Q_Q(QWidget);
 if (mask.isNull()) {
 mask = QBitmap(pm.size());
 mask.fill(Qt::color1);
 }
-// Convert to CFbsBitmp
+CFbsBitmap* nBitmap = pm.toSymbianCFbsBitmap();
-// TODO: When QPixmap is adapted to use native CFbsBitmap,
+CFbsBitmap* nMask = mask.toSymbianCFbsBitmap();
-// it could be set directly to context pane
-CFbsBitmap* nBitmap = qt_pixmapToNativeBitmap(pm, false);
-CFbsBitmap* nMask = qt_pixmapToNativeBitmap(mask, true);
 contextPane->SetPicture(nBitmap,nMask);
 } else {
 // Icon set to null -> set context pane picture to default
 QT_TRAP_THROWING(contextPane->SetPictureToDefaultL());
 }
 if (mask.isNull()) {
 mask = QBitmap(pm.size());
 mask.fill(Qt::color1);
 }
-// Convert to CFbsBitmp
+CFbsBitmap* nBitmap = pm.toSymbianCFbsBitmap();
-// TODO: When QPixmap is adapted to use native CFbsBitmap,
+CFbsBitmap* nMask = mask.toSymbianCFbsBitmap();
-// it could be set directly to context pane
-CFbsBitmap* nBitmap = qt_pixmapToNativeBitmap(pm, false);
-CFbsBitmap* nMask = qt_pixmapToNativeBitmap(mask, true);
 titlePane->SetSmallPicture( nBitmap, nMask, ETrue );
 } else {
 // Icon set to null -> set context pane picture to default
 titlePane->SetSmallPicture( NULL, NULL, EFalse );
 }
 }
 void QWidgetPrivate::createSysExtra()
 {
 extra->activated = 0;
-extra->disableBlit = 0;
+extra->nativePaintMode = QWExtra::Default;
+extra->receiveNativePaintEvents = 0;
 }
 void QWidgetPrivate::deleteSysExtra()
 {
 // this should only be non-zero if destroy() has not run due to constructor fail
 }
 if (destroyWindow && !(windowType() == Qt::Desktop) && id) {
 if (id->IsFocused()) // Avoid unnecessry calls to FocusChanged()
 id->setFocusSafely(false);
 id->ControlEnv()->AppUi()->RemoveFromStack(id);
-// Hack to activate window under destroyed one. With this activation
-// the next visible window will get keyboard focus
-WId wid = CEikonEnv::Static()->AppUi()->TopFocusedControl();
-if (wid) {
-QWidget *widget = QWidget::find(wid);
-QApplication::setActiveWindow(widget);
-if (widget) {
-// Reset global window title for focusing window
-widget->d_func()->setWindowTitle_sys(widget->windowTitle());
-}
-}
 }
 }
 QT_TRY {
 d->setWinId(0);
 }
 }
 void QWidget::grabMouse()
 {
-if (!qt_nograb()) {
+if (isVisible() && !qt_nograb()) {
 if (QWidgetPrivate::mouseGrabber && QWidgetPrivate::mouseGrabber != this)
 QWidgetPrivate::mouseGrabber->releaseMouse();
 Q_ASSERT(testAttribute(Qt::WA_WState_Created));
 WId id = effectiveWinId();
 id->SetPointerCapture(true);
 }
 #ifndef QT_NO_CURSOR
 void QWidget::grabMouse(const QCursor &cursor)
 {
-if (!qt_nograb()) {
+if (isVisible() && !qt_nograb()) {
 if (QWidgetPrivate::mouseGrabber && QWidgetPrivate::mouseGrabber != this)
 QWidgetPrivate::mouseGrabber->releaseMouse();
 Q_ASSERT(testAttribute(Qt::WA_WState_Created));
 WId id = effectiveWinId();
 id->SetPointerCapture(true);

changeset 3	41300fa6a67c
parent 0	1918ee327afb
child 4	3b1da2848fc7