diff --git a/Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp b/Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp index d9c6cbaf49..a1ab5ee3a1 100644 --- a/Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp +++ b/Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp @@ -29,6 +29,10 @@ #include "DolphinQt/Resources.h" #include "DolphinQt/Settings.h" +// "Most mouse types work in steps of 15 degrees, in which case the delta value is a multiple of +// 120; i.e., 120 units * 1/8 = 15 degrees." (http://doc.qt.io/qt-5/qwheelevent.html#angleDelta) +constexpr double SCROLL_FRACTION_DEGREES = 15.; + constexpr size_t VALID_BRANCH_LENGTH = 10; CodeViewWidget::CodeViewWidget() @@ -484,11 +488,11 @@ void CodeViewWidget::keyPressEvent(QKeyEvent* event) switch (event->key()) { case Qt::Key_Up: - m_address -= 3 * sizeof(u32); + m_address -= sizeof(u32); Update(); return; case Qt::Key_Down: - m_address += 3 * sizeof(u32); + m_address += sizeof(u32); Update(); return; case Qt::Key_PageUp: @@ -507,9 +511,13 @@ void CodeViewWidget::keyPressEvent(QKeyEvent* event) void CodeViewWidget::wheelEvent(QWheelEvent* event) { - int delta = event->delta() > 0 ? -1 : 1; + auto delta = + -static_cast(std::round((event->angleDelta().y() / (SCROLL_FRACTION_DEGREES * 8)))); - m_address += delta * 3 * sizeof(u32); + if (delta == 0) + return; + + m_address += delta * sizeof(u32); Update(); } diff --git a/Source/Core/DolphinQt/Debugger/MemoryViewWidget.cpp b/Source/Core/DolphinQt/Debugger/MemoryViewWidget.cpp index df3a897167..bab9daa522 100644 --- a/Source/Core/DolphinQt/Debugger/MemoryViewWidget.cpp +++ b/Source/Core/DolphinQt/Debugger/MemoryViewWidget.cpp @@ -22,6 +22,10 @@ #include "DolphinQt/Resources.h" #include "DolphinQt/Settings.h" +// "Most mouse types work in steps of 15 degrees, in which case the delta value is a multiple of +// 120; i.e., 120 units * 1/8 = 15 degrees." (http://doc.qt.io/qt-5/qwheelevent.html#angleDelta) +constexpr double SCROLL_FRACTION_DEGREES = 15.; + MemoryViewWidget::MemoryViewWidget(QWidget* parent) : QTableWidget(parent) { horizontalHeader()->hide(); @@ -236,11 +240,11 @@ void MemoryViewWidget::keyPressEvent(QKeyEvent* event) switch (event->key()) { case Qt::Key_Up: - m_address -= 3 * 16; + m_address -= 16; Update(); return; case Qt::Key_Down: - m_address += 3 * 16; + m_address += 16; Update(); return; case Qt::Key_PageUp: @@ -297,9 +301,13 @@ void MemoryViewWidget::ToggleBreakpoint() void MemoryViewWidget::wheelEvent(QWheelEvent* event) { - int delta = event->delta() > 0 ? -1 : 1; + auto delta = + -static_cast(std::round((event->angleDelta().y() / (SCROLL_FRACTION_DEGREES * 8)))); - m_address += delta * 3 * 16; + if (delta == 0) + return; + + m_address += delta * 16; Update(); }