From b610139f8958de5f50a1e5c9e2c1925525b91333 Mon Sep 17 00:00:00 2001 From: Dustin Carlino Date: Mon, 15 Apr 2019 11:41:52 -0700 Subject: [PATCH] woops, screencap everything cut off the bottom and right --- data/screenshots/montlake/MANIFEST | 126 ++++++++++------------------- ezgui/src/widgets/screenshot.rs | 4 +- 2 files changed, 44 insertions(+), 86 deletions(-) diff --git a/data/screenshots/montlake/MANIFEST b/data/screenshots/montlake/MANIFEST index 160c54f404..b362ec50d5 100644 --- a/data/screenshots/montlake/MANIFEST +++ b/data/screenshots/montlake/MANIFEST @@ -1,84 +1,42 @@ -39bfbe46746abc0bc30c21b202696333 ../data/screenshots/pending_montlake/01x01_i354.png -41eac209f05476d33d470c8e7499f46a ../data/screenshots/pending_montlake/02x01.png -41eac209f05476d33d470c8e7499f46a ../data/screenshots/pending_montlake/03x01.png -41eac209f05476d33d470c8e7499f46a ../data/screenshots/pending_montlake/04x01.png -41eac209f05476d33d470c8e7499f46a ../data/screenshots/pending_montlake/05x01.png -41eac209f05476d33d470c8e7499f46a ../data/screenshots/pending_montlake/06x01.png -e7d49bb92ee49b282c2493cb8334d369 ../data/screenshots/pending_montlake/01x02_i87.png -e13044def3c926e6cccf15241a61208d ../data/screenshots/pending_montlake/02x02_i66.png -00a89fb89123c643e336bcf51caf4d4b ../data/screenshots/pending_montlake/03x02.png -e72126eed740bfc7950dfd893402daec ../data/screenshots/pending_montlake/04x02_i152.png -0d2da49361e4821f9893df239094efcd ../data/screenshots/pending_montlake/05x02_i152.png -7873abd1d96ddd37960035f1c138537f ../data/screenshots/pending_montlake/06x02.png -fceb923d184cae0be965c7c1c3cdfa1c ../data/screenshots/pending_montlake/01x03_i87.png -e8b627b6100fd1ff644cc872b84920e7 ../data/screenshots/pending_montlake/02x03_i66.png -f9b0ea30274b308247644c20139241ed ../data/screenshots/pending_montlake/03x03.png -f26acb081651aca3d253363811890cd0 ../data/screenshots/pending_montlake/04x03_i2.png -33b763802b09be36012f6af6f8e9e155 ../data/screenshots/pending_montlake/05x03_i2.png -faf783650b51dfb710f116a48761471c ../data/screenshots/pending_montlake/06x03_i196.png -282d19681973060560fcf4463847eaab ../data/screenshots/pending_montlake/01x04_i113.png -58e1ee976243101c02040a83543b1bc5 ../data/screenshots/pending_montlake/02x04_i45.png -2eae9e3275fc6d5bee0626bb1014ded0 ../data/screenshots/pending_montlake/03x04.png -48fef345919aaffef1fec6ab1333495f ../data/screenshots/pending_montlake/04x04_i146.png -2ff220ce581e6dc3fd162c18125928dc ../data/screenshots/pending_montlake/05x04_i46.png -fa4e7b047322255331f342565c8bbc16 ../data/screenshots/pending_montlake/06x04_i49.png -4b615aadd6cf386a7df4ee38f5990156 ../data/screenshots/pending_montlake/01x05_i113.png -8a5615891dc3cdd6f55e35365b947c15 ../data/screenshots/pending_montlake/02x05_i81.png -73010946d5111d490d89808079c40536 ../data/screenshots/pending_montlake/03x05_i38.png -09d72536f6d1f5bb1649a63d5d82e007 ../data/screenshots/pending_montlake/04x05_i10.png -44e85c107f0789ed69f4c66c7b7f1214 ../data/screenshots/pending_montlake/05x05_i180.png -b5b47826d4053c1335e8047b00b8016e ../data/screenshots/pending_montlake/06x05_i21.png -e4d9261b354424e31c8a50dde1aad628 ../data/screenshots/pending_montlake/01x06_i22.png -bb72e434769ea1cf9d98190d16033d42 ../data/screenshots/pending_montlake/02x06_i8.png -38b824ad015c5e9c3bcc9f9ebe472f76 ../data/screenshots/pending_montlake/03x06_i0.png -f9546bcd9648fdc20818b627e62961ba ../data/screenshots/pending_montlake/04x06_i59.png -f994474b45178422f8a4610fc9685157 ../data/screenshots/pending_montlake/05x06_i32.png -36f345704353adc0ac1664ea374765cc ../data/screenshots/pending_montlake/06x06_i20.png -f7a72d54a11181eaf50812425ec39895 ../data/screenshots/pending_montlake/01x07_i56.png -dc6f7b6cf159737cab83d963c94378ec ../data/screenshots/pending_montlake/02x07_i57.png -425f49686a1a2795a19412b677934026 ../data/screenshots/pending_montlake/03x07_i54.png -8db8d59463cb097c2be9cbe7892915dc ../data/screenshots/pending_montlake/04x07_i58.png -db8576da71a44ccfed3b4d1c23231fde ../data/screenshots/pending_montlake/05x07_i110.png -0ee35d779d28527116ef0dec0fe9f285 ../data/screenshots/pending_montlake/06x07.png -962b5ba798eb922b51bef385734c7c69 ../data/screenshots/pending_montlake/01x08_i18.png -216a2d66007b18bece931ad364f16de8 ../data/screenshots/pending_montlake/02x08_i19.png -fe0f9b9edd36f749ac3de34f56bbccb8 ../data/screenshots/pending_montlake/03x08_i16.png -65fa3cc30a2687b290d3d634c2979055 ../data/screenshots/pending_montlake/04x08_i24.png -1565715bdd7c403bd063e42767690c09 ../data/screenshots/pending_montlake/05x08_i34.png -211826de9788c7479cb70a0b99f00cdd ../data/screenshots/pending_montlake/06x08_i1.png -5eb84b552514d025de8ff9fdc5c44728 ../data/screenshots/pending_montlake/01x09_i124.png -52050ffe61f06997f03b03cc5b79ff4f ../data/screenshots/pending_montlake/02x09_i293.png -e9d747c12abe81537bb7947e97631d21 ../data/screenshots/pending_montlake/03x09_i40.png -e46720223a8779ac5c4222797bd4cbfa ../data/screenshots/pending_montlake/04x09_i30.png -1f01e3d9602efb72e40846d2f2d8ca22 ../data/screenshots/pending_montlake/05x09_i25.png -e6437943d3c97bde3fe271f30e4b5c49 ../data/screenshots/pending_montlake/06x09_i62.png -800f48781332bc6bc3fc83adae9d1179 ../data/screenshots/pending_montlake/01x10_i252.png -72e339c073028c54d09d850b30f0bd33 ../data/screenshots/pending_montlake/02x10_i333.png -ee4cc31038be9f9e21d03677bb10a2c3 ../data/screenshots/pending_montlake/03x10_i74.png -2c415ad00b83df5ba04c398d64a60391 ../data/screenshots/pending_montlake/04x10_i79.png -eab73691749a022cec1cfc44f5d96e47 ../data/screenshots/pending_montlake/05x10_i298.png -4156b8e2aae617223d89f62393bef8f1 ../data/screenshots/pending_montlake/06x10_i176.png -3cf3173b4d2151bdaf5cc0ba1063263f ../data/screenshots/pending_montlake/01x11.png -41eac209f05476d33d470c8e7499f46a ../data/screenshots/pending_montlake/02x11.png -a5a430e39415689c3fea371b894bc660 ../data/screenshots/pending_montlake/03x11.png -399ea3f1ff5f1c07991703c6014d4b35 ../data/screenshots/pending_montlake/04x11.png -3c05c4f4f778350c44594b90cf1d70ba ../data/screenshots/pending_montlake/05x11_i28.png -41eac209f05476d33d470c8e7499f46a ../data/screenshots/pending_montlake/06x11.png -1fbe2e6a010bc5ffe7c90ebb8a4ad214 ../data/screenshots/pending_montlake/01x12_i254.png -41eac209f05476d33d470c8e7499f46a ../data/screenshots/pending_montlake/02x12.png -62df412a976d7c4a7048e06cb383cf77 ../data/screenshots/pending_montlake/03x12.png -e1bd12c60479c72d0faf5398ce026a41 ../data/screenshots/pending_montlake/04x12.png -aa8c81eaebde0ef7fcc404fc243d3e7e ../data/screenshots/pending_montlake/05x12.png -41eac209f05476d33d470c8e7499f46a ../data/screenshots/pending_montlake/06x12.png -41eac209f05476d33d470c8e7499f46a ../data/screenshots/pending_montlake/01x13.png -41eac209f05476d33d470c8e7499f46a ../data/screenshots/pending_montlake/02x13.png -028e04406a2f0b5b6ab3147ebabaacea ../data/screenshots/pending_montlake/03x13.png -3248f6be8f7b5c4ec1eea1a4c85a1376 ../data/screenshots/pending_montlake/04x13.png -255b254108982aa5b4850f93532e9be5 ../data/screenshots/pending_montlake/05x13.png -41eac209f05476d33d470c8e7499f46a ../data/screenshots/pending_montlake/06x13.png -41eac209f05476d33d470c8e7499f46a ../data/screenshots/pending_montlake/01x14.png -41eac209f05476d33d470c8e7499f46a ../data/screenshots/pending_montlake/02x14.png -590c382787e57026fa635aedb2916c3d ../data/screenshots/pending_montlake/03x14_i357.png -104cd81f5e6a6a7101c26d1e5e5dd9de ../data/screenshots/pending_montlake/04x14.png -9ddba4b3d86dccf908a74bba43ad5b00 ../data/screenshots/pending_montlake/05x14.png -41eac209f05476d33d470c8e7499f46a ../data/screenshots/pending_montlake/06x14.png +55939334b5e4a489585f8bc11ca4ff3c ../data/screenshots/pending_montlake/01x01_i85.png +80e5ccac8b7a30e7c8e0251d117e98ae ../data/screenshots/pending_montlake/02x01_i64.png +5a38a69e4d66ec283d414a4135ae10d1 ../data/screenshots/pending_montlake/03x01_i6.png +1df8a51c8b3a4cb04c8e88933c2a5079 ../data/screenshots/pending_montlake/04x01_i4.png +5c87d111e9afdec0d19ffd452b4fbd34 ../data/screenshots/pending_montlake/05x01_i208.png +6575e92717461fa83a30d81e87914ae2 ../data/screenshots/pending_montlake/06x01_i193.png +d58264d385167f90e0efd64a9291782c ../data/screenshots/pending_montlake/01x02_i15.png +a81c85514ebc7286b14ead4a5ef1db21 ../data/screenshots/pending_montlake/02x02_i49.png +1eecbb179dc9f79ffaf8ec8caed6ca35 ../data/screenshots/pending_montlake/03x02_i233.png +1afe3e6adbee91d30f9d8a21ec70c672 ../data/screenshots/pending_montlake/04x02_i44.png +5ca58799ffc0629e4342b7b7082b8266 ../data/screenshots/pending_montlake/05x02_i13.png +67b4c6ef9c25a668c457367f013aa19f ../data/screenshots/pending_montlake/06x02_i48.png +daca5af9c41a3671ba63c3d6188833e5 ../data/screenshots/pending_montlake/01x03_i111.png +73521ae565b4437bd279b404fcbcce59 ../data/screenshots/pending_montlake/02x03_i80.png +85f73456bb625660ae9be1280e991e6e ../data/screenshots/pending_montlake/03x03_i10.png +ac7baf5f8d8ba43beac331dabce43b05 ../data/screenshots/pending_montlake/04x03_i11.png +117af436ed89edef6f115b648cc569a9 ../data/screenshots/pending_montlake/05x03_i218.png +1c9152025ddaa082e8ed570aa002b163 ../data/screenshots/pending_montlake/06x03_i21.png +d814831a4f725877f71869d9be0e3723 ../data/screenshots/pending_montlake/01x04_i22.png +93e8d9cb1d10a223fe82036177e4d98a ../data/screenshots/pending_montlake/02x04_i8.png +42584d685bb8de3dc6eb88f0d3d04818 ../data/screenshots/pending_montlake/03x04_i0.png +92810426ed765ff73c3419631bf6812c ../data/screenshots/pending_montlake/04x04_i99.png +b046560fb7033d8918b75fa11ad86391 ../data/screenshots/pending_montlake/05x04_i35.png +926f8d686c110aaec2798a3daf2045eb ../data/screenshots/pending_montlake/06x04_i20.png +853ac5ee9033fd5385a0fa6d41a4be3d ../data/screenshots/pending_montlake/01x05_i54.png +395e8b3860a545086a334c39b3e0fe4e ../data/screenshots/pending_montlake/02x05_i8.png +5026ceb7c440d698197da4c530651e4b ../data/screenshots/pending_montlake/03x05_i115.png +c35ce1868ac710113898f908096dc44c ../data/screenshots/pending_montlake/04x05_i56.png +8316e9c272b31650e127c413bf1d6b30 ../data/screenshots/pending_montlake/05x05_i30.png +ccae56fb001cbb74a155f27c965f3fae ../data/screenshots/pending_montlake/06x05.png +81e66a7b84b3229fcf9b2d53f99313ee ../data/screenshots/pending_montlake/01x06_i18.png +f43b63d7a2c101e5fcc1192fdb61128a ../data/screenshots/pending_montlake/02x06_i82.png +15af61b562938d95345e024c1d84b564 ../data/screenshots/pending_montlake/03x06_i16.png +6d662acde92ceb2ad731b464e999462a ../data/screenshots/pending_montlake/04x06_i33.png +8c5da650e87c1c5223b67242851d08ed ../data/screenshots/pending_montlake/05x06_i1.png +5773308a76bf8d165eec07ccbc30a41e ../data/screenshots/pending_montlake/06x06_i146.png +07135c04d4544eaea0f2dc352e61ac2a ../data/screenshots/pending_montlake/01x07_i121.png +5b07c82e88cc2fd4b9f183fe574bae22 ../data/screenshots/pending_montlake/02x07_i288.png +92ddfad5678f5e1f2dafd01e57edaa36 ../data/screenshots/pending_montlake/03x07_i28.png +8059c22d8a1d8a4b153b28a876d06098 ../data/screenshots/pending_montlake/04x07_i24.png +ff8ccb13c7533ff783ca5586d293040a ../data/screenshots/pending_montlake/05x07_i25.png +bf5befd60f7509faabea570ac76a8d01 ../data/screenshots/pending_montlake/06x07_i109.png diff --git a/ezgui/src/widgets/screenshot.rs b/ezgui/src/widgets/screenshot.rs index 027ca6b8b5..3ee1380f9d 100644 --- a/ezgui/src/widgets/screenshot.rs +++ b/ezgui/src/widgets/screenshot.rs @@ -15,8 +15,8 @@ pub(crate) fn screenshot_everything>( max_y: f64, ) -> State { let mut timer = Timer::new("capturing screen"); - let num_tiles_x = (max_x * zoom / state.canvas.window_width).floor() as usize; - let num_tiles_y = (max_y * zoom / state.canvas.window_height).floor() as usize; + let num_tiles_x = (max_x * zoom / state.canvas.window_width).ceil() as usize; + let num_tiles_y = (max_y * zoom / state.canvas.window_height).ceil() as usize; let orig_zoom = state.canvas.cam_zoom; let orig_x = state.canvas.cam_x; let orig_y = state.canvas.cam_y;