shkong/clash-verge-rev
1
0
Fork 0
mirror of https://github.com/clash-verge-rev/clash-verge-rev synced 2025-05-04 20:07:32 +08:00
Code Packages Projects Releases Activity

fix: fixer #2346

Browse Source
This commit is contained in:
huzibaca 2024-12-14 17:30:58 +08:00
parent 800f994b10
commit f839d3bc88
No known key found for this signature in database
GPG Key ID: D4364EE4851DC302
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src-tauri/src/utils/resolve.rs
View File

@ -1,7 +1,7 @@
use crate::config::IVerge; use crate::config::IVerge;
use crate::utils::error; use crate::utils::error;
use crate::{config::Config, config::PrfItem, core::*, utils::init, utils::server}; use crate::{config::Config, config::PrfItem, core::*, utils::init, utils::server};
use crate::{log_err, trace_err, wrap_err}; use crate::{log_err, wrap_err};
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use once_cell::sync::OnceCell; use once_cell::sync::OnceCell;
use percent_encoding::percent_decode_str; use percent_encoding::percent_decode_str;
@ -122,16 +122,13 @@ pub fn create_window() {
let app_handle = handle::Handle::global().app_handle().unwrap(); let app_handle = handle::Handle::global().app_handle().unwrap();
if let Some(window) = handle::Handle::global().get_window() { if let Some(window) = handle::Handle::global().get_window() {
trace_err!(window.show(), "set win visible"); let _ = window.show();
trace_err!(window.set_focus(), "set win focus"); let _ = window.set_focus();
return; return;
} }
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
let _ = { let _ = tauri::WebviewWindowBuilder::new(
let app_handle = app_handle.clone();
std::thread::spawn(move || {
tauri::WebviewWindowBuilder::new(
&app_handle, &app_handle,
"main".to_string(), "main".to_string(),
tauri::WebviewUrl::App("index.html".into()), tauri::WebviewUrl::App("index.html".into()),
@ -144,9 +141,7 @@ pub fn create_window() {
.maximizable(true) .maximizable(true)
.additional_browser_args("--enable-features=msWebView2EnableDraggableRegions --disable-features=OverscrollHistoryNavigation,msExperimentalScrolling") .additional_browser_args("--enable-features=msWebView2EnableDraggableRegions --disable-features=OverscrollHistoryNavigation,msExperimentalScrolling")
.transparent(true) .transparent(true)
.build() .build();
}).join().unwrap()
}.unwrap();
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
let _ = tauri::WebviewWindowBuilder::new( let _ = tauri::WebviewWindowBuilder::new(