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

properly handle DC origin and scale in wxDoFloodFill()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57824 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2009-01-04 02:59:09 +00:00
parent e7f83cccd8
commit 173d67aa51
1 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/common/imagfill.cpp
View File

@@ -287,20 +287,37 @@ bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y,
wxCHECK_MSG(width >= 1 && height >= 1, false,
wxT("In FloodFill, dc.GetSize routine failed, method not supported by this DC"));
//this is much faster than doing the individual pixels
wxMemoryDC memdc;
const int x_dev = dc->LogicalToDeviceX(x);
const int y_dev = dc->LogicalToDeviceY(y);
// if start point is outside dc, can't do anything
if (!wxRect(0, 0, width, height).Contains(x_dev, y_dev))
return false;
wxBitmap bitmap(width, height);
memdc.SelectObject(bitmap);
memdc.Blit(0, 0, width, height, dc, 0, 0);
wxMemoryDC memdc(bitmap);
// match dc scales
double sx, sy;
dc->GetUserScale(&sx, &sy);
memdc.SetUserScale(sx, sy);
dc->GetLogicalScale(&sx, &sy);
memdc.SetLogicalScale(sx, sy);
// get logical size and origin
const int w_log = dc->DeviceToLogicalXRel(width);
const int h_log = dc->DeviceToLogicalYRel(height);
const int x0_log = dc->DeviceToLogicalX(0);
const int y0_log = dc->DeviceToLogicalY(0);
memdc.Blit(0, 0, w_log, h_log, dc, x0_log, y0_log);
memdc.SelectObject(wxNullBitmap);
wxImage image = bitmap.ConvertToImage();
wxImageFloodFill(&image, x,y, dc->GetBrush(), col, style,
wxImageFloodFill(&image, x_dev, y_dev, dc->GetBrush(), col, style,
dc->GetLogicalFunction());
bitmap = wxBitmap(image);
memdc.SelectObject(bitmap);
dc->Blit(0, 0, width, height, &memdc, 0, 0);
memdc.SelectObject(wxNullBitmap);
dc->Blit(x0_log, y0_log, w_log, h_log, &memdc, 0, 0);
return true;
}