mirror of
https://github.com/FranP-code/ChatGPT.git
synced 2025-10-13 00:13:25 +00:00
fix: build error
This commit is contained in:
@@ -1,14 +1,14 @@
|
|||||||
use crate::utils;
|
use crate::utils;
|
||||||
use tauri::{
|
use tauri::{utils::config::WindowUrl, window::WindowBuilder, App};
|
||||||
utils::{config::WindowUrl, TitleBarStyle},
|
|
||||||
window::WindowBuilder,
|
#[cfg(target_os = "macos")]
|
||||||
App,
|
use tauri::TitleBarStyle;
|
||||||
};
|
|
||||||
|
|
||||||
pub fn init(app: &mut App) -> std::result::Result<(), Box<dyn std::error::Error>> {
|
pub fn init(app: &mut App) -> std::result::Result<(), Box<dyn std::error::Error>> {
|
||||||
let conf = utils::get_tauri_conf().unwrap();
|
let conf = utils::get_tauri_conf().unwrap();
|
||||||
let url = conf.build.dev_path.to_string();
|
let url = conf.build.dev_path.to_string();
|
||||||
|
|
||||||
|
#[cfg(target_os = "macos")]
|
||||||
WindowBuilder::new(app, "core", WindowUrl::App(url.into()))
|
WindowBuilder::new(app, "core", WindowUrl::App(url.into()))
|
||||||
.resizable(true)
|
.resizable(true)
|
||||||
.fullscreen(false)
|
.fullscreen(false)
|
||||||
@@ -20,5 +20,16 @@ pub fn init(app: &mut App) -> std::result::Result<(), Box<dyn std::error::Error>
|
|||||||
.user_agent("5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36")
|
.user_agent("5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36")
|
||||||
.build()?;
|
.build()?;
|
||||||
|
|
||||||
|
#[cfg(not(target_os = "macos"))]
|
||||||
|
WindowBuilder::new(app, "core", WindowUrl::App(url.into()))
|
||||||
|
.resizable(true)
|
||||||
|
.fullscreen(false)
|
||||||
|
.initialization_script(include_str!("../core.js"))
|
||||||
|
.initialization_script(&utils::user_script())
|
||||||
|
.inner_size(800.0, 600.0)
|
||||||
|
.hidden_title(true)
|
||||||
|
.user_agent("5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36")
|
||||||
|
.build()?;
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user