diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-06-07 16:11:02 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2016-06-07 18:16:00 +0000 |
| commit | dc4b01a5a937565b1d6491850c922e1b7de0e949 (patch) | |
| tree | 40cb93159e3d26c292bae366b908780e5dd41a08 /chart2 | |
| parent | 47a218c3f9d8f12dab9813abc820d54f1e77b6f8 (diff) | |
only init the OpenGL context if we need it
Reviewed-on: https://gerrit.libreoffice.org/26023
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit 78b100ec9cb0db2f7b33ece5ad3287a67a37246f)
we also need to set initialized falg for deferred initialization
Change-Id: Ia88a1720d204b9933f1476bd703b99180e45abde
Reviewed-on: https://gerrit.libreoffice.org/26031
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/controller/main/ChartWindow.cxx | 2 | ||||
| -rw-r--r-- | chart2/source/view/main/ChartView.cxx | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx index 25bdc33c7a13..3d3b8492b4e9 100644 --- a/chart2/source/controller/main/ChartWindow.cxx +++ b/chart2/source/controller/main/ChartWindow.cxx @@ -50,7 +50,7 @@ ChartWindow::ChartWindow( ChartController* pController, vcl::Window* pParent, Wi , m_pWindowController( pController ) , m_bInPaint(false) #if HAVE_FEATURE_OPENGL - , m_pOpenGLWindow(VclPtr<OpenGLWindow>::Create(this)) + , m_pOpenGLWindow(VclPtr<OpenGLWindow>::Create(this, false)) #else , m_pOpenGLWindow(nullptr) #endif diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 569eeaee3f47..56c7a59e795b 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -2731,6 +2731,10 @@ void ChartView::impl_updateView( bool bCheckLockedCtrler ) //create chart view { + OpenGLWindow* pWindow = mrChartModel.getOpenGLWindow(); + if (pWindow && ChartHelper::isGL3DDiagram(mrChartModel.getFirstDiagram())) + pWindow->Initialize(); + m_bViewDirty = false; m_bViewUpdatePending = false; createShapes(); |