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

equal deleted inserted replaced

-:41300fa6a67c
+:2f34d5167611
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 , dirtyOpaqueChildren(1)
 , isOpaque(0)
 , inDirtyList(0)
 , isScrolled(0)
 , isMoved(0)
+, isGLWidget(0)
 , usesDoubleBufferedGLContext(0)
 #if defined(Q_WS_X11)
 , picture(0)
 #elif defined(Q_WS_WIN)
 , noPaintOnScreen(0)
 , nativeGesturePanEnabled(0)
 #elif defined(Q_WS_MAC)
 , needWindowChange(0)
-, isGLWidget(0)
 , window_event(0)
 , qd_hd(0)
 #endif
 {
 if (!qApp) {
 qApp->d_func()->sendSyntheticEnterLeave(this);
 #endif
 }
 #endif
+#ifdef Q_OS_SYMBIAN
+if (d->extra && d->extra->topextra && d->extra->topextra->backingStore) {
+// Okay, we are about to destroy the top-level window that owns
+// the backing store. Make sure we delete the backing store right away
+// before the window handle is invalid. This is important because
+// the backing store will delete its window surface, which may or may
+// not have a reference to this widget that will be used later to
+// notify the window it no longer has a surface.
+delete d->extra->topextra->backingStore;
+d->extra->topextra->backingStore = 0;
+}
+#endif
 if (QWidgetBackingStore *bs = d->maybeBackingStore()) {
 bs->removeDirtyWidget(this);
 if (testAttribute(Qt::WA_StaticContents))
 bs->removeStaticWidget(this);
 }
 {
 if (paintOnScreen()) {
 repaint_sys(dirty);
 dirty = QRegion();
 } else if (QWidgetBackingStore *bs = maybeBackingStore()) {
+#ifdef QT_MAC_USE_COCOA
+Q_UNUSED(bs);
+void qt_mac_set_needs_display(QWidget *, QRegion);
+qt_mac_set_needs_display(q_func(), QRegion());
+#else
 bs->sync();
+#endif
 }
 }
 void QWidgetPrivate::syncBackingStore(const QRegion &region)
 {
 if (paintOnScreen())
 repaint_sys(region);
-else if (QWidgetBackingStore *bs = maybeBackingStore())
+else if (QWidgetBackingStore *bs = maybeBackingStore()) {
+#ifdef QT_MAC_USE_COCOA
+Q_UNUSED(bs);
+void qt_mac_set_needs_display(QWidget *, QRegion);
+qt_mac_set_needs_display(q_func(), region);
+#else
 bs->sync(q_func(), region);
+#endif
+}
 }
 void QWidgetPrivate::setUpdatesEnabled_helper(bool enable)
 {
 Q_Q(QWidget);
 #endif //QT_NO_GRAPHICSEFFECT
 Q_Q(QWidget);
 #ifdef Q_WS_X11
 if (q->testAttribute(Qt::WA_X11OpenGLOverlay)) {
+setOpaque(false);
+return;
+}
+#endif
+#ifdef Q_WS_S60
+if (q->windowType() == Qt::Dialog && q->testAttribute(Qt::WA_TranslucentBackground)
+&& S60->avkonComponentsSupportTransparency) {
 setOpaque(false);
 return;
 }
 #endif
 #ifndef QT_NO_IM
 if (q->testAttribute(Qt::WA_InputMethodEnabled) && q->hasFocus()) {
 QWidget *focusWidget = effectiveFocusWidget();
 QInputContext *qic = focusWidget->d_func()->inputContext();
 if (enable) {
-qic->setFocusWidget(focusWidget);
+if (focusWidget->testAttribute(Qt::WA_InputMethodEnabled))
+qic->setFocusWidget(focusWidget);
 } else {
 qic->reset();
 qic->setFocusWidget(0);
 }
 }
 lead to infinite recursion.
 \note Setting the size to \c{QSize(0, 0)} will cause the widget to not
 appear on screen. This also applies to windows.
-\sa pos, geometry, minimumSize, maximumSize, resizeEvent()
+\sa pos, geometry, minimumSize, maximumSize, resizeEvent(), adjustSize()
 */
 /*!
 \property QWidget::width
 \brief the width of the widget excluding any window frame
 }
 }
 first = fp;
 }
+if (fp == second)
+return;
 if (QWidget *sp = second->focusProxy())
 second = sp;
 //    QWidget *fp = first->d_func()->focus_prev;
 if (w && w->isVisible() && !w->isWindow())
 QApplication::sendEvent(w, event);
 }
 #ifdef QT_SOFTKEYS_ENABLED
-if (isWindow() && isActiveWindow())
+if (isWindow())
 QSoftKeyManager::updateSoftKeys();
 #endif
 break; }
 newBs->subSurfaces.append(windowSurface);
 }
 }
 #endif
-if (newParent) {
+if (QWidgetBackingStore *oldBs = oldtlw->d_func()->maybeBackingStore()) {
-if (QWidgetBackingStore *oldBs = oldtlw->d_func()->maybeBackingStore()) {
+if (newParent)
 oldBs->removeDirtyWidget(this);
 // Move the widget and all its static children from
 // the old backing store to the new one.
 oldBs->moveStaticWidgets(this);
-}
 }
 if ((QApplicationPrivate::app_compile_version < 0x040200
 || QApplicationPrivate::testAttribute(Qt::AA_ImmediateWidgetCreation))
 && !testAttribute(Qt::WA_WState_Created))
 break; }
 case Qt::WA_NativeWindow: {
 #ifndef QT_NO_IM
 QWidget *focusWidget = d->effectiveFocusWidget();
 QInputContext *ic = 0;
-if (on && !internalWinId() && testAttribute(Qt::WA_InputMethodEnabled) && hasFocus()) {
+if (on && !internalWinId() && hasFocus()
+&& focusWidget->testAttribute(Qt::WA_InputMethodEnabled)) {
 ic = focusWidget->d_func()->inputContext();
-ic->reset();
+if (ic) {
-ic->setFocusWidget(0);
+ic->reset();
+ic->setFocusWidget(0);
+}
 }
 if (!qApp->testAttribute(Qt::AA_DontCreateNativeWidgetSiblings) && parentWidget())
 parentWidget()->d_func()->enforceNativeChildren();
 if (on && !internalWinId() && testAttribute(Qt::WA_WState_Created))
 d->createWinId();
-if (ic && isEnabled())
+if (ic && isEnabled() && focusWidget->isEnabled()
+&& focusWidget->testAttribute(Qt::WA_InputMethodEnabled)) {
 ic->setFocusWidget(focusWidget);
+}
 #endif //QT_NO_IM
 break;
 }
 case Qt::WA_PaintOnScreen:
 d->updateIsOpaque();
 QWidget *focusWidget = d->effectiveFocusWidget();
 QInputContext *ic = focusWidget->d_func()->ic;
 if (!ic && (!on || hasFocus()))
 ic = focusWidget->d_func()->inputContext();
 if (ic) {
-if (on && hasFocus() && ic->focusWidget() != focusWidget && isEnabled()) {
+if (on && hasFocus() && ic->focusWidget() != focusWidget && isEnabled()
+&& focusWidget->testAttribute(Qt::WA_InputMethodEnabled)) {
 ic->setFocusWidget(focusWidget);
 } else if (!on && ic->focusWidget() == focusWidget) {
 ic->reset();
 ic->setFocusWidget(0);
 }
 It is almost never necessary to grab the mouse when using Qt, as
 Qt grabs and releases it sensibly. In particular, Qt grabs the
 mouse when a mouse button is pressed and keeps it until the last
 button is released.
-Note that only visible widgets can grab mouse input. If
+\note Only visible widgets can grab mouse input. If isVisible()
-isVisible() returns false for a widget, that widget cannot call
+returns false for a widget, that widget cannot call grabMouse().
-grabMouse().
+\note \bold{(Mac OS X developers)} For \e Cocoa, calling
+grabMouse() on a widget only works when the mouse is inside the
+frame of that widget.  For \e Carbon, it works outside the widget's
+frame as well, like for Windows and X11.
 \sa releaseMouse() grabKeyboard() releaseKeyboard()
 */
 /*!
 \fn void QWidget::grabMouse(const QCursor &cursor)
-\overload
+\overload grabMouse()
 Grabs the mouse input and changes the cursor shape.
 The cursor will assume shape \a cursor (for as long as the mouse
 focus is grabbed) and this widget will be the only one to receive
 mouse events until releaseMouse() is called().
 \warning Grabbing the mouse might lock the terminal.
+\note \bold{(Mac OS X developers)} See the note in QWidget::grabMouse().
 \sa releaseMouse(), grabKeyboard(), releaseKeyboard(), setCursor()
 */
 /*!

changeset 18	2f34d5167611
parent 3	41300fa6a67c
child 19	fcece45ef507