# HG changeset patch # User frosch # Date 2011-02-05 21:07:25 # Node ID 104199db2aaba7f4da635b227f969d47015e9882 # Parent 0fc8ed4aa20101469b51d46e25dfb50b6b79a17b (svn r21988) -Change: Disable smooth scrolling for GHK_CENTER_ZOOM when zooming is also involved. diff --git a/src/main_gui.cpp b/src/main_gui.cpp --- a/src/main_gui.cpp +++ b/src/main_gui.cpp @@ -314,8 +314,9 @@ struct MainWindow : Window case GHK_CENTER_ZOOM: { Point pt = GetTileBelowCursor(); if (pt.x != -1) { + bool instant = (num == GHK_CENTER_ZOOM && this->viewport->zoom != ZOOM_LVL_MIN); if (num == GHK_CENTER_ZOOM) MaxZoomInOut(ZOOM_IN, this); - ScrollMainWindowTo(pt.x, pt.y); + ScrollMainWindowTo(pt.x, pt.y, -1, instant); } break; }