diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2015-07-24 16:08:01 +0900 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-08-07 09:34:28 +0000 |
| commit | c02d01ba71f5290beac991d5ddafe1309b428ebf (patch) | |
| tree | 51e57cf2bc84e0878b40ce1b3da6e6572e4723b3 | |
| parent | Use LRU map for caching of native widgets (diff) | |
| download | core-c02d01ba71f5290beac991d5ddafe1309b428ebf.tar.gz core-c02d01ba71f5290beac991d5ddafe1309b428ebf.zip | |
opengl: don't cache checkboxes for now
Change-Id: I67d0dcb48d1843587abbc1dc0f7da1f8057b281e
(cherry picked from commit 1c28c59f927361ef85c8aea8b575d274c532a34d)
Reviewed-on: https://gerrit.libreoffice.org/17557
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
| -rw-r--r-- | vcl/opengl/x11/gdiimpl.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/vcl/opengl/x11/gdiimpl.cxx b/vcl/opengl/x11/gdiimpl.cxx index 211441931c00..bf5e6f600c44 100644 --- a/vcl/opengl/x11/gdiimpl.cxx +++ b/vcl/opengl/x11/gdiimpl.cxx @@ -238,8 +238,15 @@ bool X11OpenGLSalGraphicsImpl::RenderAndCacheNativeControl(X11Pixmap* pPixmap, X { std::unique_ptr<TextureCombo> pCombo(new TextureCombo); bool bResult = RenderPixmap(pPixmap, pMask, nX, nY, *pCombo); + if (!bResult) + return false; + + if (aControlCacheKey.mnType == CTRL_CHECKBOX) + return true; + ControlCachePair pair(aControlCacheKey, std::move(pCombo)); gTextureCache.insert(std::move(pair)); + return bResult; } |