diff options
| author | peter1138 <peter1138@openttd.org> | 2007-05-28 16:46:16 +0000 |
|---|---|---|
| committer | peter1138 <peter1138@openttd.org> | 2007-05-28 16:46:16 +0000 |
| commit | 344e9007feac6dd1e90154b45e80907c5e49821a (patch) | |
| tree | 17d1923b83a591294a9f935eda1159e520609c81 /src/main_gui.cpp | |
| parent | 1a8a44165b7ccab605673c750596b80eb3d88799 (diff) | |
| download | openttd-344e9007feac6dd1e90154b45e80907c5e49821a.tar.xz | |
(svn r9962) -Feature: Add smooth viewport scrolling. This must be enabled with patch setting 'smooth_scroll'
Diffstat (limited to 'src/main_gui.cpp')
| -rw-r--r-- | src/main_gui.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/main_gui.cpp b/src/main_gui.cpp index d48cd82fb..84540598d 100644 --- a/src/main_gui.cpp +++ b/src/main_gui.cpp @@ -889,6 +889,8 @@ bool DoZoomInOutWindow(int how, Window *w) WP(w,vp_d).scrollpos_x += vp->virtual_width >> 1; WP(w,vp_d).scrollpos_y += vp->virtual_height >> 1; + WP(w,vp_d).dest_scrollpos_x = WP(w,vp_d).scrollpos_x; + WP(w,vp_d).dest_scrollpos_y = WP(w,vp_d).scrollpos_y; break; case ZOOM_OUT: if (vp->zoom == ZOOM_LVL_MAX) return false; @@ -896,6 +898,8 @@ bool DoZoomInOutWindow(int how, Window *w) WP(w,vp_d).scrollpos_x -= vp->virtual_width >> 1; WP(w,vp_d).scrollpos_y -= vp->virtual_height >> 1; + WP(w,vp_d).dest_scrollpos_x = WP(w,vp_d).scrollpos_x; + WP(w,vp_d).dest_scrollpos_y = WP(w,vp_d).scrollpos_y; vp->virtual_width <<= 1; vp->virtual_height <<= 1; @@ -1058,7 +1062,7 @@ void ZoomInOrOutToCursorWindow(bool in, Window *w) pt = GetTileZoomCenterWindow(in,w); if (pt.x != -1) { - ScrollWindowTo(pt.x, pt.y, w); + ScrollWindowTo(pt.x, pt.y, w, true); DoZoomInOutWindow(in ? ZOOM_IN : ZOOM_OUT, w); } @@ -2438,6 +2442,8 @@ static void MainWindowWndProc(Window *w, WindowEvent *e) WP(w, vp_d).scrollpos_x += ScaleByZoom(e->we.scroll.delta.x, vp->zoom); WP(w, vp_d).scrollpos_y += ScaleByZoom(e->we.scroll.delta.y, vp->zoom); + WP(w, vp_d).dest_scrollpos_x = WP(w, vp_d).scrollpos_x; + WP(w, vp_d).dest_scrollpos_y = WP(w, vp_d).scrollpos_y; } break; case WE_MOUSEWHEEL: |