From 3cbcd2e46a654a6c055a30ad2a254eb567661203 Mon Sep 17 00:00:00 2001
From: rustdesk <info@rustdesk.com>
Date: Wed, 11 Jan 2023 15:35:35 +0800
Subject: [PATCH] mac tray icon opt

---
 Cargo.toml                                    |   2 +-
 .../macos/Runner.xcodeproj/project.pbxproj    |   8 +++++++
 flutter/pubspec.lock                          |   4 ++--
 res/mac-tray-dark-x2.png                      | Bin 0 -> 809 bytes
 res/mac-tray-dark.png                         | Bin 809 -> 275 bytes
 res/mac-tray-light-x2.png                     | Bin 0 -> 810 bytes
 res/mac-tray-light.png                        | Bin 810 -> 270 bytes
 src/platform/macos.mm                         |   6 +++++
 src/platform/macos.rs                         |   1 -
 src/tray.rs                                   |  21 +++++++++++++-----
 10 files changed, 33 insertions(+), 9 deletions(-)
 create mode 100644 res/mac-tray-dark-x2.png
 create mode 100644 res/mac-tray-light-x2.png

diff --git a/Cargo.toml b/Cargo.toml
index 2713df11d..427fcd4e7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -155,7 +155,7 @@ identifier = "com.carriez.rustdesk"
 icon = ["res/32x32.png", "res/128x128.png", "res/128x128@2x.png"]
 deb_depends = ["libgtk-3-0", "libxcb-randr0", "libxdo3", "libxfixes3", "libxcb-shape0", "libxcb-xfixes0", "libasound2", "libsystemd0", "curl", "libvdpau1", "libva2"]
 osx_minimum_system_version = "10.14"
-resources = ["res/mac-tray-light.png","res/mac-tray-dark.png"]
+resources = ["res/mac-tray-light.png","res/mac-tray-dark.png", "res/mac-tray-light-x2.png","res/mac-tray-dark-x2.png"]
 
 #https://github.com/johnthagen/min-sized-rust
 [profile.release]
diff --git a/flutter/macos/Runner.xcodeproj/project.pbxproj b/flutter/macos/Runner.xcodeproj/project.pbxproj
index a8b5306be..8f11a09ed 100644
--- a/flutter/macos/Runner.xcodeproj/project.pbxproj
+++ b/flutter/macos/Runner.xcodeproj/project.pbxproj
@@ -28,6 +28,8 @@
 		33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; };
 		7E4BCD762966B0EC006D24E2 /* mac-tray-light.png in Resources */ = {isa = PBXBuildFile; fileRef = 7E4BCD742966B0EC006D24E2 /* mac-tray-light.png */; };
 		7E4BCD772966B0EC006D24E2 /* mac-tray-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 7E4BCD752966B0EC006D24E2 /* mac-tray-dark.png */; };
+		7E881462296E98EE00A0C54F /* mac-tray-light-x2.png in Resources */ = {isa = PBXBuildFile; fileRef = 7E881461296E98ED00A0C54F /* mac-tray-light-x2.png */; };
+		7E881464296E991200A0C54F /* mac-tray-dark-x2.png in Resources */ = {isa = PBXBuildFile; fileRef = 7E881463296E991200A0C54F /* mac-tray-dark-x2.png */; };
 		84010BA8292CF66600152837 /* liblibrustdesk.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 84010BA7292CF66600152837 /* liblibrustdesk.dylib */; settings = {ATTRIBUTES = (Weak, ); }; };
 		84010BA9292CF68300152837 /* liblibrustdesk.dylib in Embed Libraries */ = {isa = PBXBuildFile; fileRef = 84010BA7292CF66600152837 /* liblibrustdesk.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 		C5E54335B73C89F72DB1B606 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 26C84465887F29AE938039CB /* Pods_Runner.framework */; };
