some work on mouse scrolling and improved mouse dragging

Change-Id: I3265e26530183b2fc4fd7f67319f3dc124353c2e

1 files changed, 29 insertions, 11 deletions

diff --git a/vcl/source/window/openglwin.cxx b/vcl/source/window/openglwin.cxx
index 9fd3935df210..455e455feaf9 100644
--- a/vcl/source/window/openglwin.cxx
+++ b/vcl/source/window/openglwin.cxx
@@ -57,24 +57,42 @@ void OpenGLWindow::Paint(const Rectangle&)
 
 void OpenGLWindow::MouseButtonDown( const MouseEvent& rMEvt )
 {
-    Point aPoint = rMEvt.GetPosPixel();
+    maStartPoint = rMEvt.GetPosPixel();
+}
 
-    Color aColor = GetPixel(aPoint);
-    SAL_WARN("vcl.opengl", aColor.GetColor());
-    if(mpRenderer)
-        mpRenderer->clickedAt(aPoint);
+void OpenGLWindow::MouseButtonUp( const MouseEvent& rMEvt )
+{
+    Point aPoint = rMEvt.GetPosPixel();
+    if(aPoint == maStartPoint)
+    {
+        Color aColor = GetPixel(aPoint);
+        SAL_WARN("vcl.opengl", aColor.GetColor());
+        if(mpRenderer)
+            mpRenderer->clickedAt(aPoint);
+    }
+    else
+    {
+        mpRenderer->mouseDragMove(maStartPoint, aPoint,
+                                  rMEvt.GetButtons());
+    }
 }
 
-void OpenGLWindow::MouseButtonUp( const MouseEvent& /* rMEvt */ )
+void OpenGLWindow::Command( const CommandEvent& rCEvt )
 {
-    // in case we need to track button state ourselves.
+    if(rCEvt.GetCommand() == COMMAND_WHEEL)
+    {
+        const CommandWheelData* pData = rCEvt.GetWheelData();
+        if(pData->GetMode() == COMMAND_WHEEL_SCROLL)
+        {
+            long nDelta = pData->GetDelta();
+            if(mpRenderer)
+                mpRenderer->scroll(nDelta);
+        }
+    }
 }
 
-void OpenGLWindow::MouseMove( const MouseEvent& rMEvt )
+void OpenGLWindow::MouseMove( const MouseEvent& /*rMEvt*/ )
 {
-    if(rMEvt.GetButtons())
-        mpRenderer->mouseDragMove(rMEvt.GetPosPixel(),
-                                  rMEvt.GetButtons());
 }
 
 void OpenGLWindow::setRenderer(IRenderer* pRenderer)