AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix the just added pagination test for high DPI systems

Browse Source 
Adjust the font size used by a DPI-dependent factor to ensure that the
text takes the same amount of pixels independently of DPI.
This commit is contained in:
Vadim Zeitlin 2018-06-20 14:38:45 +02:00
parent 566e401a3f
commit 905789485a
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/html/htmprint.cpp
View File

@ -22,6 +22,9 @@
#include "wx/dcmemory.h"
#endif // WX_PRECOMP
#include "wx/app.h"
#include "wx/window.h"
#include "wx/html/htmprint.h"
namespace
@ -59,6 +62,12 @@ TEST_CASE("wxHtmlPrintout::Pagination", "[html][print]")
// the DPI-dependent factor, but it doesn't seem to be worth doing it).
pr.SetMargins(0, 0, 0, 0, 0);
// 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
// for any DPI (12 being the font size used by wxHtmlDCRenderer by default).
const int adjFontSize = 12*wxTheApp->GetTopWindow()->GetContentScaleFactor();
pr.SetStandardFonts(adjFontSize);
wxBitmap bmp(1000, 1000);
wxMemoryDC dc(bmp);
pr.SetUp(dc);
@ -174,6 +183,7 @@ TEST_CASE("wxHtmlPrintout::Pagination", "[html][print]")
text
)
);
INFO("Using base font size " << adjFontSize);
CHECK( CountPages(pr) == 3 );
}