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

use the real clipping region and not just its bounding box in :DoDrawBitmap() (#9597)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-06-21 15:50:58 +00:00
parent 624f82cc94
commit 8ca1b2c502
1 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/x11/dcclient.cpp
View File

@@ -23,6 +23,7 @@
#endif #endif
#include "wx/fontutil.h" #include "wx/fontutil.h"
#include "wx/vector.h"
#include "wx/x11/private.h" #include "wx/x11/private.h"
#include "wx/x11/dcclient.h" #include "wx/x11/dcclient.h"
@@ -167,9 +168,9 @@ static void wxFreePoolGC( GC gc )
IMPLEMENT_ABSTRACT_CLASS(wxWindowDCImpl, wxX11DCImpl) IMPLEMENT_ABSTRACT_CLASS(wxWindowDCImpl, wxX11DCImpl)
wxWindowDCImpl::wxWindowDCImpl( wxDC *owner ) wxWindowDCImpl::wxWindowDCImpl( wxDC *owner )
: wxX11DCImpl( owner ) : wxX11DCImpl( owner )
{ {
Init(); Init();
} }
@@ -1219,9 +1220,20 @@ void wxWindowDCImpl::DoDrawBitmap( const wxBitmap &bitmap,
XSetStipple( xdisplay, gc, (Pixmap) mask); XSetStipple( xdisplay, gc, (Pixmap) mask);
} }
wxCoord clip_x, clip_y, clip_w, clip_h; wxVector<XRectangle> rects;
m_currentClippingRegion.GetBox(clip_x, clip_y, clip_w, clip_h); for ( wxRegionIterator iter(m_currentClippingRegion);
XFillRectangle( xdisplay, new_pixmap, gc, clip_x-xx, clip_y-yy, clip_w, clip_h ); iter;
++iter )
{
XRectangle rect;
rect.x = iter.GetX() - xx;
rect.y = iter.GetY() - yy;
rect.width = iter.GetWidth();
rect.height = iter.GetHeight();
rects.push_back(rect);
}
XFillRectangles(xdisplay, new_pixmap, gc, &rects[0], rects.size());
XFreeGC( xdisplay, gc ); XFreeGC( xdisplay, gc );
} }
@@ -1255,7 +1267,7 @@ void wxWindowDCImpl::DoDrawBitmap( const wxBitmap &bitmap,
else else
XCopyArea( (Display*) m_display, (Pixmap) use_bitmap.GetPixmap(), (Window) m_x11window, XCopyArea( (Display*) m_display, (Pixmap) use_bitmap.GetPixmap(), (Window) m_x11window,
(GC) m_penGC, 0, 0, ww, hh, xx, yy ); (GC) m_penGC, 0, 0, ww, hh, xx, yy );
// remove mask again if any // remove mask again if any
if (setClipMask) if (setClipMask)
{ {
@@ -1314,7 +1326,7 @@ bool wxWindowDCImpl::DoBlit( wxCoord xdest, wxCoord ydest, wxCoord width, wxCoor
if (src_impl->m_isMemDC) if (src_impl->m_isMemDC)
{ {
wxBitmap selected = memDC->GetSelectedBitmap(); wxBitmap selected = memDC->GetSelectedBitmap();
if (!selected.IsOk()) return false; if (!selected.IsOk()) return false;
/* we use the "XCopyArea" way to copy a memory dc into /* we use the "XCopyArea" way to copy a memory dc into
@@ -1379,7 +1391,7 @@ bool wxWindowDCImpl::DoBlit( wxCoord xdest, wxCoord ydest, wxCoord width, wxCoor
if (use_bitmap_method) if (use_bitmap_method)
{ {
wxBitmap selected = memDC->GetSelectedBitmap(); wxBitmap selected = memDC->GetSelectedBitmap();
// scale/translate bitmap size // scale/translate bitmap size
wxCoord bm_width = selected.GetWidth(); wxCoord bm_width = selected.GetWidth();
wxCoord bm_height = selected.GetHeight(); wxCoord bm_height = selected.GetHeight();
@@ -1493,7 +1505,7 @@ bool wxWindowDCImpl::DoBlit( wxCoord xdest, wxCoord ydest, wxCoord width, wxCoor
SetLogicalFunction( old_logical_func ); SetLogicalFunction( old_logical_func );
return false; return false;
} }
if ((width != ww) || (height != hh)) if ((width != ww) || (height != hh))
{ {
/* Draw source window into a bitmap as we cannot scale /* Draw source window into a bitmap as we cannot scale