From 5e03c4d97f72f96a8fc97aa87f24c41a043048b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= Date: Tue, 18 Mar 2014 13:36:10 +0100 Subject: QOpenGLWidget retina support. Use device pixels where appropriate. Change-Id: Ia953e6da4034eecbfccf798701ec1b850eea9d5b Reviewed-by: Paul Olav Tvete --- tests/manual/qopenglwidget/openglwidget/openglwidget.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/manual/qopenglwidget/openglwidget/openglwidget.cpp b/tests/manual/qopenglwidget/openglwidget/openglwidget.cpp index 5752326911..bec89b6b41 100644 --- a/tests/manual/qopenglwidget/openglwidget/openglwidget.cpp +++ b/tests/manual/qopenglwidget/openglwidget/openglwidget.cpp @@ -61,8 +61,8 @@ class OpenGLWidgetPrivate { public: - OpenGLWidgetPrivate() - : m_program(0), m_frame(0) + OpenGLWidgetPrivate(QWidget *q) + : m_program(0), m_frame(0), q(q) { } @@ -82,13 +82,14 @@ public: int m_frame; int w,h; + QWidget *q; }; OpenGLWidget::OpenGLWidget(QWidget *parent) : QOpenGLWidget(parent) { - d = new OpenGLWidgetPrivate; + d = new OpenGLWidgetPrivate(this); QTimer *timer = new QTimer(this); connect(timer, SIGNAL(timeout()), this, SLOT(updateGL())); timer->start(30); @@ -147,7 +148,7 @@ void OpenGLWidgetPrivate::initialize() void OpenGLWidgetPrivate::render() { - const qreal retinaScale = 1.0;//devicePixelRatio(); + const qreal retinaScale = q->devicePixelRatio(); glViewport(0, 0, width() * retinaScale, height() * retinaScale); glClearColor(0.0, 0.0, 0.0, 1.0); -- cgit v1.2.3