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

Try using fixed font size in pixels in the test

Browse Source
This commit is contained in:
Vadim Zeitlin
2018-07-22 00:54:05 +02:00
parent 1ce009e73a
commit 321854b519
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/html/htmprint.cpp
View File

@@ -65,8 +65,8 @@ TEST_CASE("wxHtmlPrintout::Pagination", "[html][print]")
// We do need to use DPI-proportional font sizes in order for the text used // We do need to use DPI-proportional font sizes in order for the text used
// in the page-break-inside:avoid test to take the same amount of pixels // in the page-break-inside:avoid test to take the same amount of pixels
// for any DPI (12 being the font size used by wxHtmlDCRenderer by default). // for any DPI (12 being the font size used by wxHtmlDCRenderer by default).
const int adjFontSize = 12*wxTheApp->GetTopWindow()->GetContentScaleFactor(); const wxFont fontFixedPixelSize(wxFontInfo(wxSize(10, 16)));
pr.SetStandardFonts(adjFontSize, "Helvetica"); pr.SetStandardFonts(fontFixedPixelSize.GetPointSize(), "Helvetica");
wxBitmap bmp(1000, 1000); wxBitmap bmp(1000, 1000);
wxMemoryDC dc(bmp); wxMemoryDC dc(bmp);
@@ -184,7 +184,7 @@ TEST_CASE("wxHtmlPrintout::Pagination", "[html][print]")
) )
); );
const wxSize ext = dc.GetTextExtent("Something"); const wxSize ext = dc.GetTextExtent("Something");
WARN("Using base font size " << adjFontSize WARN("Using base font size " << fontFixedPixelSize.GetPointSize()
<< ", text extent of \"Something\" is " << ext.x << "x" << ext.y); << ", text extent of \"Something\" is " << ext.x << "x" << ext.y);
CHECK( CountPages(pr) == 3 ); CHECK( CountPages(pr) == 3 );
} }