Kaydet (Commit) f2e0eafa authored tarafından Michael Meeks's avatar Michael Meeks Kaydeden (comit) Markus Mohrhard

Stub mouse move events propagation to 3D charts.

Change-Id: If87545df4b1caeece107a20e0c00df88fb8e6fd5
üst 9ef8f82c
...@@ -289,6 +289,11 @@ void GL3DBarChart::clickedAt(const Point& rPos) ...@@ -289,6 +289,11 @@ void GL3DBarChart::clickedAt(const Point& rPos)
mpCamera->zoom(nId); mpCamera->zoom(nId);
} }
void GL3DBarChart::mouseDragMove(const Point& rPos, sal_uInt16 nButtons)
{
// fprintf(stderr, "drag move %ld %ld (0x%x)\n", rPos.X(), rPos.Y(), nButtons);
}
void GL3DBarChart::contextDestroyed() void GL3DBarChart::contextDestroyed()
{ {
mbValidContext = false; mbValidContext = false;
......
...@@ -50,6 +50,7 @@ public: ...@@ -50,6 +50,7 @@ public:
virtual void update() SAL_OVERRIDE; virtual void update() SAL_OVERRIDE;
virtual void clickedAt(const Point& rPos) SAL_OVERRIDE; virtual void clickedAt(const Point& rPos) SAL_OVERRIDE;
virtual void mouseDragMove(const Point& rPos, sal_uInt16 nButtons) SAL_OVERRIDE;
virtual void contextDestroyed() SAL_OVERRIDE; virtual void contextDestroyed() SAL_OVERRIDE;
private: private:
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#ifndef INCLUDED_VCL_OPENGLWIN_HXX #ifndef INCLUDED_VCL_OPENGLWIN_HXX
#define INCLUDED_VCL_OPENGLWIN_HXX #define INCLUDED_VCL_OPENGLWIN_HXX
#include <vcl/event.hxx>
#include <vcl/syschild.hxx> #include <vcl/syschild.hxx>
#include <vcl/vclopengl_dllapi.hxx> #include <vcl/vclopengl_dllapi.hxx>
...@@ -24,6 +25,7 @@ public: ...@@ -24,6 +25,7 @@ public:
virtual ~IRenderer() {} virtual ~IRenderer() {}
virtual void update() = 0; virtual void update() = 0;
virtual void clickedAt(const Point& rPos) = 0; virtual void clickedAt(const Point& rPos) = 0;
virtual void mouseDragMove(const Point& rPos, sal_uInt16 nButtons) = 0;
virtual void contextDestroyed() = 0; virtual void contextDestroyed() = 0;
}; };
...@@ -39,7 +41,10 @@ public: ...@@ -39,7 +41,10 @@ public:
void setRenderer(IRenderer* pRenderer); void setRenderer(IRenderer* pRenderer);
virtual void Paint(const Rectangle&) SAL_OVERRIDE; virtual void Paint(const Rectangle&) SAL_OVERRIDE;
virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
private: private:
boost::scoped_ptr<OpenGLWindowImpl> mpImpl; boost::scoped_ptr<OpenGLWindowImpl> mpImpl;
......
...@@ -65,6 +65,18 @@ void OpenGLWindow::MouseButtonDown( const MouseEvent& rMEvt ) ...@@ -65,6 +65,18 @@ void OpenGLWindow::MouseButtonDown( const MouseEvent& rMEvt )
mpRenderer->clickedAt(aPoint); mpRenderer->clickedAt(aPoint);
} }
void OpenGLWindow::MouseButtonUp( const MouseEvent& /* rMEvt */ )
{
// in case we need to track button state ourselves.
}
void OpenGLWindow::MouseMove( const MouseEvent& rMEvt )
{
if(rMEvt.GetButtons())
mpRenderer->mouseDragMove(rMEvt.GetPosPixel(),
rMEvt.GetButtons());
}
void OpenGLWindow::setRenderer(IRenderer* pRenderer) void OpenGLWindow::setRenderer(IRenderer* pRenderer)
{ {
mpRenderer = pRenderer; mpRenderer = pRenderer;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment