feat: update tauri version

This commit is contained in:
GyDi
2022-02-13 18:45:03 +08:00
parent eb86b471fe
commit 6193a842f4
8 changed files with 1344 additions and 3504 deletions

View File

@@ -105,7 +105,9 @@ impl Verge {
pub fn init_launch(&mut self, package_info: &tauri::PackageInfo) {
let app_name = "clash-verge";
let app_path = get_app_path(app_name);
let app_path = resource_dir(package_info).unwrap().join(app_path);
let app_path = resource_dir(package_info, &tauri::Env::default())
.unwrap()
.join(app_path);
let app_path = app_path.as_os_str().to_str().unwrap();
let auto = AutoLaunchBuilder::new()

View File

@@ -53,9 +53,9 @@ fn main() -> std::io::Result<()> {
}
}
"quit" => {
api::process::kill_children();
resolve::resolve_reset(app_handle);
app_handle.exit(0);
api::process::kill_children();
std::process::exit(0);
}
_ => {}
},
@@ -94,12 +94,12 @@ fn main() -> std::io::Result<()> {
.build(tauri::generate_context!())
.expect("error while running tauri application")
.run(|app_handle, e| match e {
tauri::Event::CloseRequested { label, api, .. } => {
tauri::RunEvent::CloseRequested { label, api, .. } => {
let app_handle = app_handle.clone();
api.prevent_close();
app_handle.get_window(&label).unwrap().hide().unwrap();
}
tauri::Event::ExitRequested { .. } => {
tauri::RunEvent::ExitRequested { .. } => {
resolve::resolve_reset(app_handle);
api::process::kill_children();
}

View File

@@ -1,7 +1,7 @@
use std::path::{Path, PathBuf};
use tauri::{
api::path::{home_dir, resource_dir},
PackageInfo,
Env, PackageInfo,
};
/// get the verge app home dir
@@ -14,5 +14,7 @@ pub fn app_home_dir() -> PathBuf {
/// get the resources dir
pub fn app_resources_dir(package_info: &PackageInfo) -> PathBuf {
resource_dir(package_info).unwrap().join("resources")
resource_dir(package_info, &Env::default())
.unwrap()
.join("resources")
}