Changeset 32802 in webkit


Ignore:
Timestamp:
May 1, 2008 11:37:23 PM (16 years ago)
Author:
kevino@webkit.org
Message:

Reviewed by Kevin Ollivier.

Explicitly set the pen style in wx port to keep pen style changes from affecting URL underline or text field drawing.

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

Location:
trunk/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r32800 r32802  
     12008-05-01  Robin Dunn  <robin@alldunn.com>
     2
     3        Reviewed by Kevin Ollivier.
     4
     5        Explicitly set the pen style in wx port to keep pen style changes from
     6        affecting URL underline or text field drawing.
     7       
     8        https://bugs.webkit.org/show_bug.cgi?id=18775
     9
     10        * platform/graphics/wx/GraphicsContextWx.cpp:
     11        (WebCore::GraphicsContext::fillRect):
     12        (WebCore::GraphicsContext::drawLineForText):
     13        * platform/wx/RenderThemeWx.cpp:
     14        (WebCore::RenderThemeWx::paintTextField):
     15
    1162008-05-01  Robin Dunn  <robin@alldunn.com>
    217
  • trunk/WebCore/platform/graphics/wx/GraphicsContextWx.cpp

    r31961 r32802  
    268268        return;
    269269
    270     m_data->context->SetPen(wxPen(color));
     270    m_data->context->SetPen(*wxTRANSPARENT_PEN);
    271271    m_data->context->SetBrush(wxBrush(color));
    272272    m_data->context->DrawRectangle(rect.x(), rect.y(), rect.width(), rect.height());
     
    335335
    336336    IntPoint endPoint = origin + IntSize(width, 0);
    337     m_data->context->SetPen(wxPen(strokeColor(), strokeThickness(), strokeStyleToWxPenStyle(strokeStyle())));
     337    m_data->context->SetPen(wxPen(strokeColor(), strokeThickness(), wxSOLID));
    338338    m_data->context->DrawLine(origin.x(), origin.y(), endPoint.x(), endPoint.y());
    339339}
  • trunk/WebCore/platform/wx/RenderThemeWx.cpp

    r32448 r32802  
    225225bool RenderThemeWx::paintTextField(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r)
    226226{
     227    i.context->save();
     228    i.context->setStrokeStyle(SolidStroke);
    227229    i.context->setStrokeThickness(1);
    228230    i.context->setStrokeColor(Color(0, 0, 0));
    229231    i.context->drawRect(r);
     232    i.context->restore();
    230233    return false;
    231234}
Note: See TracChangeset for help on using the changeset viewer.