liangsheng8708
/
ruffle
mirror of https://mirror.ghproxy.com/https://github.com/ruffle-rs/ruffle.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

desktop: Fix window size calculation 

Change width/height CLI paramters to `f64`, and also clamp window
size to minimum of 1x1 to prevent panics from invalid window
dimensions.
This commit is contained in:
Mike Welsh 2021-05-06 17:23:20 -07:00
parent ef617eebad
commit e35933aeee
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
desktop/src/main.rs
View File

@ -74,11 +74,11 @@ struct Opt {
/// Width of window in pixels
#[clap(long, display_order = 1)]
width: Option<u32>,
width: Option<f64>,
/// Height of window in pixels
#[clap(long, display_order = 2)]
height: Option<u32>,
height: Option<f64>,
/// Location to store a wgpu trace output
#[clap(long, parse(from_os_str))]
@ -227,12 +227,14 @@ fn run_player(opt: Opt) -> Result<(), Box<dyn std::error::Error>> {
let movie_size = LogicalSize::new(movie.width(), movie.height())
.cast::<f64>()
.to_physical(window.scale_factor());
let window_width = opt.width.unwrap_or(
movie_size.width * (opt.height.unwrap_or(movie_size.height) / movie_size.height),
);
let window_width = opt
.width
.unwrap_or(movie_size.width * (opt.height.unwrap_or(movie_size.height) / movie_size.height))
.max(1.0);
let window_height = opt
.height
.unwrap_or(movie_size.height * (opt.width.unwrap_or(movie_size.width) / movie_size.width));
.unwrap_or(movie_size.height * (opt.width.unwrap_or(movie_size.width) / movie_size.width))
.max(1.0);
let window_size = PhysicalSize::new(window_width, window_height);
window.set_inner_size(window_size);
let viewport_size = window.inner_size();