@@ -78,6 +80,8 @@
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
 		7E4BCD742966B0EC006D24E2 /* mac-tray-light.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "mac-tray-light.png"; path = "../../res/mac-tray-light.png"; sourceTree = "<group>"; };
 		7E4BCD752966B0EC006D24E2 /* mac-tray-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "mac-tray-dark.png"; path = "../../res/mac-tray-dark.png"; sourceTree = "<group>"; };
+		7E881461296E98ED00A0C54F /* mac-tray-light-x2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "mac-tray-light-x2.png"; path = "../../res/mac-tray-light-x2.png"; sourceTree = "<group>"; };
+		7E881463296E991200A0C54F /* mac-tray-dark-x2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "mac-tray-dark-x2.png"; path = "../../res/mac-tray-dark-x2.png"; sourceTree = "<group>"; };
 		84010BA7292CF66600152837 /* liblibrustdesk.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = liblibrustdesk.dylib; path = ../../target/release/liblibrustdesk.dylib; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
 		C3BB669FF6190AE1B11BCAEA /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
@@ -131,6 +135,8 @@
 		33CC11242044D66E0003C045 /* Resources */ = {
 			isa = PBXGroup;
 			children = (
+				7E881463296E991200A0C54F /* mac-tray-dark-x2.png */,
+				7E881461296E98ED00A0C54F /* mac-tray-light-x2.png */,
 				7E4BCD752966B0EC006D24E2 /* mac-tray-dark.png */,
 				7E4BCD742966B0EC006D24E2 /* mac-tray-light.png */,
 				33CC10F22044A3C60003C045 /* Assets.xcassets */,
@@ -259,10 +265,12 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				7E881462296E98EE00A0C54F /* mac-tray-light-x2.png in Resources */,
 				7E4BCD762966B0EC006D24E2 /* mac-tray-light.png in Resources */,
 				7E4BCD772966B0EC006D24E2 /* mac-tray-dark.png in Resources */,
 				33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */,
 				33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */,
+				7E881464296E991200A0C54F /* mac-tray-dark-x2.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/flutter/pubspec.lock b/flutter/pubspec.lock
index 807f932bb..228817422 100644
--- a/flutter/pubspec.lock
+++ b/flutter/pubspec.lock
@@ -264,8 +264,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "82f9eab81cb2c7bfb938def7a1b399a6279bbc75"
-      resolved-ref: "82f9eab81cb2c7bfb938def7a1b399a6279bbc75"
+      ref: "057e6eb1bc7dcbcf9dafd1384274a611e4fe7124"
+      resolved-ref: "057e6eb1bc7dcbcf9dafd1384274a611e4fe7124"
       url: "https://github.com/Kingtous/rustdesk_desktop_multi_window"
     source: git
     version: "0.1.0"
diff --git a/res/mac-tray-dark-x2.png b/res/mac-tray-dark-x2.png
new file mode 100644
index 0000000000000000000000000000000000000000..860f9fcf5f763cec08b68b4d7fc1eb4cf00e2c40
GIT binary patch
literal 809
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sivoN?T!Hi;2MYvMt$<E6EeY}q
zW?=dK{`q$g-p4whA6(yVDRFUMVXDyU6NlHYo<F@UD<*{F?zxGr<p~CwY6?qh?YVk$
z{JNYhtojolGB7YPdb&7<cpUGY_Hx%E1D-Z#N5(>SQP;xz=dFx){*RWnv{mVKkiQ?V
zdVcyc-^*+j$Ib_rS82OFyzp9feZq3v{D;kfhVv2+>fJLr{ag7;#nI{AvrgVvIbFS2
zC$N>J^Ii4ZFM>w=?Cg?T*RVxunlQXQ@TF!#&B9JCAKAoPszr4oCEU?1O)uML`iiUw
zPONeEJoW1!3-6u3k+bz@cB>^9Nhm%(>h{7{M)5M2W3iK3^{Hde7EF-HoPBuniapDs
zdU9&*Q$5yZ`%ke=vu9-5xmqh*#cARtIg<kQlm9+$UBDW<pwV&ll^jNyQ(u{+PHuR@
zRiF9id{LlB$s;C?158s7sh_EI6|0&vBhk{Psnvg7@~vV%v11<F=NfHe<2Dpkc;L;a
zUi5(Dqqq00hH$?72M%otah<c&GQwkL+~w(fdJisJC7j$DDL?5&M#y*h-(n`UA2fZ}
z-Cy$E_L7C$%m+eJHx|#FIcI&zVZC2nD!G-*7dy`V_iCa-!52-T!&3d+uM3ynU!^M)
zxU{sUbixa(Ti<$ncC|keoxRX;w~2m=dc@yn=9WP@Rmmpu&LTVPgP-b(yfJgQvu9S@
zCD(&tDk^hM2ps*mNMT2l0*^qdxNpjt=%<!*ZpmC?(Xw!R9kA(bnbf-XOWnI3Z4RwU
zXU=$3^S&VeQudc=<{KWa-@MZN)$9B6<z*G+4xi-D*PdVaW>QceD8YNW`njxgN@xNA
D=o26P

literal 0
HcmV?d00001

diff --git a/res/mac-tray-dark.png b/res/mac-tray-dark.png
index 860f9fcf5f763cec08b68b4d7fc1eb4cf00e2c40..ba8ed8c12cf19a82e8109f4d7b46e10b9afcff99 100644
GIT binary patch
literal 275
zcmV+u0qp*XP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e0002mNkl<Zc-mdg
z1Lz%46oB#H>^LjVwr$(YZkfw&xwp8a*|yW9xU@X!&-i>hkKYa7Jw~wHWq(XD+h5mh
z)W85|71G;cd)RG*1iihAVBP{t!VA6_2xKB~&2%u+g@{~&@v`Z2QavZ4WFe=LJk~`c
z_fq^cpOWm-%-*;|XOgj+nVjM+U3CQo&E!FsuD*jQni&ticl8Dw)68M;nhgr+9Z}Em
zh^~f5NpmvBfN{>qr`RoEm~RSEG}ppN7JM~KFxuM)Zgn8+x#1w_=D276n`64)?%1ab
ZPy``YXG<|C3jzQD002ovPDHLkV1m$=e8m6&

literal 809
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sivoN?T!Hi;2MYvMt$<E6EeY}q
zW?=dK{`q$g-p4whA6(yVDRFUMVXDyU6NlHYo<F@UD<*{F?zxGr<p~CwY6?qh?YVk$
z{JNYhtojolGB7YPdb&7<cpUGY_Hx%E1D-Z#N5(>SQP;xz=dFx){*RWnv{mVKkiQ?V
zdVcyc-^*+j$Ib_rS82OFyzp9feZq3v{D;kfhVv2+>fJLr{ag7;#nI{AvrgVvIbFS2
zC$N>J^Ii4ZFM>w=?Cg?T*RVxunlQXQ@TF!#&B9JCAKAoPszr4oCEU?1O)uML`iiUw
zPONeEJoW1!3-6u3k+bz@cB>^9Nhm%(>h{7{M)5M2W3iK3^{Hde7EF-HoPBuniapDs
zdU9&*Q$5yZ`%ke=vu9-5xmqh*#cARtIg<kQlm9+$UBDW<pwV&ll^jNyQ(u{+PHuR@
zRiF9id{LlB$s;C?158s7sh_EI6|0&vBhk{Psnvg7@~vV%v11<F=NfHe<2Dpkc;L;a
zUi5(Dqqq00hH$?72M%otah<c&GQwkL+~w(fdJisJC7j$DDL?5&M#y*h-(n`UA2fZ}
z-Cy$E_L7C$%m+eJHx|#FIcI&zVZC2nD!G-*7dy`V_iCa-!52-T!&3d+uM3ynU!^M)
zxU{sUbixa(Ti<$ncC|keoxRX;w~2m=dc@yn=9WP@Rmmpu&LTVPgP-b(yfJgQvu9S@
zCD(&tDk^hM2ps*mNMT2l0*^qdxNpjt=%<!*ZpmC?(Xw!R9kA(bnbf-XOWnI3Z4RwU
zXU=$3^S&VeQudc=<{KWa-@MZN)$9B6<z*G+4xi-D*PdVaW>QceD8YNW`njxgN@xNA
D=o26P

diff --git a/res/mac-tray-light-x2.png b/res/mac-tray-light-x2.png
new file mode 100644
index 0000000000000000000000000000000000000000..f723d980e594a0042a9a94aac6aef9127ec3bf8c
GIT binary patch
literal 810
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sivoN?T!Hle!3|jS%9?<#G%X48
z3ua*X{r>rPkH?m}pC4S`E^%>RVX83C>l269ubw}>Eh{EOljH8WiLK=cY6?qh?G5?4
zdUO1`oXWiCi7_xRF?qT;hIkzBopyWLDg&N2XGg)0I$B*y71t!^9==!kKU~_H$8+(8
zr{$rW{+Z;?TEo!qlKIB(e3j^zz3(2fl+F6gc2DxfS02;bfpPlzyc-T&j@J|OY4h7!
zV{=?+sj5fGJ?-uM6L(r$oLKR+c*0aCW(}Dcc`TFkO#*LS5nJ{);$44J-?mnb8Fe#m
zx-?p4J(l)Ly7pZy<H5Uit(M*~CX$m5Gf3vAw48HSH0tHy>N}xgF7Twf^~iz^mV3Ir
zv{xNHaqYWv+m&6PTyG|SlRhwgdsSMmi$c(?Rw+G|n|Jq%l`P=NdSU8ymhHg882ts)
zSiJo{%)h4Vy?DZl6RZ!KS+!dIXMFC|DX}#CTU5!wJwN7n$#W4Mo{78W8f|0aR@QPj
zFkPna$pJw(ec4Q=xSci3+^2&?i>5tGP<&R^8((EHKR&x(^?FsU!=mQEyZ>{-A2jU_
zoOLI9uH7e(#}cVc-YXK@)6#<SUM^U+L)3HDrsap@rv7^}@j!W3xXLe4Imy?Btg~vG
zU4EEY?YresGUw2@-kx0@-6rW77j({YTXKe7yw78ub0LLYRlZha$NuQ0ydpWp3g_aE
zI=ozvpe!Whlfv<LkH!ao1&$gQOV{H@&m`qu_~!C`l$cl0b8+F58@boF<X=;5{g*T4
zo+tmS9dWm8W_KA^oi@JFaqZ+4=`CIN<;%C#mpgo7=6HSnv0usVcwlm3@O1TaS?83{
F1OVM|zP<ne

literal 0
HcmV?d00001

diff --git a/res/mac-tray-light.png b/res/mac-tray-light.png
index f723d980e594a0042a9a94aac6aef9127ec3bf8c..ad8bfa3960d06e2b108f7fe4cab95a89a481a38a 100644
GIT binary patch
literal 270
zcmV+p0rCEcP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e0002hNkl<Zc-mdi
z1E?JU7(n5FcAOPw+qP|Hx6Ea?++Dm$vu);iX<pX&?Dt*s%RZebu-qlTO)=Xa*KCY(
z1~>!QVmsiLL6M`kmw-+SEK%^$z{rpQTs1w?%yb@bF(QoD4o*fHCjbk>Dey>_sNgO*
z9o~aoQN>>HF*Ja&QN?8NKQw_cQN=`16Mlf5QN>R1DVzh>qlzma88!fpL>b2ct0Tfg
z&>@j4F-}q^xEUFS`3dMS*Fv3u&xS>g(Ov<zIskZPc$DboxTpS^W4d2%+gCW70`#gD
UZIX}hrT_o{07*qoM6N<$f?>jN#{d8T

literal 810
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sivoN?T!Hle!3|jS%9?<#G%X48
z3ua*X{r>rPkH?m}pC4S`E^%>RVX83C>l269ubw}>Eh{EOljH8WiLK=cY6?qh?G5?4
zdUO1`oXWiCi7_xRF?qT;hIkzBopyWLDg&N2XGg)0I$B*y71t!^9==!kKU~_H$8+(8
zr{$rW{+Z;?TEo!qlKIB(e3j^zz3(2fl+F6gc2DxfS02;bfpPlzyc-T&j@J|OY4h7!
zV{=?+sj5fGJ?-uM6L(r$oLKR+c*0aCW(}Dcc`TFkO#*LS5nJ{);$44J-?mnb8Fe#m
zx-?p4J(l)Ly7pZy<H5Uit(M*~CX$m5Gf3vAw48HSH0tHy>N}xgF7Twf^~iz^mV3Ir
zv{xNHaqYWv+m&6PTyG|SlRhwgdsSMmi$c(?Rw+G|n|Jq%l`P=NdSU8ymhHg882ts)
zSiJo{%)h4Vy?DZl6RZ!KS+!dIXMFC|DX}#CTU5!wJwN7n$#W4Mo{78W8f|0aR@QPj
zFkPna$pJw(ec4Q=xSci3+^2&?i>5tGP<&R^8((EHKR&x(^?FsU!=mQEyZ>{-A2jU_
zoOLI9uH7e(#}cVc-YXK@)6#<SUM^U+L)3HDrsap@rv7^}@j!W3xXLe4Imy?Btg~vG
zU4EEY?YresGUw2@-kx0@-6rW77j({YTXKe7yw78ub0LLYRlZha$NuQ0ydpWp3g_aE
zI=ozvpe!Whlfv<LkH!ao1&$gQOV{H@&m`qu_~!C`l$cl0b8+F58@boF<X=;5{g*T4
zo+tmS9dWm8W_KA^oi@JFaqZ+4=`CIN<;%C#mpgo7=6HSnv0usVcwlm3@O1TaS?83{
F1OVM|zP<ne

diff --git a/src/platform/macos.mm b/src/platform/macos.mm
index c25a854cc..789404cb6 100644
--- a/src/platform/macos.mm
+++ b/src/platform/macos.mm
@@ -34,3 +34,9 @@ extern "C" bool InputMonitoringAuthStatus(bool prompt) {
     }
     return false;
 }
+
+extern "C" float BackingScaleFactor() {
+    NSScreen* s = [NSScreen mainScreen];
+    if (s) return [s backingScaleFactor];
+    return 1;
+}
diff --git a/src/platform/macos.rs b/src/platform/macos.rs
index 204993c13..165470cac 100644
--- a/src/platform/macos.rs
+++ b/src/platform/macos.rs
@@ -541,7 +541,6 @@ pub fn is_installed() -> bool {
 }
 
 pub fn quit_gui() {
-    use cocoa::appkit::NSApp;
     unsafe {
         let () = msg_send!(NSApp(), terminate: nil);
     };
diff --git a/src/tray.rs b/src/tray.rs
index 98a4127a3..2ee423a9f 100644
--- a/src/tray.rs
+++ b/src/tray.rs
@@ -206,17 +206,28 @@ fn is_service_stopped() -> bool {
 
 #[cfg(target_os = "macos")]
 pub fn make_tray() {
+    extern "C" {
+        fn BackingScaleFactor() -> f32;
+    }
+    let f = unsafe { BackingScaleFactor() };
     use tray_item::TrayItem;
     let mode = dark_light::detect();
-    let icon_path;
-    match mode {
+    let icon_path = match mode {
         dark_light::Mode::Dark => {
-            icon_path = "mac-tray-light.png";
+            if f > 1. {
+                "mac-tray-light_x2.png";
+            } else {
+                "mac-tray-light.png";
+            }
         }
         dark_light::Mode::Light => {
-            icon_path = "mac-tray-dark.png";
+            if f > 1. {
+                "mac-tray-dark_x2.png";
+            } else {
+                "mac-tray-dark.png";
+            }
         }
-    }
+    };
     if let Ok(mut tray) = TrayItem::new(&crate::get_app_name(), icon_path) {
         tray.add_label(&format!(
             "{} {}",