Changeset 769 for trunk/src/gui/effects

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/effects/qgraphicseffect.cpp (modified) (9 diffs)

trunk/src/gui/effects/qgraphicseffect.cpp

@@ -384 +384 @@
     if (m_cachedMode != QGraphicsEffect::PadToEffectiveBoundingRect
         && (reason == EffectRectChanged
-            || reason == TransformChanged
-               && m_cachedSystem == Qt::LogicalCoordinates))
-        return;
+            || 
+        
+    
 
     QPixmapCache::remove(m_cacheKey);
@@ -700 +700 @@
         // No point in drawing in device coordinates (pixmap will be scaled anyways).
         const QPixmap pixmap = sourcePixmap(Qt::LogicalCoordinates, &offset, NoPad);
-        d->filter->draw(painter, offset, pixmap);
+        if (!pixmap.isNull())
+            d->filter->draw(painter, offset, pixmap);
+
         return;
     }
@@ -706 +708 @@
     // Draw pixmap in deviceCoordinates to avoid pixmap scaling.
     const QPixmap pixmap = sourcePixmap(Qt::DeviceCoordinates, &offset);
+
+
+
     QTransform restoreTransform = painter->worldTransform();
     painter->setWorldTransform(QTransform());
@@ -722 +727 @@
     function. Use setBlurHints() to choose the blur hints.
 
-    By default, the blur radius is 5 pixels.
+    By default, the blur radius is 5 pixels. The blur radius is specified in
+    device coordinates.
 
     \img graphicseffect-blur.png
@@ -777 +783 @@
 
     By default, the blur radius is 5 pixels.
+
+
+
 */
 qreal QGraphicsBlurEffect::blurRadius() const
@@ -859 +868 @@
         mode = NoPad;
 
-    // Draw pixmap in device coordinates to avoid pixmap scaling.
     QPoint offset;
     QPixmap pixmap = sourcePixmap(Qt::LogicalCoordinates, &offset, mode);
+
+
+
     d->filter->draw(painter, offset, pixmap);
 }
@@ -878 +889 @@
     By default, the drop shadow is a semi-transparent dark gray
     (QColor(63, 63, 63, 180)) shadow, blurred with a radius of 1 at an offset
-    of 8 pixels towards the lower right.
+    of 8 pixels towards the lower right. The drop shadow offset is specified
+    in device coordinates.
 
     \img graphicseffect-drop-shadow.png
@@ -906 +918 @@
 
     By default, the offset is 8 pixels towards the lower right.
+
+
+
 
     \sa xOffset(), yOffset(), blurRadius(), color()
@@ -1048 +1063 @@
     QPoint offset;
     const QPixmap pixmap = sourcePixmap(Qt::DeviceCoordinates, &offset, mode);
+
+
+
     QTransform restoreTransform = painter->worldTransform();
     painter->setWorldTransform(QTransform());