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

equal deleted inserted replaced

-:ef0373b55136
+:758a864f9613
 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
+// as a result of a call to setParent_sys, on either this widget or one of its
 // ancestors.
 extra->activated = 0;
 if (!desktop) {
 TInt stackingFlags;
 QScopedPointer<QSymbianControl> control( q_check_ptr(new QSymbianControl(q)) );
 QT_TRAP_THROWING(control->ConstructL(!parentWidget));
 // 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
+// as a result of a call to setParent_sys, on either this widget or one of its
 // ancestors.
 extra->activated = 0;
 TInt stackingFlags;
 if ((q->windowType() & Qt::Popup) == Qt::Popup) {
 if (q->internalWinId()) {
 if (!extra->activated)
 activateSymbianWindow();
 QSymbianControl *id = static_cast<QSymbianControl *>(q->internalWinId());
+const bool isFullscreen = q->windowState() & Qt::WindowFullScreen;
 #ifdef Q_WS_S60
 // Lazily initialize the S60 screen furniture when the first window is shown.
-if (!QApplication::testAttribute(Qt::AA_S60DontConstructApplicationPanes)
+if (q->isWindow() && !QApplication::testAttribute(Qt::AA_S60DontConstructApplicationPanes)
 && !S60->buttonGroupContainer() && !S60->statusPane()) {
-bool isFullscreen = q->windowState() & Qt::WindowFullScreen;
 if (!q->testAttribute(Qt::WA_DontShowOnScreen)) {
 // Create the status pane and CBA here
 CEikAppUi *ui = static_cast<CEikAppUi *>(S60->appUi());
 if (S60->statusPane()) {
 // Use QDesktopWidget as the status pane observer to proxy for the AppUi.
 // Can't use AppUi directly because it privately inherits from MEikStatusPaneObserver.
 QSymbianControl *desktopControl = static_cast<QSymbianControl *>(QApplication::desktop()->winId());
 S60->statusPane()->SetObserver(desktopControl);
-// Hide the status pane if fullscreen OR
-// Fill client area if maximized OR
-// Put window below status pane unless the window has an explicit position.
 if (isFullscreen) {
-S60->statusPane()->MakeVisible(false);
+const bool cbaVisible = S60->buttonGroupContainer() && S60->buttonGroupContainer()->IsVisible();
-} else if (q->windowState() & Qt::WindowMaximized) {
+S60->setStatusPaneAndButtonGroupVisibility(false, cbaVisible);
-TRect r = static_cast<CEikAppUi*>(S60->appUi())->ClientRect();
-id->SetExtent(r.iTl, r.Size());
-} else if (!q->testAttribute(Qt::WA_Moved)) {
-id->SetPosition(static_cast<CEikAppUi*>(S60->appUi())->ClientRect().iTl);
 }
 }
 }
 }
 #endif
+// Fill client area if maximized OR
+// Put window below status pane unless the window has an explicit position.
+if (!isFullscreen) {
+if (q->windowState() & Qt::WindowMaximized) {
+TRect r = static_cast<CEikAppUi*>(S60->appUi())->ClientRect();
+id->SetExtent(r.iTl, r.Size());
+} else if (!q->testAttribute(Qt::WA_Moved)) {
+id->SetPosition(static_cast<CEikAppUi*>(S60->appUi())->ClientRect().iTl);
+}
+}
 id->MakeVisible(true);
 if(q->isWindow())
 id->setFocusSafely(true);
 q->setAttribute(Qt::WA_DropSiteRegistered, false);
 QSymbianControl *old_winid = static_cast<QSymbianControl *>(wasCreated ? data.winid : 0);
 if ((q->windowType() == Qt::Desktop))
 old_winid = 0;
+// old_winid may not have received a 'not visible' visibility
+// changed event before being destroyed; make sure that it is
+// removed from the backing store's list of visible windows.
+S60->controlVisibilityChanged(old_winid, false);
 setWinId(0);
 // hide and reparent our own window away. Otherwise we might get
 // destroyed when emitting the child remove event below. See QWorkspace.
 if (wasCreated && old_winid) {
 {
 #ifdef QT_SYMBIAN_SUPPORTS_ADVANCED_POINTER
 Q_Q(QWidget);
 if (q->testAttribute(Qt::WA_WState_Created) && q->windowType() != Qt::Desktop) {
 RWindow *rwindow = static_cast<RWindow *>(q->effectiveWinId()->DrawableWindow());
-rwindow->EnableAdvancedPointers();
+QSymbianControl *window = static_cast<QSymbianControl *>(q->effectiveWinId());
+//Enabling advanced pointer events for controls that already have active windows causes a panic.
+if (!window->isControlActive())
+rwindow->EnableAdvancedPointers();
 }
 #endif
 }
 int QWidget::metric(PaintDeviceMetric m) const
 #ifdef Q_WS_S60
 // Hide window decoration when switching to fullsccreen / minimized otherwise show decoration.
 // The window decoration visibility has to be changed before doing actual window state
 // change since in that order the availableGeometry will return directly the right size and
 // we will avoid unnecessarty redraws
-CEikStatusPane *statusPane = S60->statusPane();
+const bool visible = !(newstate & (Qt::WindowFullScreen | Qt::WindowMinimized));
-CEikButtonGroupContainer *buttonGroup = S60->buttonGroupContainer();
+const bool statusPaneVisibility = visible;
-TBool visible = !(newstate & (Qt::WindowFullScreen | Qt::WindowMinimized));
+const bool buttonGroupVisibility = (visible || (isFullscreen && cbaRequested));
-if (statusPane)
+S60->setStatusPaneAndButtonGroupVisibility(statusPaneVisibility, buttonGroupVisibility);
-statusPane->MakeVisible(visible);
-if (buttonGroup) {
-// Visibility
-buttonGroup->MakeVisible(visible || (isFullscreen && cbaRequested));
-}
 #endif // Q_WS_S60
 // Ensure the initial size is valid, since we store it as normalGeometry below.
 if (!wasResized && !isVisible())
 adjustSize();
 QTLWExtra *top = d->topData();
 QRect normalGeometry = (top->normalGeometry.width() < 0) ? geometry() : top->normalGeometry;
 const bool cbaVisibilityHint = windowFlags() & Qt::WindowSoftkeysVisibleHint;
 if (newstate & Qt::WindowFullScreen && !cbaVisibilityHint) {
+setAttribute(Qt::WA_OutsideWSRange, false);
 window->SetExtentToWholeScreen();
 } else if (newstate & Qt::WindowMaximized || ((newstate & Qt::WindowFullScreen) && cbaVisibilityHint)) {
+setAttribute(Qt::WA_OutsideWSRange, false);
 TRect maxExtent = qt_QRect2TRect(qApp->desktop()->availableGeometry(this));
 window->SetExtent(maxExtent.iTl, maxExtent.Size());
 } else {
 #ifdef Q_WS_S60
 // With delayed creation of S60 app panes, the normalGeometry calculated above is not
 // accurate because it did not consider the status pane. This means that when returning
 // normal mode after showing the status pane, the geometry would overlap so we should
 // move it if it never had an explicit position.
-if (!wasMoved && statusPane && visible) {
+if (!wasMoved && S60->statusPane() && visible) {
 TPoint tl = static_cast<CEikAppUi*>(S60->appUi())->ClientRect().iTl;
 normalGeometry.setTopLeft(QPoint(tl.iX, tl.iY));
 }
 #endif
 setGeometry(normalGeometry);

changeset 37	758a864f9613
parent 34	a33bf25e6f72