Merge branch 'main' of github.com:Tim-Paik/neutauri
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Tim-Paik 2022-05-14 18:40:45 +08:00
commit ed45c5dcd5
Signed by: Tim-Paik
GPG Key ID: DC36A050DB42566D
3 changed files with 30 additions and 16 deletions

View File

@ -1,6 +1,6 @@
kind: pipeline kind: pipeline
type: docker type: docker
name: default name: build
steps: steps:
- name: build - name: build
@ -27,4 +27,24 @@ steps:
- sha256 - sha256
when: when:
event: event:
- tag - 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 '========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

View File

@ -57,15 +57,12 @@ pub fn dev(config_path: String) -> wry::Result<()> {
)?)), )?)),
None => window_builder, None => window_builder,
}; };
let monitor_size = event_loop let monitor_size = event_loop.primary_monitor().unwrap_or_else(|| {
.primary_monitor() event_loop
.unwrap_or_else(|| { .available_monitors()
event_loop .next()
.available_monitors() .expect("no monitor found")
.next() }).size();
.expect("no monitor found")
})
.size();
let window_builder = match config.window_attr()?.inner_size { let window_builder = match config.window_attr()?.inner_size {
Some(size) => window_builder.with_inner_size(get_size(size, monitor_size)), Some(size) => window_builder.with_inner_size(get_size(size, monitor_size)),
None => window_builder, None => window_builder,

View File

@ -58,14 +58,12 @@ fn main() -> wry::Result<()> {
)?)), )?)),
None => window_builder, None => window_builder,
}; };
let monitor = event_loop.primary_monitor().unwrap_or_else(|| { let monitor_size = event_loop.primary_monitor().unwrap_or_else(|| {
event_loop event_loop
.available_monitors() .available_monitors()
.next() .next()
.expect("no monitor found") .expect("no monitor found")
}); }).size();
let monitor_size = monitor.size();
let monitor_scale_factor = monitor.scale_factor();
let window_builder = match res.window_attr.inner_size { let window_builder = match res.window_attr.inner_size {
Some(size) => window_builder.with_inner_size(get_size(size, monitor_size)), Some(size) => window_builder.with_inner_size(get_size(size, monitor_size)),
None => window_builder, None => window_builder,
@ -169,7 +167,6 @@ fn main() -> wry::Result<()> {
}) })
.with_devtools(false) .with_devtools(false)
.build()?; .build()?;
webview.zoom(monitor_scale_factor);
event_loop.run(move |event, _, control_flow| { event_loop.run(move |event, _, control_flow| {
*control_flow = ControlFlow::Wait; *control_flow = ControlFlow::Wait;