Change: [OSX] Setting mouse-wheel to scroll the map does not disable pinch to zoom

This commit is contained in:
Alexander Weiss
2018-04-28 00:12:49 +02:00
committed by Michael Lutz
parent 6df7ced343
commit e1a164b531
4 changed files with 5 additions and 5 deletions

View File

@@ -2858,8 +2858,8 @@ static void MouseLoop(MouseClick click, int mousewheel)
if (vp != NULL && (_game_mode == GM_MENU || HasModalProgress())) return;
if (mousewheel != 0) {
/* Send mousewheel event to window */
w->OnMouseWheel(mousewheel);
/* Send mousewheel event to window, unless we're scrolling a viewport or the map */
if (!scrollwheel_scrolling || (vp == NULL && w->window_class != WC_SMALLMAP)) w->OnMouseWheel(mousewheel);
/* Dispatch a MouseWheelEvent for widgets if it is not a viewport */
if (vp == NULL) DispatchMouseWheelEvent(w, w->nested_root->GetWidgetFromPos(x - w->left, y - w->top), mousewheel);