From 7d0dfe5d6faf72481fa501c044fcd8c10da2f720 Mon Sep 17 00:00:00 2001 From: Tim-Paik Date: Sun, 8 May 2022 14:10:52 +0800 Subject: [PATCH] It looks like wry/tao/winit automatically scales the content? --- neutauri_bundler/src/dev.rs | 7 ++----- neutauri_runtime/src/main.rs | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/neutauri_bundler/src/dev.rs b/neutauri_bundler/src/dev.rs index 62e56cd..4090d49 100644 --- a/neutauri_bundler/src/dev.rs +++ b/neutauri_bundler/src/dev.rs @@ -57,14 +57,12 @@ pub fn dev(config_path: String) -> wry::Result<()> { )?)), None => window_builder, }; - let monitor = event_loop.primary_monitor().unwrap_or_else(|| { + let monitor_size = event_loop.primary_monitor().unwrap_or_else(|| { event_loop .available_monitors() .next() .expect("no monitor found") - }); - let monitor_size = monitor.size(); - let monitor_scale_factor = monitor.scale_factor(); + }).size(); let window_builder = match config.window_attr()?.inner_size { Some(size) => window_builder.with_inner_size(get_size(size, monitor_size)), None => window_builder, @@ -178,7 +176,6 @@ pub fn dev(config_path: String) -> wry::Result<()> { }) .with_devtools(true) .build()?; - webview.zoom(monitor_scale_factor); event_loop.run(move |event, _, control_flow| { *control_flow = ControlFlow::Wait; diff --git a/neutauri_runtime/src/main.rs b/neutauri_runtime/src/main.rs index e677fdc..8098a29 100644 --- a/neutauri_runtime/src/main.rs +++ b/neutauri_runtime/src/main.rs @@ -58,14 +58,12 @@ fn main() -> wry::Result<()> { )?)), None => window_builder, }; - let monitor = event_loop.primary_monitor().unwrap_or_else(|| { + let monitor_size = event_loop.primary_monitor().unwrap_or_else(|| { event_loop .available_monitors() .next() .expect("no monitor found") - }); - let monitor_size = monitor.size(); - let monitor_scale_factor = monitor.scale_factor(); + }).size(); let window_builder = match res.window_attr.inner_size { Some(size) => window_builder.with_inner_size(get_size(size, monitor_size)), None => window_builder, @@ -169,7 +167,6 @@ fn main() -> wry::Result<()> { }) .with_devtools(false) .build()?; - webview.zoom(monitor_scale_factor); event_loop.run(move |event, _, control_flow| { *control_flow = ControlFlow::Wait;