lostecho/Pake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复开发者工具运行报错问题

Browse Source
This commit is contained in:
Tlntin
2022-12-27 21:50:15 +08:00
parent 653ddbc9ac
commit 8ec031b754
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@@ -32,6 +32,7 @@
"scripts": { "scripts": {
"start": "npm run dev", "start": "npm run dev",
"dev": "npm run tauri dev", "dev": "npm run tauri dev",
"dev:debug": "npm run tauri dev -- --features devtools",
"build": "npm run tauri build --release", "build": "npm run tauri build --release",
"build:mac": "npm run tauri build -- --target universal-apple-darwin", "build:mac": "npm run tauri build -- --target universal-apple-darwin",
"build:all-unix": "chmod +x ./script/build.sh && ./script/build.sh", "build:all-unix": "chmod +x ./script/build.sh && ./script/build.sh",

15
src-tauri/src/main.rs
View File

@@ -58,7 +58,6 @@ pub fn get_pake_config() -> (PakeConfig, Config){
pub fn get_menu() -> Menu { pub fn get_menu() -> Menu {
// first menu // first menu
let debug = CustomMenuItem::new("debug", "Debug");
let hide = CustomMenuItem::new("hide", "Hide"); let hide = CustomMenuItem::new("hide", "Hide");
let close = CustomMenuItem::new("close", "Close"); let close = CustomMenuItem::new("close", "Close");
let quit = CustomMenuItem::new("quit", "Quit"); let quit = CustomMenuItem::new("quit", "Quit");
@@ -80,7 +79,6 @@ pub fn get_menu() -> Menu {
.add_item(quit); .add_item(quit);
#[cfg(any(target_os = "linux", target_os = "windows"))] #[cfg(any(target_os = "linux", target_os = "windows"))]
let first_menu = Menu::new() let first_menu = Menu::new()
.add_item(debug)
.add_item(hide) .add_item(hide)
.add_item(close) .add_item(close)
.add_item(quit); .add_item(quit);
@@ -182,6 +180,7 @@ pub fn get_window(app: & mut App, config: PakeConfig, data_dir: std::path::PathB
.initialization_script(include_str!("pake.js")) .initialization_script(include_str!("pake.js"))
}; };
window.build().unwrap() window.build().unwrap()
} }
pub fn set_zoom(webview: PlatformWebview, zoom_value: f64) { pub fn set_zoom(webview: PlatformWebview, zoom_value: f64) {
@@ -224,7 +223,6 @@ pub fn zoom_reset(webview: PlatformWebview) {
pub fn menu_event_handle(event: WindowMenuEvent) { pub fn menu_event_handle(event: WindowMenuEvent) {
match event.menu_item_id() { match event.menu_item_id() {
"debug" => event.window().open_devtools(),
"hide" => event.window().hide().expect("can't hide window"), "hide" => event.window().hide().expect("can't hide window"),
"close" => event.window().close().expect("can't close window"), "close" => event.window().close().expect("can't close window"),
"quit" => std::process::exit(0), "quit" => std::process::exit(0),
@@ -249,13 +247,11 @@ pub fn menu_event_handle(event: WindowMenuEvent) {
pub fn get_system_tray() -> SystemTray { pub fn get_system_tray() -> SystemTray {
let debug = CustomMenuItem::new("debug", "Debug");
let hide = CustomMenuItem::new("hide".to_string(), "Hide"); let hide = CustomMenuItem::new("hide".to_string(), "Hide");
let show = CustomMenuItem::new("show".to_string(), "Show"); let show = CustomMenuItem::new("show".to_string(), "Show");
let quit = CustomMenuItem::new("quit".to_string(), "Quit"); let quit = CustomMenuItem::new("quit".to_string(), "Quit");
let about = CustomMenuItem::new("about".to_string(), "About"); let about = CustomMenuItem::new("about".to_string(), "About");
let tray_menu = SystemTrayMenu::new() let tray_menu = SystemTrayMenu::new()
.add_item(debug)
.add_item(hide) .add_item(hide)
.add_item(show) .add_item(show)
.add_item(quit) .add_item(quit)
@@ -267,7 +263,6 @@ pub fn get_system_tray() -> SystemTray {
pub fn system_tray_handle(app: &tauri::AppHandle, event: tauri::SystemTrayEvent) { pub fn system_tray_handle(app: &tauri::AppHandle, event: tauri::SystemTrayEvent) {
if let SystemTrayEvent::MenuItemClick { tray_id: _, id, .. } = event { if let SystemTrayEvent::MenuItemClick { tray_id: _, id, .. } = event {
match id.as_str() { match id.as_str() {
"debug" => app.get_window("pake").unwrap().open_devtools(),
"hide" => { "hide" => {
app.get_window("pake").unwrap().hide().unwrap(); app.get_window("pake").unwrap().hide().unwrap();
}, },
@@ -311,6 +306,10 @@ pub fn run_app() {
.invoke_handler(tauri::generate_handler![]) .invoke_handler(tauri::generate_handler![])
.setup(|app| { .setup(|app| {
let _window = get_window(app, pake_config, std::path::PathBuf::new()); let _window = get_window(app, pake_config, std::path::PathBuf::new());
#[cfg(feature = "devtools")]
{
app.get_window("pake").unwrap().open_devtools();
}
Ok(()) Ok(())
}) })
.run(tauri::generate_context!()) .run(tauri::generate_context!())
@@ -330,6 +329,10 @@ pub fn run_app() {
.invoke_handler(tauri::generate_handler![]) .invoke_handler(tauri::generate_handler![])
.setup(|app| { .setup(|app| {
let _window = get_window(app, pake_config, data_dir); let _window = get_window(app, pake_config, data_dir);
#[cfg(feature = "devtools")]
{
app.get_window("pake").unwrap().open_devtools();
}
Ok(()) Ok(())
}) })
.run(tauri::generate_context!()) .run(tauri::generate_context!())