Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reduce width and height of drawing ops by one in all vector printing backends

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48927 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2007-09-24 21:07:20 +00:00
parent ed8385818f
commit 728ddc45e0
3 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/generic/dcpsg.cpp
View File

@@ -738,6 +738,9 @@ void wxPostScriptDC::DoDrawRectangle (wxCoord x, wxCoord y, wxCoord width, wxCoo
{
wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
width--;
height--;
if (m_brush.GetStyle () != wxTRANSPARENT)
{
SetBrush( m_brush );
@@ -789,6 +792,9 @@ void wxPostScriptDC::DoDrawRoundedRectangle (wxCoord x, wxCoord y, wxCoord width
{
wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
width--;
height--;
if (radius < 0.0)
{
// Now, a negative radius is interpreted to mean
@@ -868,6 +874,9 @@ void wxPostScriptDC::DoDrawEllipse (wxCoord x, wxCoord y, wxCoord width, wxCoord
{
wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
width--;
height--;
if (m_brush.GetStyle () != wxTRANSPARENT)
{
SetBrush (m_brush);

11
src/gtk/gnome/gprint.cpp
View File

@@ -1198,6 +1198,9 @@ void wxGnomePrintDC::DoDrawPolyPolygon(int n, int count[], wxPoint points[], wxC
void wxGnomePrintDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
{
width--;
height--;
if (m_brush.GetStyle () != wxTRANSPARENT)
{
SetBrush( m_brush );
@@ -1233,7 +1236,10 @@ void wxGnomePrintDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoor
void wxGnomePrintDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius)
{
wxCoord rad = (wxCoord) radius;
width--;
height--;
wxCoord rad = wxRound( radius );
if (m_brush.GetStyle() != wxTRANSPARENT)
{
@@ -1348,6 +1354,9 @@ void wxGnomePrintDC::makeEllipticalPath(wxCoord x, wxCoord y,
void wxGnomePrintDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
{
width--;
height--;
if (m_brush.GetStyle () != wxTRANSPARENT)
{
SetBrush( m_brush );

9
src/gtk/print.cpp
View File

@@ -1415,6 +1415,9 @@ void wxGtkPrintDC::DoDrawPolyPolygon(int n, int count[], wxPoint points[], wxCoo
void wxGtkPrintDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
{
width--;
height--;
gs_cairo->cairo_new_path(m_cairo);
gs_cairo->cairo_rectangle ( m_cairo, XLOG2DEV(x), YLOG2DEV(y), XLOG2DEVREL(width), YLOG2DEVREL(height));
@@ -1430,6 +1433,9 @@ void wxGtkPrintDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord
void wxGtkPrintDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius)
{
width--;
height--;
if (radius < 0.0) radius = - radius * ((width < height) ? width : height);
wxCoord dd = 2 * (wxCoord) radius;
@@ -1475,6 +1481,9 @@ void wxGtkPrintDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, w
void wxGtkPrintDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
{
width--;
height--;
gs_cairo->cairo_save (m_cairo);
gs_cairo->cairo_new_path(m_cairo);