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

🐛 debug windows close

Browse Source
This commit is contained in:
Tw93
2024-12-21 21:25:53 +08:00
parent a25dfa9179
commit 8b00a1ddda
2 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src-tauri/src/app/window.rs
View File

@@ -26,13 +26,13 @@ pub fn get_window(app: &mut App, config: &PakeConfig, _data_dir: PathBuf) -> Web
let mut window_builder = WebviewWindowBuilder::new(app, "pake", url) let mut window_builder = WebviewWindowBuilder::new(app, "pake", url)
.title("") .title("")
.visible(false) // .visible(false)
.user_agent(user_agent) .user_agent(user_agent)
.resizable(window_config.resizable) .resizable(window_config.resizable)
.fullscreen(window_config.fullscreen) .fullscreen(window_config.fullscreen)
.inner_size(window_config.width, window_config.height) .inner_size(window_config.width, window_config.height)
.always_on_top(window_config.always_on_top) .always_on_top(window_config.always_on_top)
.disable_drag_drop_handler() // .disable_drag_drop_handler()
.initialization_script(&config_script) .initialization_script(&config_script)
.initialization_script(include_str!("../inject/component.js")) .initialization_script(include_str!("../inject/component.js"))
.initialization_script(include_str!("../inject/event.js")) .initialization_script(include_str!("../inject/event.js"))

58
src-tauri/src/lib.rs
View File

@@ -10,7 +10,7 @@ use std::time::{Duration, Instant};
use tauri::Manager; use tauri::Manager;
use tauri_plugin_global_shortcut::{GlobalShortcutExt, Shortcut}; use tauri_plugin_global_shortcut::{GlobalShortcutExt, Shortcut};
use tauri_plugin_window_state::Builder as windowStatePlugin; // use tauri_plugin_window_state::Builder as windowStatePlugin;
use util::{get_data_dir, get_pake_config}; use util::{get_data_dir, get_pake_config};
use window::get_window; use window::get_window;
@@ -23,18 +23,18 @@ pub fn run_app() {
// Save the value of toggle_app_shortcut before pake_config is moved // Save the value of toggle_app_shortcut before pake_config is moved
let activation_shortcut = pake_config.windows[0].activation_shortcut.clone(); let activation_shortcut = pake_config.windows[0].activation_shortcut.clone();
let init_fullscreen = pake_config.windows[0].fullscreen; // let init_fullscreen = pake_config.windows[0].fullscreen;
let window_state_plugin = if init_fullscreen { // let window_state_plugin = if init_fullscreen {
windowStatePlugin::default() // windowStatePlugin::default()
.with_state_flags(tauri_plugin_window_state::StateFlags::FULLSCREEN) // .with_state_flags(tauri_plugin_window_state::StateFlags::FULLSCREEN)
.build() // .build()
} else { // } else {
windowStatePlugin::default().build() // windowStatePlugin::default().build()
}; // };
tauri_app tauri_app
.plugin(window_state_plugin) // .plugin(window_state_plugin)
.plugin(tauri_plugin_oauth::init()) .plugin(tauri_plugin_oauth::init())
.plugin(tauri_plugin_http::init()) .plugin(tauri_plugin_http::init())
.plugin(tauri_plugin_shell::init()) .plugin(tauri_plugin_shell::init())
@@ -48,7 +48,7 @@ pub fn run_app() {
let _window = get_window(app, &pake_config, data_dir); let _window = get_window(app, &pake_config, data_dir);
// Prevent initial shaking // Prevent initial shaking
_window.show().unwrap(); // _window.show().unwrap();
if show_system_tray { if show_system_tray {
let _ = set_system_tray(app.app_handle()); let _ = set_system_tray(app.app_handle());
@@ -100,24 +100,24 @@ pub fn run_app() {
Ok(()) Ok(())
}) })
// .on_window_event(|window, event| { .on_window_event(|window, event| {
// #[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
// if let tauri::WindowEvent::CloseRequested { api, .. } = event { if let tauri::WindowEvent::CloseRequested { api, .. } = event {
// { {
// let window_handle = window.clone(); let window_handle = window.clone();
// tauri::async_runtime::spawn(async move { tauri::async_runtime::spawn(async move {
// if window_handle.is_fullscreen().unwrap_or(false) { if window_handle.is_fullscreen().unwrap_or(false) {
// window_handle.set_fullscreen(false).unwrap(); window_handle.set_fullscreen(false).unwrap();
// // Give a small delay to ensure the full-screen exit operation is completed. // Give a small delay to ensure the full-screen exit operation is completed.
// tokio::time::sleep(Duration::from_millis(900)).await; tokio::time::sleep(Duration::from_millis(900)).await;
// } }
// window_handle.minimize().unwrap(); window_handle.minimize().unwrap();
// window_handle.hide().unwrap(); window_handle.hide().unwrap();
// }); });
// api.prevent_close(); api.prevent_close();
// } }
// } }
// }) })
.run(tauri::generate_context!()) .run(tauri::generate_context!())
.expect("error while running tauri application"); .expect("error while running tauri application");
} }