Fixing zoom when panning is off
This commit is contained in:
parent
bb5081189e
commit
03ffce8a89
1 changed files with 2 additions and 1 deletions
|
@ -407,9 +407,10 @@ void VideoDisplay::OnMouseLeave(wxMouseEvent& event) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void VideoDisplay::OnMouseWheel(wxMouseEvent& event) {
|
void VideoDisplay::OnMouseWheel(wxMouseEvent& event) {
|
||||||
|
bool videoPan = OPT_GET("Video/Video Pan")->GetBool();
|
||||||
if (int wheel = event.GetWheelRotation()) {
|
if (int wheel = event.GetWheelRotation()) {
|
||||||
if (ForwardMouseWheelEvent(this, event))
|
if (ForwardMouseWheelEvent(this, event))
|
||||||
if (event.ControlDown())
|
if (event.ControlDown() || !videoPan)
|
||||||
SetWindowZoom(windowZoomValue + .125 * (wheel / event.GetWheelDelta()));
|
SetWindowZoom(windowZoomValue + .125 * (wheel / event.GetWheelDelta()));
|
||||||
else
|
else
|
||||||
SetVideoZoom(wheel / event.GetWheelDelta());
|
SetVideoZoom(wheel / event.GetWheelDelta());
|
||||||
|
|
Loading…
Reference in a new issue