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

draw monochrome source directly onto destination when it is also monochrome

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73387 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2013-01-20 02:04:57 +00:00
parent eb6ee8ab39
commit d4ca3c5d8d
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gtk/dcclient.cpp
View File

@@ -1164,9 +1164,12 @@ void wxWindowDCImpl::DoDrawBitmap( const wxBitmap &bitmap,
pixmap = bitmap.GetPixmap(); pixmap = bitmap.GetPixmap();
if (pixmap && gdk_drawable_get_depth(pixmap) == 1) if (pixmap && gdk_drawable_get_depth(pixmap) == 1)
{ {
// convert mono pixmap to color using text fg/bg colors if (gdk_drawable_get_depth(m_gdkwindow) != 1)
pixmap = MonoToColor(pixmap, 0, 0, w, h); {
pixmap_new = pixmap; // convert mono pixmap to color using text fg/bg colors
pixmap = MonoToColor(pixmap, 0, 0, w, h);
pixmap_new = pixmap;
}
} }
else if (hasAlpha || pixmap == NULL) else if (hasAlpha || pixmap == NULL)
pixbuf = bitmap.GetPixbuf(); pixbuf = bitmap.GetPixbuf();
@@ -1340,7 +1343,8 @@ bool wxWindowDCImpl::DoBlit( wxCoord xdest, wxCoord ydest,
} }
GdkPixmap* pixmap = NULL; GdkPixmap* pixmap = NULL;
if (gdk_drawable_get_depth(srcDrawable) == 1) if (gdk_drawable_get_depth(srcDrawable) == 1 &&
(gdk_drawable_get_depth(m_gdkwindow) != 1 || isScaled))
{ {
// Convert mono pixmap to color using text fg/bg colors. // Convert mono pixmap to color using text fg/bg colors.
// Scaling/drawing is simpler if this is done first. // Scaling/drawing is simpler if this is done first.