From 1054231a7210d4ae9ba54c28bab3f3aa784c3aa0 Mon Sep 17 00:00:00 2001 From: Tim-Paik Date: Sun, 8 May 2022 00:21:26 +0800 Subject: [PATCH 1/4] fix dev mode zoom --- neutauri_bundler/src/dev.rs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/neutauri_bundler/src/dev.rs b/neutauri_bundler/src/dev.rs index dced770..62e56cd 100644 --- a/neutauri_bundler/src/dev.rs +++ b/neutauri_bundler/src/dev.rs @@ -57,15 +57,14 @@ pub fn dev(config_path: String) -> wry::Result<()> { )?)), None => window_builder, }; - let monitor_size = event_loop - .primary_monitor() - .unwrap_or_else(|| { - event_loop - .available_monitors() - .next() - .expect("no monitor found") - }) - .size(); + let monitor = 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(); let window_builder = match config.window_attr()?.inner_size { Some(size) => window_builder.with_inner_size(get_size(size, monitor_size)), None => window_builder, @@ -179,6 +178,7 @@ 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; From 5727f6b96f3e941ebe2db415d44f58075d9f9ae0 Mon Sep 17 00:00:00 2001 From: Tim-Paik Date: Sun, 8 May 2022 14:09:07 +0800 Subject: [PATCH 2/4] update drone ci --- .drone.yml | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index bef2a51..1d2ccf1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,6 +1,6 @@ kind: pipeline type: docker -name: default +name: build steps: - name: build @@ -27,4 +27,21 @@ steps: - sha256 when: event: - - tag \ No newline at end of file + - tag + +--- + +kind: pipeline +type: docker +name: clippy + +steps: +- name: clippy + image: ubuntu:latest + commands: + - echo '========Install the necessary environment========' + - apt update && apt install -y curl gcc git libwebkit2gtk-4.0-dev libappindicator3-dev + - echo '========Install the Rust toolchain========' + - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain stable -c clippy -y + - echo '========Run Cargo Clippy========' + - $HOME/.cargo/bin/cargo clippy From 7d0dfe5d6faf72481fa501c044fcd8c10da2f720 Mon Sep 17 00:00:00 2001 From: Tim-Paik Date: Sun, 8 May 2022 14:10:52 +0800 Subject: [PATCH 3/4] 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; From a782e23da4856973130d2b06a3e9ec578a55712f Mon Sep 17 00:00:00 2001 From: Tim-Paik Date: Sun, 8 May 2022 14:28:32 +0800 Subject: [PATCH 4/4] fix drone issue --- .drone.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.drone.yml b/.drone.yml index 1d2ccf1..6af7200 100644 --- a/.drone.yml +++ b/.drone.yml @@ -43,5 +43,8 @@ steps: - apt update && apt install -y curl gcc git libwebkit2gtk-4.0-dev libappindicator3-dev - echo '========Install the Rust toolchain========' - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain stable -c clippy -y + - echo '========Compile the Neutauri binary========' + - $HOME/.cargo/bin/cargo build --release --bin neutauri_runtime + - $HOME/.cargo/bin/cargo build --release --bin neutauri_bundler - echo '========Run Cargo Clippy========' - $HOME/.cargo/bin/cargo clippy