[Libreoffice-commits] core.git: 2 commits - chart2/source sc/source
weigao
weigao at multicorewareinc.com
Mon May 12 13:47:20 PDT 2014
chart2/source/view/main/GL3DRenderer.cxx | 3 +--
sc/source/ui/view/gridwin.cxx | 3 +++
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 21162eab55e3ae6e21c5cef6f7fd1f35d71aac3e
Author: weigao <weigao at multicorewareinc.com>
Date: Mon May 12 22:41:03 2014 +0200
some fixes for positioning problems
Change-Id: I4e970837ebe6867458e4a75c7cc323f8f6b3ecc8
diff --git a/chart2/source/view/main/GL3DRenderer.cxx b/chart2/source/view/main/GL3DRenderer.cxx
index 69e961b..686413d 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -1287,7 +1287,7 @@ void OpenGL3DRenderer::RenderTextShape()
PosVecf3 angle = {0.0f, 0.0f, 0.0f};
PosVecf3 scale = {1.0, 1.0, 1.0f};
MoveModelf(trans, angle, scale);
- m_MVP = m_Projection * m_View * m_Model;
+ m_MVP = m_3DProjection * m_3DView * m_Model;
glBindBuffer(GL_ARRAY_BUFFER, m_VertexBuffer);
CHECK_GL_ERROR();
glBufferData(GL_ARRAY_BUFFER, sizeof(textInfo.vertex), textInfo.vertex, GL_STATIC_DRAW);
@@ -1401,7 +1401,6 @@ void OpenGL3DRenderer::ProcessUnrenderedShape()
CreateSceneBoxView();
glViewport(0, 0, m_iWidth, m_iHeight);
glClearDepth(1.0f);
- glViewport(0, 0, m_iWidth, m_iHeight);
glClearColor(1.0, 1.0, 1.0, 1.0);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
//Polygon
commit 3dbd2968025ab51fb961d64093a14f910828f57f
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date: Mon May 12 22:39:50 2014 +0200
only send mouse events if the window is visible
Change-Id: I2564159cd21e068c0893fc96d1c7e90746788f39
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 95ce9fd..d1194bf 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -1642,6 +1642,9 @@ void ScGridWindow::MouseButtonDown( const MouseEvent& rMEvt )
for(boost::ptr_vector<Window>::iterator itr = maChildWindows.begin(),
itrEnd = maChildWindows.end(); itr != itrEnd; ++itr)
{
+ if(!itr->IsVisible())
+ continue;
+
Point aPoint = itr->GetPosPixel();
Size aSize = itr->GetSizePixel();
More information about the Libreoffice-commits
mailing list