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

follow system theme

Browse Source
This commit is contained in:
tk103331
2023-01-04 16:55:34 +08:00
parent f26dace129
commit 845229d629
4 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src-tauri/src/app/menu.rs
View File

@@ -41,7 +41,9 @@ pub fn init() -> Menu {
CustomMenuItem::new("titlebar".to_string(), "Titlebar").accelerator("CmdOrCtrl+B");
let theme_light = CustomMenuItem::new("theme_light".to_string(), "Light");
let theme_dark = CustomMenuItem::new("theme_dark".to_string(), "Dark");
let theme_system = CustomMenuItem::new("theme_system".to_string(), "System");
let is_dark = chat_conf.theme == "Dark";
let is_system = chat_conf.theme == "System";
let stay_on_top_menu = if chat_conf.stay_on_top {
stay_on_top.selected()
@@ -65,7 +67,7 @@ pub fn init() -> Menu {
Submenu::new(
"Theme",
Menu::new()
.add_item(if is_dark {
.add_item(if is_dark || is_system {
theme_light
} else {
theme_light.selected()
@@ -74,6 +76,11 @@ pub fn init() -> Menu {
theme_dark.selected()
} else {
theme_dark
})
.add_item(if is_system {
theme_system.selected()
} else {
theme_system
}),
)
.into(),
@@ -230,9 +237,11 @@ pub fn menu_handler(event: WindowMenuEvent<tauri::Wry>) {
.unwrap();
tauri::api::process::restart(&app.env());
}
"theme_light" | "theme_dark" => {
"theme_light" | "theme_dark" | "theme_system" => {
let theme = if menu_id == "theme_dark" {
"Dark"
} else if menu_id == "theme_system" {
"System"
} else {
"Light"
};

12
src-tauri/src/conf.rs
View File

@@ -177,7 +177,17 @@ impl ChatConfJson {
pub fn theme() -> Option<Theme> {
let conf = ChatConfJson::get_chat_conf();
if conf.theme == "Dark" {
if conf.theme == "System" {
let mode = dark_light::detect();
return match mode {
// Dark mode
dark_light::Mode::Dark => Some(Theme::Dark),
// Light mode
dark_light::Mode::Light => Some(Theme::Light),
// Unspecified
dark_light::Mode::Default => Some(Theme::Light),
}
} if conf.theme == "Dark" {
Some(Theme::Dark)
} else {
Some(Theme::Light)