From dd6542c143f10aa05385523a347e8115f7ed7c1d Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Wed, 14 Aug 2013 20:09:10 -0700 Subject: [PATCH] Use ForwardMouseWheelEvent rather than checking window bounds --- aegisub/src/video_slider.cpp | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/aegisub/src/video_slider.cpp b/aegisub/src/video_slider.cpp index f2e808fe6..8844fa8f2 100644 --- a/aegisub/src/video_slider.cpp +++ b/aegisub/src/video_slider.cpp @@ -145,23 +145,17 @@ void VideoSlider::OnMouse(wxMouseEvent &event) { c->videoController->JumpToFrame(val); } - else if (event.GetWheelRotation() != 0) { + else if (event.GetWheelRotation() != 0 && ForwardMouseWheelEvent(this, event)) { // If mouse is over the slider, use wheel to step by frames or keyframes (when Shift is held) - if (GetClientRect().Contains(event.GetX(), event.GetY())) { - if (event.ShiftDown()) - if (event.GetWheelRotation() < 0) - cmd::call("video/frame/next/keyframe", c); - else - cmd::call("video/frame/prev/keyframe", c); - else { - SetValue(val + (event.GetWheelRotation() > 0 ? -1 : 1)); - c->videoController->JumpToFrame(val); - } + if (event.ShiftDown()) + if (event.GetWheelRotation() < 0) + cmd::call("video/frame/next/keyframe", c); + else + cmd::call("video/frame/prev/keyframe", c); + else { + SetValue(val + (event.GetWheelRotation() > 0 ? -1 : 1)); + c->videoController->JumpToFrame(val); } - else - // Forward Wheel to subs grid to scroll by line/page - if (c->subsGrid->GetClientRect().Contains(event.GetX(), event.GetY())) - c->subsGrid->GetEventHandler()->ProcessEvent(event); } }