Draw 2-pixel width rectangle ourselves, the
X11 code leaves one pixel white (?) and looks differently positioned in RTL. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41276 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
2a81538d69
commit
3b5bf82893
@ -838,7 +838,36 @@ void wxWindowDC::DoDrawRectangle( wxCoord x, wxCoord y, wxCoord width, wxCoord h
|
||||
}
|
||||
|
||||
if (m_pen.GetStyle() != wxTRANSPARENT)
|
||||
gdk_draw_rectangle( m_window, m_penGC, FALSE, xx, yy, ww-1, hh-1 );
|
||||
{
|
||||
#if 1
|
||||
if ((m_pen.GetWidth() == 2) && (m_pen.GetCap() == wxCAP_ROUND) &&
|
||||
(m_pen.GetJoin() == wxJOIN_ROUND) && (m_pen.GetStyle() == wxSOLID))
|
||||
{
|
||||
// Use 2 1-line rects instead
|
||||
gdk_gc_set_line_attributes( m_penGC, 1, GDK_LINE_SOLID, GDK_CAP_ROUND, GDK_JOIN_ROUND );
|
||||
|
||||
if (m_signX == -1)
|
||||
{
|
||||
// Different for RTL
|
||||
gdk_draw_rectangle( m_window, m_penGC, FALSE, xx+1, yy, ww-2, hh-2 );
|
||||
gdk_draw_rectangle( m_window, m_penGC, FALSE, xx, yy-1, ww, hh );
|
||||
}
|
||||
else
|
||||
{
|
||||
gdk_draw_rectangle( m_window, m_penGC, FALSE, xx, yy, ww-2, hh-2 );
|
||||
gdk_draw_rectangle( m_window, m_penGC, FALSE, xx-1, yy-1, ww, hh );
|
||||
}
|
||||
|
||||
// reset
|
||||
gdk_gc_set_line_attributes( m_penGC, 2, GDK_LINE_SOLID, GDK_CAP_ROUND, GDK_JOIN_ROUND );
|
||||
}
|
||||
else
|
||||
#endif
|
||||
{
|
||||
// Just use X11 for other cases
|
||||
gdk_draw_rectangle( m_window, m_penGC, FALSE, xx, yy, ww-1, hh-1 );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
CalcBoundingBox( x, y );
|
||||
|
Loading…
Reference in New Issue
Block a user