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

Merge pull request #4766 from rustdesk/revert-4611-linux-tray

Browse Source 
Revert "linux tray as mac tray"
This commit is contained in:
RustDesk 2023-06-25 00:46:45 +08:00 committed by GitHub
commit 98e87d0c54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -127,8 +127,6 @@ dbus = "0.9"
dbus-crossroads = "0.5" dbus-crossroads = "0.5"
pam = { git="https://github.com/fufesou/pam", optional = true } pam = { git="https://github.com/fufesou/pam", optional = true }
users = { version = "0.11" } users = { version = "0.11" }
dark-light = "1.0"
[target.'cfg(target_os = "android")'.dependencies] [target.'cfg(target_os = "android")'.dependencies]
android_logger = "0.13" android_logger = "0.13"

0
res/outlined-tray-dark-x2.png → res/mac-tray-dark-x2.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 703 B

After

Width:  |  Height:  |  Size: 703 B

0
res/outlined-tray-light-x2.png → res/mac-tray-light-x2.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 728 B

After

Width:  |  Height:  |  Size: 728 B

9
src/tray.rs
View File

@ -12,17 +12,17 @@ pub fn make_tray() -> hbb_common::ResultType<()> {
TrayEvent, TrayIconBuilder, TrayEvent, TrayIconBuilder,
}; };
let icon; let icon;
#[cfg(any(target_os = "macos", target_os = "linux"))] #[cfg(target_os = "macos")]
{ {
let mode = dark_light::detect(); let mode = dark_light::detect();
const LIGHT: &[u8] = include_bytes!("../res/outlined-tray-light-x2.png"); const LIGHT: &[u8] = include_bytes!("../res/mac-tray-light-x2.png");
const DARK: &[u8] = include_bytes!("../res/outlined-tray-dark-x2.png"); const DARK: &[u8] = include_bytes!("../res/mac-tray-dark-x2.png");
icon = match mode { icon = match mode {
dark_light::Mode::Dark => LIGHT, dark_light::Mode::Dark => LIGHT,
_ => DARK, _ => DARK,
}; };
} }
#[cfg(target_os = "windows")] #[cfg(not(target_os = "macos"))]
{ {
icon = include_bytes!("../res/tray-icon.ico"); icon = include_bytes!("../res/tray-icon.ico");
} }
@ -74,7 +74,6 @@ pub fn make_tray() -> hbb_common::ResultType<()> {
.spawn() .spawn()
.ok(); .ok();
} }
// xdg-open?
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
if !std::process::Command::new("xdg-open") if !std::process::Command::new("xdg-open")
.arg("rustdesk://") .arg("rustdesk://")