summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/Debugger/MemoryView.cpp
diff options
context:
space:
mode:
authorDolphin Bot <dolphin-emu-bot@users.noreply.github.com>2014-07-19 19:31:41 +0200
committerDolphin Bot <dolphin-emu-bot@users.noreply.github.com>2014-07-19 19:31:41 +0200
commit5df45dfbba9252877ed1b47b4a3e29c56dc22a4b (patch)
tree075a428bb238d10dd241701d8ce612b2980b6fa9 /Source/Core/DolphinWX/Debugger/MemoryView.cpp
parent56e9efc6119a46d45d745a4d9090166ee7bdf49f (diff)
parenta00c7bdb9e6d65e1721f8b6b3376ceb0f65cda14 (diff)
Merge pull request #650 from lioncash/scrolling
DolphinWX: Implement scrolling in the memory views
Diffstat (limited to 'Source/Core/DolphinWX/Debugger/MemoryView.cpp')
-rw-r--r--Source/Core/DolphinWX/Debugger/MemoryView.cpp19
1 files changed, 19 insertions, 0 deletions
diff --git a/Source/Core/DolphinWX/Debugger/MemoryView.cpp b/Source/Core/DolphinWX/Debugger/MemoryView.cpp
index 4c22e3410c..0b4364a75e 100644
--- a/Source/Core/DolphinWX/Debugger/MemoryView.cpp
+++ b/Source/Core/DolphinWX/Debugger/MemoryView.cpp
@@ -50,6 +50,7 @@ BEGIN_EVENT_TABLE(CMemoryView, wxControl)
EVT_LEFT_UP(CMemoryView::OnMouseUpL)
EVT_MOTION(CMemoryView::OnMouseMove)
EVT_RIGHT_DOWN(CMemoryView::OnMouseDownR)
+ EVT_MOUSEWHEEL(CMemoryView::OnScrollWheel)
EVT_MENU(-1, CMemoryView::OnPopupMenu)
EVT_SIZE(CMemoryView::OnResize)
END_EVENT_TABLE()
@@ -137,6 +138,24 @@ void CMemoryView::OnMouseUpL(wxMouseEvent& event)
event.Skip();
}
+void CMemoryView::OnScrollWheel(wxMouseEvent& event)
+{
+ const bool scroll_down = (event.GetWheelRotation() < 0);
+ const int num_lines = event.GetLinesPerAction();
+
+ if (scroll_down)
+ {
+ curAddress += num_lines;
+ }
+ else
+ {
+ curAddress -= num_lines;
+ }
+
+ Refresh();
+ event.Skip();
+}
+
void CMemoryView::OnPopupMenu(wxCommandEvent& event)
{
#if wxUSE_CLIPBOARD