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

equal deleted inserted replaced

-:dee5afe5301f
+:3f74d0d4af4c
 #include "private/qevent_p.h"
 #include "private/qgraphicssystem_p.h"
 #include "private/qgesturemanager_p.h"
+#ifdef QT_KEYPAD_NAVIGATION
+#include "qtabwidget.h" // Needed in inTabWidget()
+#endif // QT_KEYPAD_NAVIGATION
 // widget/widget data creation count
 //#define QWIDGET_EXTRA_DEBUG
 //#define ALIEN_DEBUG
 QT_BEGIN_NAMESPACE
 , 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);
 if (QWExtra *topData = window()->d_func()->extra) {
 if (topData->proxyWidget && topData->proxyWidget->hasFocus()) {
 previousProxyFocus = topData->proxyWidget->widget()->focusWidget();
 if (previousProxyFocus && previousProxyFocus->focusProxy())
 previousProxyFocus = previousProxyFocus->focusProxy();
+if (previousProxyFocus == this && !topData->proxyWidget->d_func()->proxyIsGivingFocus)
+return;
 }
 }
 #endif
 QWidget *w = f;
 }
 }
 first = fp;
 }
+if (fp == second)
+return;
 if (QWidget *sp = second->focusProxy())
 second = sp;
 //    QWidget *fp = first->d_func()->focus_prev;
 QList<QObject*> childList = children;
 for (int i = 0; i < childList.size(); ++i) {
 QWidget *widget = qobject_cast<QWidget*>(childList.at(i));
 if (!widget || widget->isWindow() || widget->testAttribute(Qt::WA_WState_Hidden))
 continue;
+#ifdef QT_MAC_USE_COCOA
+// Before doing anything we need to make sure that we don't leave anything in a non-consistent state.
+// When hiding a widget we need to make sure that no mouse_down events are active, because
+// the mouse_up event will never be received by a hidden widget or one of its descendants.
+// The solution is simple, before going through with this we check if there are any mouse_down events in
+// progress, if so we check if it is related to this widget or not. If so, we just reset the mouse_down and
+// then we continue.
+// In X11 and Windows we send a mouse_release event, however we don't do that here because we were already
+// ignoring that from before. I.e. Carbon did not send the mouse release event, so we will not send the
+// mouse release event. There are two ways to interpret this:
+// 1. If we don't send the mouse release event, the widget might get into an inconsistent state, i.e. it
+// might be waiting for a release event that will never arrive.
+// 2. If we send the mouse release event, then the widget might decide to trigger an action that is not
+// supposed to trigger because it is not visible.
+if(widget == qt_button_down)
+qt_button_down = 0;
+#endif // QT_MAC_USE_COCOA
 if (spontaneous)
 widget->setAttribute(Qt::WA_Mapped, false);
 else
 widget->setAttribute(Qt::WA_WState_Visible, false);
 widget->d_func()->hideChildren(spontaneous);
 inline void setDisabledStyle(QWidget *w, bool setStyle)
 {
 // set/reset WS_DISABLED style.
 if(w && w->isWindow() && w->isVisible() && w->isEnabled()) {
 LONG dwStyle = GetWindowLong(w->winId(), GWL_STYLE);
+LONG newStyle = dwStyle;
 if (setStyle)
-dwStyle |= WS_DISABLED;
+newStyle |= WS_DISABLED;
 else
-dwStyle &= ~WS_DISABLED;
+newStyle &= ~WS_DISABLED;
-SetWindowLong(w->winId(), GWL_STYLE, dwStyle);
+if (newStyle != dwStyle) {
-// we might need to repaint in some situations (eg. menu)
+SetWindowLong(w->winId(), GWL_STYLE, newStyle);
-w->repaint();
+// we might need to repaint in some situations (eg. menu)
+w->repaint();
+}
 }
 }
 #endif
 /*****************************************************************************
 if (w && w->isVisible() && !w->isWindow())
 QApplication::sendEvent(w, event);
 }
 #ifdef QT_SOFTKEYS_ENABLED
-if (isWindow() && isActiveWindow())
+if (isWindow())
 QSoftKeyManager::updateSoftKeys();
 #endif
 break; }
 }
 }
 }
 return targetWidget;
 }
+/*!
+\internal
+Tells us if it there is currently a reachable widget by keypad navigation in
+a certain \a orientation.
+If no navigation is possible, occuring key events in that \a orientation may
+be used to interact with the value in the focussed widget, even though it
+currently has not the editFocus.
+\sa QWidgetPrivate::widgetInNavigationDirection(), QWidget::hasEditFocus()
+*/
+bool QWidgetPrivate::canKeypadNavigate(Qt::Orientation orientation)
+{
+return orientation == Qt::Horizontal?
+(QWidgetPrivate::widgetInNavigationDirection(QWidgetPrivate::DirectionEast)
+|| QWidgetPrivate::widgetInNavigationDirection(QWidgetPrivate::DirectionWest))
+:(QWidgetPrivate::widgetInNavigationDirection(QWidgetPrivate::DirectionNorth)
+|| QWidgetPrivate::widgetInNavigationDirection(QWidgetPrivate::DirectionSouth));
+}
+/*!
+\internal
+Checks, if the \a widget is inside a QTabWidget. If is is inside
+one, left/right key events will be used to switch between tabs in keypad
+navigation. If there is no QTabWidget, the horizontal key events can be used
+to
+interact with the value in the focussed widget, even though it currently has
+not the editFocus.
+\sa QWidget::hasEditFocus()
+*/
+bool QWidgetPrivate::inTabWidget(QWidget *widget)
+{
+for (QWidget *tabWidget = widget; tabWidget; tabWidget = tabWidget->parentWidget())
+if (qobject_cast<const QTabWidget*>(tabWidget))
+return true;
+return false;
+}
 #endif
 /*!
 \preliminary
 \since 4.2

branch	RCL_3
changeset 7	3f74d0d4af4c
parent 5	d3bac044e0f0
child 13	c0432d11811c