Revision: 76015
http://sourceforge.net/p/brlcad/code/76015
Author: starseeker
Date: 2020-06-04 12:11:43 +0000 (Thu, 04 Jun 2020)
Log Message:
-----------
Don't persist the zoom flag - reset the view to the full screen if it's not
passed in.
Modified Paths:
--------------
brlcad/branches/dm-fb-merge/src/libdm/fb_generic.c
Modified: brlcad/branches/dm-fb-merge/src/libdm/fb_generic.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/fb_generic.c 2020-06-03 21:52:09 UTC
(rev 76014)
+++ brlcad/branches/dm-fb-merge/src/libdm/fb_generic.c 2020-06-04 12:11:43 UTC
(rev 76015)
@@ -706,14 +706,14 @@
V_MIN(newzoom, scr_height/yout);
if (inverse) {
- fb_view(ifp,
- scr_xoff+xout/2, scr_height-1-(scr_yoff+yout/2),
- newzoom, newzoom);
+ fb_view(ifp, scr_xoff+xout/2, scr_height-1-(scr_yoff+yout/2),
newzoom, newzoom);
} else {
- fb_view(ifp,
- scr_xoff+xout/2, scr_yoff+yout/2,
- newzoom, newzoom);
+ fb_view(ifp, scr_xoff+xout/2, scr_yoff+yout/2, newzoom, newzoom);
}
+ } else {
+ /* We may need to reset the view if we have previously zoomed but now
+ * have a command that didn't pass the flag */
+ fb_view(ifp, scr_width/2, scr_height/2, 1, 1);
}
if (multiple_lines) {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits