mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

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

pull/6779/merge
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main_gui.cpp
View File

@ -439,7 +439,7 @@ struct MainWindow : Window
virtual void OnMouseWheel(int wheel) virtual void OnMouseWheel(int wheel)
{ {
if (_settings_client.gui.scrollwheel_scrolling == 0) { if (_settings_client.gui.scrollwheel_scrolling != 2) {
ZoomInOrOutToCursorWindow(wheel < 0, this); ZoomInOrOutToCursorWindow(wheel < 0, this);
} }
} }

2
src/smallmap_gui.cpp
View File

@ -1559,7 +1559,7 @@ int SmallMapWindow::GetPositionOnLegend(Point pt)
/* virtual */ void SmallMapWindow::OnMouseWheel(int wheel) /* virtual */ void SmallMapWindow::OnMouseWheel(int wheel)
{ {
if (_settings_client.gui.scrollwheel_scrolling == 0) { if (_settings_client.gui.scrollwheel_scrolling != 2) {
const NWidgetBase *wid = this->GetWidget<NWidgetBase>(WID_SM_MAP); const NWidgetBase *wid = this->GetWidget<NWidgetBase>(WID_SM_MAP);
int cursor_x = _cursor.pos.x - this->left - wid->pos_x; int cursor_x = _cursor.pos.x - this->left - wid->pos_x;
int cursor_y = _cursor.pos.y - this->top - wid->pos_y; int cursor_y = _cursor.pos.y - this->top - wid->pos_y;

2
src/viewport_gui.cpp
View File

@ -138,7 +138,7 @@ public:
virtual void OnMouseWheel(int wheel) virtual void OnMouseWheel(int wheel)
{ {
if (_settings_client.gui.scrollwheel_scrolling == 0) { if (_settings_client.gui.scrollwheel_scrolling != 2) {
ZoomInOrOutToCursorWindow(wheel < 0, this); ZoomInOrOutToCursorWindow(wheel < 0, this);
} }
} }

4
src/window.cpp
View File

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