mirror of
https://github.com/clash-verge-rev/clash-verge-rev.git
synced 2026-11-08 02:52:07 +08:00
Tunglies
8c0af66ca9
- Updated logging macros to eliminate the boolean parameter for print control, simplifying the logging calls throughout the codebase. - Adjusted all logging calls in various modules (lib.rs, lightweight.rs, help.rs, init.rs, logging.rs, resolve/mod.rs, resolve/scheme.rs, resolve/ui.rs, resolve/window.rs, server.rs, singleton.rs, window_manager.rs) to reflect the new macro structure. - Ensured consistent logging behavior across the application by standardizing the logging format.
46 lines
1.3 KiB
Rust
46 lines
1.3 KiB
Rust
use tauri::WebviewWindow;
|
|
|
|
use crate::{
|
|
core::handle,
|
|
logging_error,
|
|
utils::{
|
|
logging::Type,
|
|
resolve::window_script::{INITIAL_LOADING_OVERLAY, WINDOW_INITIAL_SCRIPT},
|
|
},
|
|
};
|
|
|
|
// 定义默认窗口尺寸常量
|
|
const DEFAULT_WIDTH: f64 = 940.0;
|
|
const DEFAULT_HEIGHT: f64 = 700.0;
|
|
|
|
const MINIMAL_WIDTH: f64 = 520.0;
|
|
const MINIMAL_HEIGHT: f64 = 520.0;
|
|
|
|
/// 构建新的 WebView 窗口
|
|
pub fn build_new_window() -> Result<WebviewWindow, String> {
|
|
let app_handle = handle::Handle::app_handle();
|
|
|
|
match tauri::WebviewWindowBuilder::new(
|
|
app_handle,
|
|
"main", /* the unique window label */
|
|
tauri::WebviewUrl::App("index.html".into()),
|
|
)
|
|
.title("Clash Verge")
|
|
.center()
|
|
// Using WindowManager::prefer_system_titlebar to control if show system built-in titlebar
|
|
// .decorations(true)
|
|
.fullscreen(false)
|
|
.inner_size(DEFAULT_WIDTH, DEFAULT_HEIGHT)
|
|
.min_inner_size(MINIMAL_WIDTH, MINIMAL_HEIGHT)
|
|
.visible(true) // 立即显示窗口，避免用户等待
|
|
.initialization_script(WINDOW_INITIAL_SCRIPT)
|
|
.build()
|
|
{
|
|
Ok(window) => {
|
|
logging_error!(Type::Window, window.eval(INITIAL_LOADING_OVERLAY));
|
|
Ok(window)
|
|
}
|
|
Err(e) => Err(e.to_string()),
|
|
}
|
|
}
|