(svn r21977) -Codechange: Always cal Window::OnMouseWheel(), independent of viewport scroll/zoom settings.

2011-02-05 16:36:37 +00:00
parent b992a93996
commit 9e1695aa1e
4 changed files with 16 additions and 12 deletions
--- a/src/main_gui.cpp
+++ b/src/main_gui.cpp
@@ -421,7 +421,9 @@ struct MainWindow : Window

 	virtual void OnMouseWheel(int wheel)
 	{
-		ZoomInOrOutToCursorWindow(wheel < 0, this);
+		if (_settings_client.gui.scrollwheel_scrolling == 0) {
+			ZoomInOrOutToCursorWindow(wheel < 0, this);
+		}
 	}

 	virtual void OnResize()