|
|
@ -1813,8 +1813,8 @@ void UpdateViewportPosition(Window *w)
|
|
|
|
if (_settings_client.gui.smooth_scroll) {
|
|
|
|
if (_settings_client.gui.smooth_scroll) {
|
|
|
|
int max_scroll = ScaleByMapSize1D(512 * ZOOM_LVL_BASE);
|
|
|
|
int max_scroll = ScaleByMapSize1D(512 * ZOOM_LVL_BASE);
|
|
|
|
/* Not at our desired position yet... */
|
|
|
|
/* Not at our desired position yet... */
|
|
|
|
w->viewport->scrollpos_x += Clamp(delta_x / 4, -max_scroll, max_scroll);
|
|
|
|
w->viewport->scrollpos_x += Clamp(DivAwayFromZero(delta_x, 4), -max_scroll, max_scroll);
|
|
|
|
w->viewport->scrollpos_y += Clamp(delta_y / 4, -max_scroll, max_scroll);
|
|
|
|
w->viewport->scrollpos_y += Clamp(DivAwayFromZero(delta_y, 4), -max_scroll, max_scroll);
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
w->viewport->scrollpos_x = w->viewport->dest_scrollpos_x;
|
|
|
|
w->viewport->scrollpos_x = w->viewport->dest_scrollpos_x;
|
|
|
|
w->viewport->scrollpos_y = w->viewport->dest_scrollpos_y;
|
|
|
|
w->viewport->scrollpos_y = w->viewport->dest_scrollpos_y;
|
|
|
|