[Libreoffice-commits] core.git: Branch 'private/moggi/chart-opengl2' - chart2/source

[Markus Mohrhard]

 chart2/source/view/main/DummyXShape.cxx |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

New commits:
commit c35d785361c8f19c5ceb81d3a9c6a95db3096bbf
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sun Dec 29 05:49:58 2013 +0100

    Revert "that code looked strange and might explain some artifacts"
    
    Apparently this code was not so strange. It looks even worse after my
    change. Maybe I should make it clearer that I'm just guessing right now.
    Where is this big black rectangle coming from?
    
    This reverts commit d55dfdb9b48196b9907a7023cb338a62bac99127.

diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx
index 305fd53..08d18c7 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -944,12 +944,16 @@ void DummyChart::setSize( const awt::Size& aSize )
 //    DummyXShape::setSize(aSize);
 //    mpWindow->SetSizePixel(Size(aSize.Width, aSize.Height));
 //    pWindow->SetSizePixel(Size(aSize.Width, aSize.Height));
-    mpWindow->SetSizePixel(Size(0,0));
-    pWindow->SetSizePixel(Size(0,0));
+    int width = aSize.Width / 10;
+    int height = aSize.Height / 10;
+    width = (width + 3) & ~3;
+    height = (height + 3) & ~3;
+    mpWindow->SetSizePixel(Size(width, height));
+    pWindow->SetSizePixel(Size(width, height));
     DummyXShape::setSize(awt::Size(0,0));
-    m_GLRender.SetWidth(aSize.Width);
-    m_GLRender.SetHeight(aSize.Height);
-    SAL_WARN("chart2.opengl", "DummyChart::GLRender.Width = " << aSize.Width << ", GLRender.Height = " << aSize.Height);
+    m_GLRender.SetWidth(width);
+    m_GLRender.SetHeight(height);
+    SAL_WARN("chart2.opengl", "DummyChart::GLRender.Width = " << width << ", GLRender.Height = " << height);
 #endif
  //[mod] by gaowei end