From: Marc-Aurel Zent mzent@codeweavers.com
--- dlls/winemac.drv/cocoa_app.m | 2 +- dlls/winemac.drv/cocoa_window.m | 2 +- dlls/winemac.drv/macdrv_cocoa.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index c20f897d1b6..f57e4b2f27a 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1017,7 +1017,7 @@ - (void) setCursor NSDictionary* frame = cursorFrames[cursorFrame]; CGImageRef cgimage = (CGImageRef)frame[@"image"]; CGSize size = CGSizeMake(CGImageGetWidth(cgimage), CGImageGetHeight(cgimage)); - NSImage* image = [[NSImage alloc] initWithCGImage:cgimage size:NSSizeFromCGSize(cgsize_mac_from_win(size))]; + NSImage* image = [[NSImage alloc] initWithCGImage:cgimage size:NSSizeFromCGSize(cgsize_mac_from_win(size, retina_on))]; CFDictionaryRef hotSpotDict = (CFDictionaryRef)frame[@"hotSpot"]; CGPoint hotSpot;
diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index ddb769ff77a..a88a717dc2b 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -3640,7 +3640,7 @@ void macdrv_set_window_min_max_sizes(macdrv_window w, CGSize min_size, CGSize ma WineWindow* window = (WineWindow*)w;
OnMainThread(^{ - [window setWineMinSize:NSSizeFromCGSize(cgsize_mac_from_win(min_size)) maxSize:NSSizeFromCGSize(cgsize_mac_from_win(max_size))]; + [window setWineMinSize:NSSizeFromCGSize(cgsize_mac_from_win(min_size, retina_on)) maxSize:NSSizeFromCGSize(cgsize_mac_from_win(max_size, retina_on))]; }); }
diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index b78d1ca4b6e..d1225f65e05 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -185,9 +185,9 @@ static inline CGRect cgrect_win_from_mac(CGRect rect, int retina_scale) return rect; }
-static inline CGSize cgsize_mac_from_win(CGSize size) +static inline CGSize cgsize_mac_from_win(CGSize size, int retina_scale) { - if (retina_on) + if (retina_scale) { size.width /= 2; size.height /= 2;