From 5b992f138bd7bbf07693b012c567a593b87236d8 Mon Sep 17 00:00:00 2001 From: spycrab Date: Sun, 19 Aug 2018 13:29:52 +0200 Subject: Qt/Debugger: Improve scrolling Reduces the scrolling speed for both keyboard and mouse scrolling so users are able to navigate the code and memory view line by line --- Source/Core/DolphinQt/Debugger/MemoryViewWidget.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'Source/Core/DolphinQt/Debugger/MemoryViewWidget.cpp') 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)))); + + if (delta == 0) + return; - m_address += delta * 3 * 16; + m_address += delta * 16; Update(); } -- cgit v1.2.3