hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix icon color on Sonoma

Browse Source
This commit is contained in:
rustdesk 2023-12-09 10:18:13 +08:00
parent 6003003228
commit fc110c4988
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/tray.rs
View File

@ -23,12 +23,26 @@ pub fn make_tray() -> hbb_common::ResultType<()> {
let icon; let icon;
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
{ {
let mode = dark_light::detect();
const LIGHT: &[u8] = include_bytes!("../res/mac-tray-light-x2.png");
const DARK: &[u8] = include_bytes!("../res/mac-tray-dark-x2.png"); const DARK: &[u8] = include_bytes!("../res/mac-tray-dark-x2.png");
icon = match mode { const LIGHT: &[u8] = include_bytes!("../res/mac-tray-light-x2.png");
dark_light::Mode::Dark => LIGHT, let output = std::process::Command::new("sw_vers")
_ => DARK, .args(&["-productVersion"])
.output()
.map(|x| x.stdout)
.unwrap_or_default();
let version: f64 = String::from_utf8_lossy(output.as_slice())
.trim()
.parse()
.unwrap_or_default();
icon = if version >= 14. {
// workaround for Sonoma, always light menubar
DARK
} else {
let mode = dark_light::detect();
match mode {
dark_light::Mode::Dark => LIGHT,
_ => DARK,
}
}; };
} }
#[cfg(not(target_os = "macos"))] #[cfg(not(target_os = "macos"))]