From da2f627ba2117b6ef1791ff8971df2fc68c29d10 Mon Sep 17 00:00:00 2001
From: Gunnar Sletta <gunnar.sletta@digia.com>
Date: Wed, 20 Mar 2013 13:20:14 +0100
Subject: improve openglwindow example a bit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I50e00c33c100beab975d0fcbfc4ccdd496cccbaf
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
---
 examples/gui/openglwindow/main.cpp         |  5 +++--
 examples/gui/openglwindow/openglwindow.cpp | 11 +----------
 examples/gui/openglwindow/openglwindow.h   |  1 -
 3 files changed, 4 insertions(+), 13 deletions(-)

(limited to 'examples')

diff --git a/examples/gui/openglwindow/main.cpp b/examples/gui/openglwindow/main.cpp
index cd6dca3352..237680a889 100644
--- a/examples/gui/openglwindow/main.cpp
+++ b/examples/gui/openglwindow/main.cpp
@@ -80,7 +80,7 @@ int main(int argc, char **argv)
     QGuiApplication app(argc, argv);
 
     QSurfaceFormat format;
-    format.setSamples(4);
+    format.setSamples(16);
 
     TriangleWindow window;
     window.setFormat(format);
@@ -136,7 +136,8 @@ void TriangleWindow::initialize()
 //! [5]
 void TriangleWindow::render()
 {
-    glViewport(0, 0, width(), height());
+    const qreal retinaScale = devicePixelRatio();
+    glViewport(0, 0, width() * retinaScale, height() * retinaScale);
 
     glClear(GL_COLOR_BUFFER_BIT);
 
diff --git a/examples/gui/openglwindow/openglwindow.cpp b/examples/gui/openglwindow/openglwindow.cpp
index 5b247ebf19..afebf521f3 100644
--- a/examples/gui/openglwindow/openglwindow.cpp
+++ b/examples/gui/openglwindow/openglwindow.cpp
@@ -99,6 +99,7 @@ bool OpenGLWindow::event(QEvent *event)
 {
     switch (event->type()) {
     case QEvent::UpdateRequest:
+        m_update_pending = false;
         renderNow();
         return true;
     default:
@@ -113,14 +114,6 @@ void OpenGLWindow::exposeEvent(QExposeEvent *event)
     if (isExposed())
         renderNow();
 }
-
-void OpenGLWindow::resizeEvent(QResizeEvent *event)
-{
-    Q_UNUSED(event);
-
-    if (isExposed())
-        renderNow();
-}
 //! [3]
 
 //! [4]
@@ -129,8 +122,6 @@ void OpenGLWindow::renderNow()
     if (!isExposed())
         return;
 
-    m_update_pending = false;
-
     bool needsInitialize = false;
 
     if (!m_context) {
diff --git a/examples/gui/openglwindow/openglwindow.h b/examples/gui/openglwindow/openglwindow.h
index 21ec033261..f6b53e3b33 100644
--- a/examples/gui/openglwindow/openglwindow.h
+++ b/examples/gui/openglwindow/openglwindow.h
@@ -70,7 +70,6 @@ protected:
     bool event(QEvent *event);
 
     void exposeEvent(QExposeEvent *event);
-    void resizeEvent(QResizeEvent *event);
 
 private:
     bool m_update_pending;
-- 
cgit v1.2.3