Changeset 112

Timestamp:

Aug 14, 2009, 5:13:16 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Paint event translation.

Location:

trunk/src/gui/kernel

Files:

• qapplication_pm.cpp (modified) (3 diffs)
• qwidget.cpp (modified) (2 diffs)
• qwidget_p.h (modified) (1 diff)
• qwidget_pm.cpp (modified) (2 diffs)

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -127 +127 @@
 #endif
     bool        translatePaintEvent(const QMSG &qmsg);
-//  bool        translateConfigEvent(const QMSG &msg);
+msg);
     bool        translateCloseEvent(const QMSG &qmsg);
 //  void        repolishStyle(QStyle &style);
@@ -556 +556 @@
         } else {
             switch(msg) {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
             case WM_SHOW: {
@@ -1400 +1434 @@
 
 //
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 // Close window event translation.
 //

trunk/src/gui/kernel/qwidget.cpp

@@ -184 +184 @@
         ,isScrolled(0)
         ,isMoved(0)
-#ifdef Q_WS_WIN
+#if
         ,noPaintOnScreen(0)
 #endif
@@ -9675 +9675 @@
                "QWidgetPrivate::high_attributes[] too small to contain all attributes in WidgetAttribute");
 
-#ifdef Q_WS_WIN
+#if
     if (attribute == Qt::WA_PaintOnScreen && on) {
-        // see qwidget_win.cpp, ::paintEngine for details
+        // see qwidget_.cpp, ::paintEngine for details
         paintEngine();
         if (d->noPaintOnScreen)

trunk/src/gui/kernel/qwidget_p.h

@@ -551 +551 @@
     uint isMoved : 1;
 
-#ifdef Q_WS_WIN
-    uint noPaintOnScreen : 1; // see qwidget_win.cpp ::paintEngine()
+#if
+    uint noPaintOnScreen : 1; // see qwidget_.cpp ::paintEngine()
 #endif
 

trunk/src/gui/kernel/qwidget_pm.cpp

@@ -1467 +1467 @@
     fs.setCoords(cswp.x, cswp.y, swp.cx - cswp.x - cswp.cx,
                                  swp.cy - cswp.y - cswp.cy);
-    // @todo need this??
+    // @todo ??
     //data.crect.setRect(swp.x + cswp.x, swp.y + cswp.y, cswp.cx, cswp.cy);
 
@@ -1480 +1480 @@
 QPaintEngine *QWidget::paintEngine() const
 {
-    // @todo implement
+    // @todo this is a place to return some direct on-screen PaintEngine once
+    // we decide to support it
+
+    // We set this bit which is checked in setAttribute for
+    // Qt::WA_PaintOnScreen. We do this to allow these two scenarios:
+    //
+    // 1. Users accidentally set Qt::WA_PaintOnScreen on X and port to
+    // OS/2 which would mean suddenly their widgets stop working.
+    //
+    // 2. Users set paint on screen and subclass paintEngine() to
+    // return 0, in which case we have a "hole" in the backingstore
+    // allowing use of GPI directly.
+    //
+    // 1 is WRONG, but to minimize silent failures, we have set this
+    // bit to ignore the setAttribute call. 2. needs to be
+    // supported because its our only means of embeddeding native
+    // graphics stuff.
+    const_cast<QWidgetPrivate *>(d_func())->noPaintOnScreen = 1;
+
     return 0;
 }