franpcode/ChatGPT
1
0
Fork 0
mirror of https://github.com/FranP-code/ChatGPT.git synced 2025-10-13 00:13:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: tray

Browse Source
This commit is contained in:
lencx
2023-01-25 01:52:37 +08:00
parent 221287bbd5
commit 9ba3357a58
6 changed files with 50 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src-tauri/src/app/setup.rs
View File

@@ -59,7 +59,13 @@ pub fn init(app: &mut App) -> std::result::Result<(), Box<dyn std::error::Error>
.title("ChatGPT")
.resizable(true)
.fullscreen(false)
.inner_size(800.0, 600.0);
.inner_size(800.0, 600.0)
.theme(theme)
.always_on_top(chat_conf.stay_on_top)
.title_bar_style(ChatConfJson::titlebar())
.initialization_script(&utils::user_script())
.initialization_script(include_str!("../scripts/core.js"))
.user_agent(&chat_conf.ua_window);
if cfg!(target_os = "macos") {
main_win = main_win.hidden_title(true);
@@ -79,15 +85,7 @@ pub fn init(app: &mut App) -> std::result::Result<(), Box<dyn std::error::Error>
.initialization_script(include_str!("../scripts/cmd.js"))
}
main_win
.theme(theme)
.always_on_top(chat_conf.stay_on_top)
.title_bar_style(ChatConfJson::titlebar())
.initialization_script(&utils::user_script())
.initialization_script(include_str!("../scripts/core.js"))
.user_agent(&chat_conf.ua_window)
.build()
.unwrap();
main_win.build().unwrap();
});
}

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

@@ -9,22 +9,24 @@ pub fn tray_window(handle: &tauri::AppHandle) {
let app = handle.clone();
tauri::async_runtime::spawn(async move {
let mut tray_win = WindowBuilder::new(
&app,
"tray",
WindowUrl::App(chat_conf.tray_origin.clone().into()),
)
.title("ChatGPT")
.resizable(false)
.fullscreen(false)
.inner_size(360.0, 540.0)
.decorations(false)
.always_on_top(true)
.theme(theme)
.initialization_script(&utils::user_script())
.initialization_script(include_str!("../scripts/core.js"));
let link = if chat_conf.tray_dashboard {
"index.html"
} else {
&chat_conf.tray_origin
};
let mut tray_win = WindowBuilder::new(&app, "tray", WindowUrl::App(link.into()))
.title("ChatGPT")
.resizable(false)
.fullscreen(false)
.inner_size(360.0, 540.0)
.decorations(false)
.always_on_top(true)
.theme(theme)
.initialization_script(&utils::user_script())
.initialization_script(include_str!("../scripts/core.js"))
.user_agent(&chat_conf.ua_tray);
if chat_conf.tray_origin == "https://chat.openai.com" {
if chat_conf.tray_origin == "https://chat.openai.com" && !chat_conf.tray_dashboard {
tray_win = tray_win
.initialization_script(include_str!("../vendors/floating-ui-core.js"))
.initialization_script(include_str!("../vendors/floating-ui-dom.js"))
@@ -32,12 +34,7 @@ pub fn tray_window(handle: &tauri::AppHandle) {
.initialization_script(include_str!("../scripts/popup.core.js"))
}
tray_win
.user_agent(&chat_conf.ua_tray)
.build()
.unwrap()
.hide()
.unwrap();
tray_win.build().unwrap().hide().unwrap();
});
}