Changeset 25304 in vbox

Timestamp:

Dec 10, 2009 3:21:10 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: Allow wheel event deltas which have smaller distances than 120.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxConsoleView.cpp (modified) (4 diffs)
• VBoxConsoleView.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleView.cpp

@@ -701 +701 @@
     , mMouseAbsolute (false)
     , mMouseIntegration (true)
+    , m_iLastMouseWheelDelta(0)
     , mDisableAutoCapture (false)
     , mIsHostkeyPressed (false)
@@ -1767 +1768 @@
             {
                 QMouseEvent *me = (QMouseEvent *) e;
+                m_iLastMouseWheelDelta = 0;
                 if (mouseEvent (me->type(), me->pos(), me->globalPos(),
                                 me->buttons(), me->modifiers(),
@@ -1776 +1778 @@
             {
                 QWheelEvent *we = (QWheelEvent *) e;
+                /* There are pointing devices which send smaller values for the
+                 * delta than 120. Here we sum them up until we are greater
+                 * than 120. This allows to have finer control over the speed
+                 * acceleration & enables such devices to send a valid wheel
+                 * event to our guest mouse device at all. */
+                int iDelta = 0;
+                m_iLastMouseWheelDelta += we->delta();
+                if (qAbs(m_iLastMouseWheelDelta) >= 120)
+                {
+                    iDelta = m_iLastMouseWheelDelta;
+                    m_iLastMouseWheelDelta = m_iLastMouseWheelDelta % 120;
+                }
                 if (mouseEvent (we->type(), we->pos(), we->globalPos(),
 #ifdef QT_MAC_USE_COCOA
@@ -1788 +1802 @@
 #endif /* QT_MAC_USE_COCOA */
                                 we->modifiers(),
-                                we->delta(), we->orientation()))
+                                iDelta, we->orientation()))
                     return true; /* stop further event handling */
                 break;

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleView.h

@@ -278 +278 @@
     QPoint mLastPos;
     QPoint mCapturedPos;
+    int m_iLastMouseWheelDelta;
 
     bool mDisableAutoCapture : 1;