Kaydet (Commit) dc91ebed authored tarafından Markus Mohrhard's avatar Markus Mohrhard Kaydeden (comit) Markus Mohrhard

react only to left mouse click

Change-Id: Ia4c2c52b8803cd36d7ed32be559ba446589377e7
üst 8097fff2
...@@ -306,11 +306,14 @@ public: ...@@ -306,11 +306,14 @@ public:
} }
void GL3DBarChart::clickedAt(const Point& /*rPos*/) void GL3DBarChart::clickedAt(const Point& /*rPos*/, sal_uInt16 nButtons)
{ {
if(mbBlockUserInput) if(mbBlockUserInput)
return; return;
if(nButtons != MOUSE_LEFT)
return;
mbBlockUserInput = true; mbBlockUserInput = true;
sal_uInt32 nId = 5; sal_uInt32 nId = 5;
/* /*
......
...@@ -50,7 +50,7 @@ public: ...@@ -50,7 +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_uInt16 nButtons) SAL_OVERRIDE;
virtual void mouseDragMove(const Point& rStartPos, const Point& rEndPos, sal_uInt16 nButtons) SAL_OVERRIDE; virtual void mouseDragMove(const Point& rStartPos, const Point& rEndPos, sal_uInt16 nButtons) SAL_OVERRIDE;
virtual void scroll(long nDelta) SAL_OVERRIDE; virtual void scroll(long nDelta) SAL_OVERRIDE;
virtual void contextDestroyed() SAL_OVERRIDE; virtual void contextDestroyed() SAL_OVERRIDE;
......
...@@ -24,7 +24,7 @@ class VCLOPENGL_DLLPUBLIC IRenderer ...@@ -24,7 +24,7 @@ class VCLOPENGL_DLLPUBLIC IRenderer
public: 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, sal_uInt16 nButtons) = 0;
virtual void mouseDragMove(const Point& rPosBegin, const Point& rPosEnd, sal_uInt16 nButtons) = 0; virtual void mouseDragMove(const Point& rPosBegin, const Point& rPosEnd, sal_uInt16 nButtons) = 0;
virtual void scroll(long nDelta) = 0; virtual void scroll(long nDelta) = 0;
......
...@@ -68,7 +68,7 @@ void OpenGLWindow::MouseButtonUp( const MouseEvent& rMEvt ) ...@@ -68,7 +68,7 @@ void OpenGLWindow::MouseButtonUp( const MouseEvent& rMEvt )
Color aColor = GetPixel(aPoint); Color aColor = GetPixel(aPoint);
SAL_WARN("vcl.opengl", aColor.GetColor()); SAL_WARN("vcl.opengl", aColor.GetColor());
if(mpRenderer) if(mpRenderer)
mpRenderer->clickedAt(aPoint); mpRenderer->clickedAt(aPoint, rMEvt.GetButtons());
} }
else else
{ {
......
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