mirror of https://github.com/OpenTTD/OpenTTD
Change: [OSX] Setting mouse-wheel to scroll the map does not disable pinch to zoom
parent
6df7ced343
commit
e1a164b531
|
@ -439,7 +439,7 @@ struct MainWindow : Window
|
|||
|
||||
virtual void OnMouseWheel(int wheel)
|
||||
{
|
||||
if (_settings_client.gui.scrollwheel_scrolling == 0) {
|
||||
if (_settings_client.gui.scrollwheel_scrolling != 2) {
|
||||
ZoomInOrOutToCursorWindow(wheel < 0, this);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1559,7 +1559,7 @@ int SmallMapWindow::GetPositionOnLegend(Point pt)
|
|||
|
||||
/* 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);
|
||||
int cursor_x = _cursor.pos.x - this->left - wid->pos_x;
|
||||
int cursor_y = _cursor.pos.y - this->top - wid->pos_y;
|
||||
|
|
|
@ -138,7 +138,7 @@ public:
|
|||
|
||||
virtual void OnMouseWheel(int wheel)
|
||||
{
|
||||
if (_settings_client.gui.scrollwheel_scrolling == 0) {
|
||||
if (_settings_client.gui.scrollwheel_scrolling != 2) {
|
||||
ZoomInOrOutToCursorWindow(wheel < 0, this);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue