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

Apply mask origin patch for blitting.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34776 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2005-06-29 19:22:54 +00:00
parent 87ae5038ef
commit b7a4965413
2 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/gtk/dcclient.cpp
View File

@@ -1217,7 +1217,6 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
bool use_bitmap_method = false; bool use_bitmap_method = false;
bool is_mono = false; bool is_mono = false;
// TODO: use the mask origin when drawing transparently
if (xsrcMask == -1 && ysrcMask == -1) if (xsrcMask == -1 && ysrcMask == -1)
{ {
xsrcMask = xsrc; xsrcMask = xsrc;
@@ -1347,6 +1346,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
GdkGC *gc = gdk_gc_new( new_mask ); GdkGC *gc = gdk_gc_new( new_mask );
col.pixel = 0; col.pixel = 0;
gdk_gc_set_foreground( gc, &col ); gdk_gc_set_foreground( gc, &col );
gdk_gc_set_ts_origin( gc, -xsrcMask, -ysrcMask);
gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, bm_ww, bm_hh ); gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, bm_ww, bm_hh );
col.pixel = 0; col.pixel = 0;
gdk_gc_set_background( gc, &col ); gdk_gc_set_background( gc, &col );
@@ -1364,21 +1364,29 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
if (is_mono) if (is_mono)
{ {
if (new_mask) if (new_mask)
{
gdk_gc_set_clip_mask( m_textGC, new_mask ); gdk_gc_set_clip_mask( m_textGC, new_mask );
else
gdk_gc_set_clip_mask( m_textGC, mask );
// was: gdk_gc_set_clip_origin( m_textGC, xx, yy );
gdk_gc_set_clip_origin( m_textGC, cx, cy ); gdk_gc_set_clip_origin( m_textGC, cx, cy );
} }
else else
{ {
if (new_mask) gdk_gc_set_clip_mask( m_textGC, mask );
gdk_gc_set_clip_mask( m_penGC, new_mask ); gdk_gc_set_clip_origin( m_textGC, cx-xsrcMask, cy-ysrcMask );
}
}
else else
gdk_gc_set_clip_mask( m_penGC, mask ); {
// was: gdk_gc_set_clip_origin( m_penGC, xx, yy ); if (new_mask)
{
gdk_gc_set_clip_mask( m_penGC, new_mask );
gdk_gc_set_clip_origin( m_penGC, cx, cy ); gdk_gc_set_clip_origin( m_penGC, cx, cy );
} }
else
{
gdk_gc_set_clip_mask( m_penGC, mask );
gdk_gc_set_clip_origin( m_penGC, cx-xsrcMask, cy-ysrcMask );
}
}
} }
// Draw XPixmap or XBitmap, depending on what the wxBitmap contains. For // Draw XPixmap or XBitmap, depending on what the wxBitmap contains. For

24
src/gtk1/dcclient.cpp
View File

@@ -1217,7 +1217,6 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
bool use_bitmap_method = false; bool use_bitmap_method = false;
bool is_mono = false; bool is_mono = false;
// TODO: use the mask origin when drawing transparently
if (xsrcMask == -1 && ysrcMask == -1) if (xsrcMask == -1 && ysrcMask == -1)
{ {
xsrcMask = xsrc; xsrcMask = xsrc;
@@ -1347,6 +1346,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
GdkGC *gc = gdk_gc_new( new_mask ); GdkGC *gc = gdk_gc_new( new_mask );
col.pixel = 0; col.pixel = 0;
gdk_gc_set_foreground( gc, &col ); gdk_gc_set_foreground( gc, &col );
gdk_gc_set_ts_origin( gc, -xsrcMask, -ysrcMask);
gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, bm_ww, bm_hh ); gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, bm_ww, bm_hh );
col.pixel = 0; col.pixel = 0;
gdk_gc_set_background( gc, &col ); gdk_gc_set_background( gc, &col );
@@ -1364,21 +1364,29 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
if (is_mono) if (is_mono)
{ {
if (new_mask) if (new_mask)
{
gdk_gc_set_clip_mask( m_textGC, new_mask ); gdk_gc_set_clip_mask( m_textGC, new_mask );
else
gdk_gc_set_clip_mask( m_textGC, mask );
// was: gdk_gc_set_clip_origin( m_textGC, xx, yy );
gdk_gc_set_clip_origin( m_textGC, cx, cy ); gdk_gc_set_clip_origin( m_textGC, cx, cy );
} }
else else
{ {
if (new_mask) gdk_gc_set_clip_mask( m_textGC, mask );
gdk_gc_set_clip_mask( m_penGC, new_mask ); gdk_gc_set_clip_origin( m_textGC, cx-xsrcMask, cy-ysrcMask );
}
}
else else
gdk_gc_set_clip_mask( m_penGC, mask ); {
// was: gdk_gc_set_clip_origin( m_penGC, xx, yy ); if (new_mask)
{
gdk_gc_set_clip_mask( m_penGC, new_mask );
gdk_gc_set_clip_origin( m_penGC, cx, cy ); gdk_gc_set_clip_origin( m_penGC, cx, cy );
} }
else
{
gdk_gc_set_clip_mask( m_penGC, mask );
gdk_gc_set_clip_origin( m_penGC, cx-xsrcMask, cy-ysrcMask );
}
}
} }
// Draw XPixmap or XBitmap, depending on what the wxBitmap contains. For // Draw XPixmap or XBitmap, depending on what the wxBitmap contains. For