Changeset 73362 in webkit


Ignore:
Timestamp:
Dec 6, 2010 6:47:41 AM (13 years ago)
Author:
yael.aharon@nokia.com
Message:

[Qt] Support focus ring outline color for links.
​https://bugs.webkit.org/show_bug.cgi?id=50428

Reviewed by Andreas Kling.

WebCore:

Take width and offset into account when drawing focus ring.

Tests: fast/css/focus-ring-outline-color.html

fast/css/focus-ring-outline-offset.html
fast/css/focus-ring-outline-width.html

  • platform/graphics/qt/GraphicsContextQt.cpp:

(WebCore::GraphicsContext::drawFocusRing):

LayoutTests:

  • fast/css/focus-ring-outline-color.html: Added.
  • fast/css/focus-ring-outline-offset.html: Added.
  • fast/css/focus-ring-outline-width.html: Added.
  • platform/mac/fast/css/focus-ring-outline-color-expected.checksum: Added.
  • platform/mac/fast/css/focus-ring-outline-color-expected.png: Added.
  • platform/mac/fast/css/focus-ring-outline-color-expected.txt: Added.
  • platform/mac/fast/css/focus-ring-outline-offset-expected.checksum: Added.
  • platform/mac/fast/css/focus-ring-outline-offset-expected.png: Added.
  • platform/mac/fast/css/focus-ring-outline-offset-expected.txt: Added.
  • platform/mac/fast/css/focus-ring-outline-width-expected.checksum: Added.
  • platform/mac/fast/css/focus-ring-outline-width-expected.png: Added.
  • platform/mac/fast/css/focus-ring-outline-width-expected.txt: Added.
  • platform/qt/fast/css/focus-ring-outline-color-expected.checksum: Added.
  • platform/qt/fast/css/focus-ring-outline-color-expected.png: Added.
  • platform/qt/fast/css/focus-ring-outline-color-expected.txt: Added.
  • platform/qt/fast/css/focus-ring-outline-offset-expected.checksum: Added.
  • platform/qt/fast/css/focus-ring-outline-offset-expected.png: Added.
  • platform/qt/fast/css/focus-ring-outline-offset-expected.txt: Added.
  • platform/qt/fast/css/focus-ring-outline-width-expected.checksum: Added.
  • platform/qt/fast/css/focus-ring-outline-width-expected.png: Added.
  • platform/qt/fast/css/focus-ring-outline-width-expected.txt: Added.
Location:
trunk
Files:
21 added
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r73361 r73362  
     12010-12-06  Yael Aharon  <yael.aharon@nokia.com>
     2
     3        Reviewed by Andreas Kling.
     4
     5        [Qt] Support focus ring outline color for links.
     6        https://bugs.webkit.org/show_bug.cgi?id=50428
     7
     8        * fast/css/focus-ring-outline-color.html: Added.
     9        * fast/css/focus-ring-outline-offset.html: Added.
     10        * fast/css/focus-ring-outline-width.html: Added.
     11        * platform/mac/fast/css/focus-ring-outline-color-expected.checksum: Added.
     12        * platform/mac/fast/css/focus-ring-outline-color-expected.png: Added.
     13        * platform/mac/fast/css/focus-ring-outline-color-expected.txt: Added.
     14        * platform/mac/fast/css/focus-ring-outline-offset-expected.checksum: Added.
     15        * platform/mac/fast/css/focus-ring-outline-offset-expected.png: Added.
     16        * platform/mac/fast/css/focus-ring-outline-offset-expected.txt: Added.
     17        * platform/mac/fast/css/focus-ring-outline-width-expected.checksum: Added.
     18        * platform/mac/fast/css/focus-ring-outline-width-expected.png: Added.
     19        * platform/mac/fast/css/focus-ring-outline-width-expected.txt: Added.
     20        * platform/qt/fast/css/focus-ring-outline-color-expected.checksum: Added.
     21        * platform/qt/fast/css/focus-ring-outline-color-expected.png: Added.
     22        * platform/qt/fast/css/focus-ring-outline-color-expected.txt: Added.
     23        * platform/qt/fast/css/focus-ring-outline-offset-expected.checksum: Added.
     24        * platform/qt/fast/css/focus-ring-outline-offset-expected.png: Added.
     25        * platform/qt/fast/css/focus-ring-outline-offset-expected.txt: Added.
     26        * platform/qt/fast/css/focus-ring-outline-width-expected.checksum: Added.
     27        * platform/qt/fast/css/focus-ring-outline-width-expected.png: Added.
     28        * platform/qt/fast/css/focus-ring-outline-width-expected.txt: Added.
     29
    1302010-12-06  Yael Aharon  <yael.aharon@nokia.com>
    231

  • trunk/WebCore/ChangeLog

    r73361 r73362  
     12010-12-06  Yael Aharon  <yael.aharon@nokia.com>
     2
     3        Reviewed by Andreas Kling.
     4
     5        [Qt] Support focus ring outline color for links.
     6        https://bugs.webkit.org/show_bug.cgi?id=50428
     7
     8        Take width and offset into account when drawing focus ring.
     9
     10        Tests: fast/css/focus-ring-outline-color.html
     11               fast/css/focus-ring-outline-offset.html
     12               fast/css/focus-ring-outline-width.html
     13
     14        * platform/graphics/qt/GraphicsContextQt.cpp:
     15        (WebCore::GraphicsContext::drawFocusRing):
     16
    1172010-12-06  Yael Aharon  <yael.aharon@nokia.com>
    218

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

    r73361 r73362  
    854854 * need it. It is still handled here for links.
    855855 */
    856 void GraphicsContext::drawFocusRing(const Vector<IntRect>& rects, int /* width */, int /* offset */, const Color& color)
     856void GraphicsContext::drawFocusRing(const Vector<IntRect>& rects, int width, int offset, const Color& color)
    857857{
    858858    if (paintingDisabled() || !color.isValid())
    … …  
    872872
    873873    QPen nPen = p->pen();
    874     nPen.setColor(color);
     874    int radius = (width - 1) / 2;
     875
     876    nPen.setColor(QColor(color.red(), color.green(), color.blue(), 127));
     877    nPen.setWidth(width);
     878
    875879    p->setBrush(Qt::NoBrush);
    876     nPen.setStyle(Qt::DotLine);
     880    nPen.setStyle(Qt::SolidLine);
    877881    p->setPen(nPen);
    878882#if 0
    … …  
    885889    p->strokePath(newPath, nPen);
    886890#else
    887     for (unsigned i = 0; i < rectCount; ++i)
    888         p->drawRect(QRectF(rects[i]));
     891    for (unsigned i = 0; i < rectCount; ++i) {
     892        QRect rect = QRect((rects[i])).adjusted(-offset - radius, -offset - radius, offset + radius, offset + radius);
     893        p->drawRoundedRect(rect, radius, radius);
     894    }
    889895#endif
    890896    p->setPen(oldPen);
Note: See TracChangeset for help on using the changeset viewer.