winemac: Scale cursors for Retina mode, now that user32 scales them with DPI.

When they were always 32x32, treating that size as though it were in Cocoa's virtual "points" rather than pixels produced good results even though it wasn't really correct. Signed-off-by: Ken Thomases <ken@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

winemac: Scale cursors for Retina mode, now that user32 scales them with DPI.
611c1595 · Ken Thomases · Alexandre Julliard · cbfa90c3 · 611c1595
Commit 611c1595 authored Jul 31, 2017 by Ken Thomases Committed by Alexandre Julliard Jul 31, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

cocoa_app.m dlls/winemac.drv/cocoa_app.m +3 -1

No files found.
--- a/dlls/winemac.drv/cocoa_app.m
+++ b/dlls/winemac.drv/cocoa_app.m
@@ -992,12 +992,14 @@ static NSString* WineLocalizedString(unsigned int stringID)
    {
        NSDictionary* frame = [cursorFrames objectAtIndex:cursorFrame];
        CGImageRef cgimage = (CGImageRef)[frame objectForKey:@"image"];
-        NSImage* image = [[NSImage alloc] initWithCGImage:cgimage size:NSZeroSize];
+        CGSize size = CGSizeMake(CGImageGetWidth(cgimage), CGImageGetHeight(cgimage));
+        NSImage* image = [[NSImage alloc] initWithCGImage:cgimage size:NSSizeFromCGSize(cgsize_mac_from_win(size))];
        CFDictionaryRef hotSpotDict = (CFDictionaryRef)[frame objectForKey:@"hotSpot"];
        CGPoint hotSpot;

        if (!CGPointMakeWithDictionaryRepresentation(hotSpotDict, &hotSpot))
            hotSpot = CGPointZero;
+        hotSpot = cgpoint_mac_from_win(hotSpot);
        self.cursor = [[[NSCursor alloc] initWithImage:image hotSpot:NSPointFromCGPoint(hotSpot)] autorelease];
        [image release];
        [self unhideCursor];