diff options
| author | julianeisel <julian_eisel@web.de> | 2015-02-09 00:33:58 +0300 |
|---|---|---|
| committer | julianeisel <julian_eisel@web.de> | 2015-02-09 00:35:33 +0300 |
| commit | 6b107daf23c5b8b6b7b9aebfa7384e103928a8d3 (patch) | |
| tree | 9441e6e01931c0e2cb052443ecd2df2d2e409b1b /source/blender/editors/interface/view2d.c | |
| parent | a19229b80c18d74e24f418efdf526673b7cadb82 (diff) | |
Fix T43554: Zoom to mousepos makes 2D Views pan after zoom limits are
reached
There are a couple of things that I don't like here, but it seems like
the best way to handle this for now.
Diffstat (limited to 'source/blender/editors/interface/view2d.c')
| -rw-r--r-- | source/blender/editors/interface/view2d.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c index 12ee3199f43..b4a120b2dea 100644 --- a/source/blender/editors/interface/view2d.c +++ b/source/blender/editors/interface/view2d.c @@ -371,7 +371,8 @@ static void ui_view2d_curRect_validate_resize(View2D *v2d, int resize, int mask_ float winx, winy; rctf *cur, *tot; - /* use mask as size of region that View2D resides in, as it takes into account scrollbars already */ + /* use mask as size of region that View2D resides in, as it takes into account + * scrollbars already - keep in sync with zoomx/zoomy in view_zoomstep_apply_ex! */ winx = (float)(BLI_rcti_size_x(&v2d->mask) + 1); winy = (float)(BLI_rcti_size_y(&v2d->mask) + 1); @@ -393,6 +394,7 @@ static void ui_view2d_curRect_validate_resize(View2D *v2d, int resize, int mask_ */ totwidth = BLI_rctf_size_x(tot); totheight = BLI_rctf_size_y(tot); + /* keep in sync with zoomx/zoomy in view_zoomstep_apply_ex! */ curwidth = width = BLI_rctf_size_x(cur); curheight = height = BLI_rctf_size_y(cur); |