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

mac scale factor of each screen (#8368)

Browse Source 
Signed-off-by: 21pages <sunboeasy@gmail.com>
This commit is contained in:
21pages 2024-06-16 12:01:41 +08:00 committed by GitHub
parent 12ff1319f1
commit 60ea8d2c2b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/scrap/src/quartz/display.rs
View File

@ -71,7 +71,7 @@ impl Display {
} }
pub fn scale(self) -> f64 { pub fn scale(self) -> f64 {
let s = unsafe { BackingScaleFactor() as _ }; let s = unsafe { BackingScaleFactor(self.0) as _ };
if s > 1. { if s > 1. {
let enable_retina = super::ENABLE_RETINA.lock().unwrap().clone(); let enable_retina = super::ENABLE_RETINA.lock().unwrap().clone();
if enable_retina { if enable_retina {

2
libs/scrap/src/quartz/ffi.rs
View File

@ -193,7 +193,7 @@ extern "C" {
pub fn CGDisplayIsOnline(display: u32) -> i32; pub fn CGDisplayIsOnline(display: u32) -> i32;
pub fn CGDisplayBounds(display: u32) -> CGRect; pub fn CGDisplayBounds(display: u32) -> CGRect;
pub fn BackingScaleFactor() -> f32; pub fn BackingScaleFactor(display: u32) -> f32;
// IOSurface // IOSurface

10
src/platform/macos.mm
View File

@ -109,9 +109,13 @@ extern "C" bool MacCheckAdminAuthorization() {
return Elevate(NULL, NULL); return Elevate(NULL, NULL);
} }
extern "C" float BackingScaleFactor() { extern "C" float BackingScaleFactor(uint32_t display) {
NSScreen* s = [NSScreen mainScreen]; display -= 1;
if (s) return [s backingScaleFactor]; NSArray<NSScreen *> *screens = [NSScreen screens];
if (display >= 0 && display < [screens count]) {
NSScreen* s = [screens objectAtIndex:display];
if (s) return [s backingScaleFactor];
}
return 1; return 1;
} }