[Libreoffice-commits] core.git: chart2/source

[xukai]

 chart2/source/view/charttypes/GL3DBarChart.cxx |    4 ++--
 chart2/source/view/main/3DChartObjects.cxx     |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 62deb6d6227105d67e46dbfb89a43dc5e510791a
Author: xukai <xukai at multicorewareinc.com>
Date:   Wed Sep 24 13:47:53 2014 +0800

    Changing the font properties makes it look better
    
    Change-Id: I1be1833ef416e5eed1e7edbb1254302e28bacba7
    Reviewed-on: https://gerrit.libreoffice.org/11620
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx b/chart2/source/view/charttypes/GL3DBarChart.cxx
old mode 100644
new mode 100755
index 05738d7..45aa0b3
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -1244,7 +1244,7 @@ void GL3DBarChart::addMovementScreenText(sal_uInt32 nBarId)
     OUString aBarValue = OUString("Value: ") + OUString::number(rBarInfo.mnVal);
     maScreenTextShapes.push_back(new opengl3D::ScreenText(mpRenderer.get(), *mpTextCache, aBarValue, glm::vec4(0.0f, 0.0f, 1.0f, 0.0f), CALC_POS_EVENT_ID, true));
     const opengl3D::TextCacheItem& rTextCache = mpTextCache->getText(aBarValue);
-    float nRectWidth = (float)rTextCache.maSize.Width() / (float)rTextCache.maSize.Height() * 0.015;
+    float nRectWidth = (float)rTextCache.maSize.Width() / (float)rTextCache.maSize.Height() * 0.024;
     opengl3D::ScreenText* pScreenText = static_cast<opengl3D::ScreenText*>(&maScreenTextShapes.back());
     pScreenText->setPosition(glm::vec2(-nRectWidth / 2, 0.03f), glm::vec2(nRectWidth / 2, -0.03f), aTextPos);
 }
@@ -1441,7 +1441,7 @@ void GL3DBarChart::updateScroll()
                 OUString aBarValue = OUString("Value: ") + OUString::number(aBarInfoList[i].mnVal);
                 maScreenTextShapes.push_back(new opengl3D::ScreenText(mpRenderer.get(), *mpTextCache, aBarValue, glm::vec4(0.0f, 0.0f, 1.0f, 0.0f), CALC_POS_EVENT_ID, true));
                 const opengl3D::TextCacheItem& rTextCache = mpTextCache->getText(aBarValue);
-                float nRectWidth = (float)rTextCache.maSize.Width() / (float)rTextCache.maSize.Height() * 0.015;
+                float nRectWidth = (float)rTextCache.maSize.Width() / (float)rTextCache.maSize.Height() * 0.024;
                 glm::vec3 aTextPos = glm::vec3(aBarInfoList[i].maPos.x + BAR_SIZE_X / 2.0f,
                                       aBarInfoList[i].maPos.y + BAR_SIZE_Y / 2.0f,
                                       aBarInfoList[i].maPos.z);
diff --git a/chart2/source/view/main/3DChartObjects.cxx b/chart2/source/view/main/3DChartObjects.cxx
index 13d1fb3..7bf6966 100755
--- a/chart2/source/view/main/3DChartObjects.cxx
+++ b/chart2/source/view/main/3DChartObjects.cxx
@@ -79,7 +79,7 @@ const TextCacheItem& TextCache::getText(OUString const & rText, bool bIs3dText)
     VirtualDevice aDevice(*Application::GetDefaultDevice(), 0, 0);
     vcl::Font aFont;
     if(bIs3dText)
-        aFont = vcl::Font("postoffice Bold",Size(0,0));
+        aFont = vcl::Font("Brillante St",Size(0,0));
     else
         aFont = aDevice.GetFont();
     aFont.SetSize(Size(0, 96));