diff options
| author | Charles Yin <yinyunqiao@gmail.com> | 2012-06-02 09:59:49 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-04 01:32:45 +0200 |
| commit | 12d432d1e39d62973ce3b35126b6bfa3b7f9cdbd (patch) | |
| tree | 0cc29240d7627155687159bf2a09ad7bbadb7856 /src | |
| parent | 6751f0e69b86ca8f3f29282bfd44ad52ebf5d182 (diff) | |
Fix resizing of Canvas item that use FBO as renderTargets.
Change-Id: I2a158e7838f637a662700290f9f4fd28ca726d1e
Task-number: QTBUG-25992
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/quick/items/context2d/qquickcontext2dtexture.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/quick/items/context2d/qquickcontext2dtexture.cpp b/src/quick/items/context2d/qquickcontext2dtexture.cpp index 52f3161a8b..7778a64962 100644 --- a/src/quick/items/context2d/qquickcontext2dtexture.cpp +++ b/src/quick/items/context2d/qquickcontext2dtexture.cpp @@ -562,12 +562,16 @@ QPaintDevice* QQuickContext2DFBOTexture::beginPainting() if (m_canvasWindow.size().isEmpty() && !m_threadRendering) { delete m_fbo; delete m_multisampledFbo; + delete m_paint_device; m_fbo = 0; m_multisampledFbo = 0; + m_paint_device = 0; return 0; } else if (!m_fbo || m_canvasWindowChanged) { delete m_fbo; delete m_multisampledFbo; + delete m_paint_device; + m_paint_device = 0; m_fboSize = npotAdjustedSize(m_canvasWindow.size()); m_canvasWindowChanged = false; @@ -601,6 +605,7 @@ QPaintDevice* QQuickContext2DFBOTexture::beginPainting() if (!m_paint_device) { QOpenGLPaintDevice *gl_device = new QOpenGLPaintDevice(m_fbo->size()); gl_device->setPaintFlipped(true); + gl_device->setSize(m_fbo->size()); m_paint_device = gl_device; } |