Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-09-22 06:05:36 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'drawrect-size-1x1-test' of https://github.com/wsu-cb/wxWidgets

Browse Source 
Document and test behavior of wxDC::DrawRectangle() with transparent pen

See #24597.
This commit is contained in:
Vadim Zeitlin
2024-06-16 00:04:55 +02:00
parent b84e02c4ca ffb5ff6b53
commit cc6856593e
2 changed files with 61 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/graphics/bitmap.cpp
+59 -11
View File
@@ -140,7 +140,7 @@ TEST_CASE("BitmapTestCase::ToImage", "[bitmap][image][convertto]")
wxBitmap bmp(16, 16, 24);
{
wxMemoryDC dc(bmp);
dc.SetPen(*wxYELLOW_PEN);
dc.SetPen(*wxTRANSPARENT_PEN);
dc.SetBrush(*wxYELLOW_BRUSH);
dc.DrawRectangle(0, 0, bmp.GetWidth(), bmp.GetHeight());
}
@@ -153,19 +153,67 @@ TEST_CASE("BitmapTestCase::ToImage", "[bitmap][image][convertto]")
REQUIRE(image.GetWidth() == bmp.GetWidth());
REQUIRE(image.GetHeight() == bmp.GetHeight());
wxNativePixelData dataBmp(bmp);
wxNativePixelData::Iterator rowStartBmp(dataBmp);
for ( int y = 0; y < bmp.GetHeight(); ++y )
{
wxNativePixelData::Iterator iBmp = rowStartBmp;
for ( int x = 0; x < bmp.GetWidth(); ++x, ++iBmp )
wxNativePixelData dataBmp(bmp);
wxNativePixelData::Iterator rowStartBmp(dataBmp);
for ( int y = 0; y < bmp.GetHeight(); ++y )
{
wxColour bmpc(iBmp.Red(), iBmp.Green(), iBmp.Blue());
wxColour imgc(image.GetRed(x, y), image.GetGreen(x, y), image.GetBlue(x, y));
CHECK_EQUAL_COLOUR_RGB(imgc, bmpc);
wxNativePixelData::Iterator iBmp = rowStartBmp;
for ( int x = 0; x < bmp.GetWidth(); ++x, ++iBmp )
{
wxColour bmpc(iBmp.Red(), iBmp.Green(), iBmp.Blue());
wxColour imgc(image.GetRed(x, y), image.GetGreen(x, y), image.GetBlue(x, y));
CHECK_EQUAL_COLOUR_RGB(imgc, bmpc);
}
rowStartBmp.OffsetY(dataBmp, 1);
}
}
for ( int size = 4 ; size != 0 ; --size )
{
INFO("Red square size: " << size)
wxBitmap bmp2 = bmp;
// verify bmp starts yellow
{
wxNativePixelData dataBmp(bmp2);
wxNativePixelData::Iterator rowStartBmp(dataBmp);
for ( int y = 0; y < bmp2.GetHeight(); ++y )
{
wxNativePixelData::Iterator iBmp = rowStartBmp;
for ( int x = 0; x < bmp2.GetWidth(); ++x, ++iBmp )
{
wxColour bmpc(iBmp.Red(), iBmp.Green(), iBmp.Blue());
CHECK_EQUAL_COLOUR_RGB(bmpc, (*wxYELLOW));
}
rowStartBmp.OffsetY(dataBmp, 1);
}
}
// change square to red
wxRect square(wxPoint(5, 5), wxSize(size, size));
{
wxMemoryDC dc(bmp2);
dc.SetPen(*wxTRANSPARENT_PEN);
dc.SetBrush(*wxRED_BRUSH);
dc.DrawRectangle(square);
}
// verify bitmap is still yellow, except square is red
{
wxNativePixelData dataBmp(bmp2);
wxNativePixelData::Iterator rowStartBmp(dataBmp);
for ( int y = 0; y < bmp2.GetHeight(); ++y )
{
wxNativePixelData::Iterator iBmp = rowStartBmp;
for ( int x = 0; x < bmp2.GetWidth(); ++x, ++iBmp )
{
wxColour bmpc(iBmp.Red(), iBmp.Green(), iBmp.Blue());
CHECK_EQUAL_COLOUR_RGB(bmpc, (square.Contains(x, y) ? *wxRED : *wxYELLOW));
}
rowStartBmp.OffsetY(dataBmp, 1);
}
}
rowStartBmp.OffsetY(dataBmp, 1);
}
}