Changeset 938 for trunk/src/gui/kernel/qwidget_p.h

Timestamp:

Aug 4, 2011, 8:42:53 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

OS/2: gui: Make blocked widgets follow modal on Z-order change.

This makes sure that whenever the modal widget is brought
to front, all the ones it blocks will be placed right underneath it
keeping their original z-order at the time of blocking.

File:

• trunk/src/gui/kernel/qwidget_p.h (modified) (3 diffs)

trunk/src/gui/kernel/qwidget_p.h

@@ -236 +236 @@
     HSWITCH swEntry;
     HPOINTER iconPointer;
+    QWidget *modalBlocker;
 #endif
 };
@@ -782 +783 @@
     uint noPaintOnScreen : 1; // see qwidget_pm.cpp ::paintEngine()
 
-    inline HWND frameWinId() const
-    { return maybeTopData() && maybeTopData()->fId != NULLHANDLE ?
-             maybeTopData()->fId : data.winid; }
+    inline HWND frameWinId() const;
     HWND effectiveFrameWinId() const;
     void validateObstacles();
     void reparentChildren();
+    void setModalBlocker (QWidget *modal);
+    QWidget *modalBlocker() const;
 #elif defined(Q_WS_WIN) // <--------------------------------------------------------- WIN
     uint noPaintOnScreen : 1; // see qwidget_win.cpp ::paintEngine()
@@ -1016 +1017 @@
 }
 
+#if defined(Q_WS_PM)
+
+inline HWND QWidgetPrivate::frameWinId() const
+{
+    return maybeTopData() && maybeTopData()->fId != NULLHANDLE ?
+             maybeTopData()->fId : data.winid;
+}
+
+inline void QWidgetPrivate::setModalBlocker (QWidget *modal)
+{
+    topData()->modalBlocker = modal;
+}
+
+inline QWidget *QWidgetPrivate::modalBlocker() const
+{
+    QTLWExtra *top = maybeTopData();
+    return top ? top->modalBlocker : 0;
+}
+
+#endif
+
 QT_END_NAMESPACE