Changeset 34763 in webkit

Timestamp:

Jun 24, 2008 3:35:53 AM (16 years ago)

Author:

Simon Hausmann

Message:

2008-06-24 Jonathon Jongsma <​jonathon.jongsma@collabora.co.uk>

Reviewed by Simon.

​https://bugs.webkit.org/show_bug.cgi?id=18459

Implemented basic text-shadow support for the Qt port.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/qt/FontQt.cpp (modified) (3 diffs)
• platform/graphics/qt/GraphicsContextQt.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-06-24  Jonathon Jongsma  <jonathon.jongsma@collabora.co.uk>
+
+        Reviewed by Simon.
+
+        https://bugs.webkit.org/show_bug.cgi?id=18459
+
+        Implemented basic text-shadow support for the Qt port.
+
+        * platform/graphics/qt/FontQt.cpp:
+        (WebCore::Font::drawText): implement text-shadow support in the Qt port
+        * platform/graphics/qt/GraphicsContextQt.cpp:
+        (WebCore::GraphicsContext::drawLine): also draw shadows for text
+        decorations such as unerlines
+
 2008-06-24  Simon Hausmann  <hausmann@webkit.org>
 

trunk/WebCore/platform/graphics/qt/FontQt.cpp

@@ -130 +130 @@
     p->setPen(QColor(color));
 
+    // text shadow
+    IntSize shadowSize;
+    int shadowBlur;
+    Color shadowColor;
+    ctx->getShadow(shadowSize, shadowBlur, shadowColor);
+    bool hasShadow = ctx->textDrawingMode() == cTextFill && shadowColor.isValid() && (shadowSize.width() || shadowSize.height());
+
     QString string = qstring(run);
 
@@ -143 +150 @@
         int ascent = fm.ascent();
         QRectF clip(point.x() + x1, point.y() - ascent, x2 - x1, fm.height());
-
+        if (hasShadow) {
+            // TODO: when blur support is added, the clip will need to account
+            // for the blur radius
+            qreal dx1 = 0, dx2 = 0, dy1 = 0, dy2 = 0;
+            if (shadowSize.width() > 0)
+                dx2 = shadowSize.width();
+            else
+                dx1 = -shadowSize.width();
+            if (shadowSize.height() > 0)
+                dy2 = shadowSize.height();
+            else
+                dy1 = -shadowSize.height();
+            // expand the clip rect to include the text shadow as well
+            clip.adjust(dx1, dx2, dy1, dy2);
+        }
         p->save();
         p->setClipRect(clip.toRect());
         QPointF pt(point.x(), point.y() - ascent);
+        if (hasShadow) {
+            p->save();
+            p->setPen(QColor(shadowColor));
+            p->translate(shadowSize.width(), shadowSize.height());
+            line.draw(p, pt);
+            p->restore();
+        }
         line.draw(p, pt);
         p->restore();
@@ -156 +184 @@
     QPointF pt(point.x(), point.y());
     int flags = run.rtl() ? Qt::TextForceRightToLeft : Qt::TextForceLeftToRight;
+    if (hasShadow) {
+        // TODO: text shadow blur support
+        p->save();
+        p->setPen(QColor(shadowColor));
+        p->translate(shadowSize.width(), shadowSize.height());
+        p->drawText(pt, string, flags, run.padding());
+        p->restore();
+    }
     p->drawText(pt, string, flags, run.padding());
 }

trunk/WebCore/platform/graphics/qt/GraphicsContextQt.cpp

@@ -454 +454 @@
     const bool antiAlias = p->testRenderHint(QPainter::Antialiasing);
     p->setRenderHint(QPainter::Antialiasing, m_data->antiAliasingForRectsAndLines);
-
     adjustLineToPixelBoundaries(p1, p2, strokeThickness(), strokeStyle());
+
+    IntSize shadowSize;
+    int shadowBlur;
+    Color shadowColor;
+    getShadow(shadowSize, shadowBlur, shadowColor);
+    bool hasShadow = textDrawingMode() == cTextFill && shadowColor.isValid() && (shadowSize.width() || shadowSize.height());
+    if (hasShadow) {
+        p->save();
+        p->translate(shadowSize.width(), shadowSize.height());
+        p->setPen(QColor(shadowColor));
+        p->drawLine(p1, p2);
+        p->restore();
+    }
+
     p->drawLine(p1, p2);