From 55fa3c189f88933d390177ad5606d3de9deacf93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20R=C3=B8dal?= Date: Wed, 14 Mar 2012 17:55:43 +0100 Subject: Got rid of Map / Unmap events in favor of Expose event. Since change 2e4d8f67a871f2033 the need for Map and Unmap events has gone away, as now the Expose event is used to notify the application about when it can start rendering. The Map and Unmap events weren't really used except by QWidget to set the WA_Mapped flag, which we now set based on the expose / unexpose. Also guarantee that a Resize event is always sent before the first Expose, by re-introducing an asynchronous expose event handler. Since an expose is required before rendering to a QWindow, show a warning if QOpenGLContext::swapBuffers() or QBackingStore::flush() if called on a window that has not received its first expose. Change-Id: Ia6b609aa275d5b463b5011a96f2fd9bbe52e9bc4 Reviewed-by: Friedemann Kleint --- examples/qpa/windows/window.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'examples') diff --git a/examples/qpa/windows/window.cpp b/examples/qpa/windows/window.cpp index 3ea2f61600..f0eba15cbf 100644 --- a/examples/qpa/windows/window.cpp +++ b/examples/qpa/windows/window.cpp @@ -103,9 +103,9 @@ void Window::mouseMoveEvent(QMouseEvent *event) p.setRenderHint(QPainter::Antialiasing); p.drawLine(m_lastPos, event->pos()); m_lastPos = event->pos(); - } - scheduleRender(); + scheduleRender(); + } } void Window::mouseReleaseEvent(QMouseEvent *event) @@ -115,9 +115,9 @@ void Window::mouseReleaseEvent(QMouseEvent *event) p.setRenderHint(QPainter::Antialiasing); p.drawLine(m_lastPos, event->pos()); m_lastPos = QPoint(-1, -1); - } - scheduleRender(); + scheduleRender(); + } } void Window::exposeEvent(QExposeEvent *) @@ -139,8 +139,7 @@ void Window::resizeEvent(QResizeEvent *) QPainter p(&m_image); p.drawImage(0, 0, old); } - - render(); + scheduleRender(); } void Window::keyPressEvent(QKeyEvent *event) @@ -168,7 +167,8 @@ void Window::scheduleRender() void Window::timerEvent(QTimerEvent *) { - render(); + if (isExposed()) + render(); killTimer(m_renderTimer); m_renderTimer = 0; } -- cgit v1.2.3