Commit 4c512a84 authored by kevino@webkit.org's avatar kevino@webkit.org

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


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@32802 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 9e6072c5
2008-05-01 Robin Dunn <robin@alldunn.com>
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
* platform/graphics/wx/GraphicsContextWx.cpp:
(WebCore::GraphicsContext::fillRect):
(WebCore::GraphicsContext::drawLineForText):
* platform/wx/RenderThemeWx.cpp:
(WebCore::RenderThemeWx::paintTextField):
2008-05-01 Robin Dunn <robin@alldunn.com>
Reviewed by Kevin Ollivier.
......@@ -267,7 +267,7 @@ void GraphicsContext::fillRect(const FloatRect& rect, const Color& color)
if (paintingDisabled())
return;
m_data->context->SetPen(wxPen(color));
m_data->context->SetPen(*wxTRANSPARENT_PEN);
m_data->context->SetBrush(wxBrush(color));
m_data->context->DrawRectangle(rect.x(), rect.y(), rect.width(), rect.height());
}
......@@ -334,7 +334,7 @@ void GraphicsContext::drawLineForText(const IntPoint& origin, int width, bool pr
return;
IntPoint endPoint = origin + IntSize(width, 0);
m_data->context->SetPen(wxPen(strokeColor(), strokeThickness(), strokeStyleToWxPenStyle(strokeStyle())));
m_data->context->SetPen(wxPen(strokeColor(), strokeThickness(), wxSOLID));
m_data->context->DrawLine(origin.x(), origin.y(), endPoint.x(), endPoint.y());
}
......
......@@ -224,9 +224,12 @@ void RenderThemeWx::adjustTextFieldStyle(CSSStyleSelector*, RenderStyle* style,
bool RenderThemeWx::paintTextField(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r)
{
i.context->save();
i.context->setStrokeStyle(SolidStroke);
i.context->setStrokeThickness(1);
i.context->setStrokeColor(Color(0, 0, 0));
i.context->drawRect(r);
i.context->restore();
return false;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment