[Libreoffice-commits] core.git: Branch 'feature/chart_opengl_window' - 2 commits - chart2/source

[Zolnai Tamás]

 chart2/source/view/main/ChartView.cxx |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 975cb15af3b9ff220276cac015db916b794c487d
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Thu Aug 21 10:47:31 2014 +0200

    Fix rendering of GL3DBarCharts after ODF import
    
    OpenGL window need to have a valid size before
    rendering.
    
    Change-Id: I3ce3dbf653f0dc101de3acc4d634d7fe6c3be9ad

diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 99fe65d..fa7f415 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -3160,6 +3160,12 @@ void ChartView::createShapes3D()
     if(!pWindow)
         return;
 
+    if( pWindow->GetSizePixel().Width() == 0 || pWindow->GetSizePixel().Height() == 0 )
+    {
+        awt::Size aPageSize = mrChartModel.getVisualAreaSize( embed::Aspects::MSOLE_CONTENT );
+        Size aSize = pWindow->LogicToPixel( Size(aPageSize.Width,aPageSize.Height), MapUnit(MAP_100TH_MM) );
+        pWindow->SetSizePixel(aSize);
+    }
     pWindow->Show();
     uno::Reference< XDiagram > xDiagram( mrChartModel.getFirstDiagram() );
     uno::Reference< XCoordinateSystemContainer > xCooSysContainer( xDiagram, uno::UNO_QUERY );
commit b79b862927d937d695b31df4bdb85d1fc8774f39
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Mon Aug 18 15:16:46 2014 +0200

    Stop flickering in rendering of charts in Writer
    
    Change-Id: I52efa9cd7851f480ee2abcaa1646735c6f518f3a

diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index c857299..99fe65d 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -2495,11 +2495,6 @@ void ChartView::createShapes()
     else
     {
         m_pGL3DPlotter.reset();
-
-        // hide OpenGL window for now in normal charts
-        OpenGLWindow* pWindow = mrChartModel.getOpenGLWindow();
-        if(pWindow)
-            pWindow->Show(false);
     }
 #endif