From 47b3e5327500eaeb4dfdccb827139a8f3c75e6c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= Date: Mon, 29 Jun 2015 14:35:30 +0200 Subject: Fixup screens display. Support cases where one or more screens have negative positions. Make the text size a (constant) fraction of the painted screen rectangle height. Change-Id: Iea39aa49281cfe2b97c3e9b2414ee5db6dfe1fbb Reviewed-by: Paul Olav Tvete --- tests/manual/highdpi/main.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/manual/highdpi/main.cpp b/tests/manual/highdpi/main.cpp index 819425b54f..b69353ae25 100644 --- a/tests/manual/highdpi/main.cpp +++ b/tests/manual/highdpi/main.cpp @@ -921,14 +921,16 @@ public: p.fillRect(rect(), Qt::black); p.scale(scaleFactor, scaleFactor); + p.translate(-total.topLeft()); p.setPen(QPen(Qt::white, 10)); p.setBrush(Qt::gray); - QFont f = font(); - f.setPixelSize(height()); - p.setFont(f); + foreach (QScreen *screen, screens) { p.drawRect(screen->geometry()); + QFont f = font(); + f.setPixelSize(screen->geometry().height() / 8); + p.setFont(f); p.drawText(screen->geometry(), Qt::AlignCenter, screen->name()); } p.setBrush(QColor(200,220,255,127)); -- cgit v1.2.3