From: Marc-Aurel Zent mzent@codeweavers.com
--- dlls/winemac.drv/cocoa_app.m | 8 ++++---- dlls/winemac.drv/cocoa_event.m | 2 +- dlls/winemac.drv/cocoa_status_item.m | 4 ++-- dlls/winemac.drv/cocoa_window.m | 4 ++-- dlls/winemac.drv/macdrv_cocoa.h | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index a9cb75bf7d1..2105d09903f 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1448,7 +1448,7 @@ - (void) handleMouseMove:(NSEvent*)anEvent { if (self.clippingCursor) [clipCursorHandler clipCursorLocation:&point]; - point = cgpoint_win_from_mac(point); + point = cgpoint_win_from_mac(point, retina_on);
event = macdrv_create_event(MOUSE_MOVED_ABSOLUTE, targetWindow); event->mouse_moved.x = floor(point.x); @@ -1593,7 +1593,7 @@ - (void) handleMouseButton:(NSEvent*)theEvent { macdrv_event* event;
- pt = cgpoint_win_from_mac(pt); + pt = cgpoint_win_from_mac(pt, retina_on);
event = macdrv_create_event(MOUSE_BUTTON, window); event->mouse_button.button = [theEvent buttonNumber]; @@ -1676,7 +1676,7 @@ - (void) handleScrollWheel:(NSEvent*)theEvent double x, y; BOOL continuous = FALSE;
- pt = cgpoint_win_from_mac(pt); + pt = cgpoint_win_from_mac(pt, retina_on);
event = macdrv_create_event(MOUSE_SCROLL, window); event->mouse_scroll.x = floor(pt.x); @@ -2533,7 +2533,7 @@ int macdrv_get_cursor_position(CGPoint *pos) OnMainThread(^{ NSPoint location = [NSEvent mouseLocation]; location = [[WineApplicationController sharedController] flippedMouseLocation:location]; - *pos = cgpoint_win_from_mac(NSPointToCGPoint(location)); + *pos = cgpoint_win_from_mac(NSPointToCGPoint(location), retina_on); });
return TRUE; diff --git a/dlls/winemac.drv/cocoa_event.m b/dlls/winemac.drv/cocoa_event.m index 11dd9c3c784..59318191c2a 100644 --- a/dlls/winemac.drv/cocoa_event.m +++ b/dlls/winemac.drv/cocoa_event.m @@ -348,7 +348,7 @@ - (void) resetMouseEventPositions:(CGPoint)pos { MacDrvEvent* event;
- pos = cgpoint_win_from_mac(pos); + pos = cgpoint_win_from_mac(pos, retina_on);
[eventsLock lock];
diff --git a/dlls/winemac.drv/cocoa_status_item.m b/dlls/winemac.drv/cocoa_status_item.m index 31f8a668d81..8431a27493f 100644 --- a/dlls/winemac.drv/cocoa_status_item.m +++ b/dlls/winemac.drv/cocoa_status_item.m @@ -114,7 +114,7 @@ - (void) postMouseButtonEvent:(NSEvent*)nsevent; NSUInteger typeMask = NSEventMaskFromType([nsevent type]); CGPoint point = CGEventGetLocation([nsevent CGEvent]);
- point = cgpoint_win_from_mac(point); + point = cgpoint_win_from_mac(point, retina_on);
event = macdrv_create_event(STATUS_ITEM_MOUSE_BUTTON, nil); event->status_item_mouse_button.item = (macdrv_status_item)self; @@ -175,7 +175,7 @@ - (void) mouseMoved:(NSEvent*)nsevent macdrv_event* event; CGPoint point = CGEventGetLocation([nsevent CGEvent]);
- point = cgpoint_win_from_mac(point); + point = cgpoint_win_from_mac(point, retina_on);
event = macdrv_create_event(STATUS_ITEM_MOUSE_MOVE, nil); event->status_item_mouse_move.item = (macdrv_status_item)self; diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index a88a717dc2b..c77079a6b4a 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -3238,7 +3238,7 @@ - (NSDragOperation) draggingUpdated:(id <NSDraggingInfo>)sender { NSDragOperation ret; NSPoint pt = [[self contentView] convertPoint:[sender draggingLocation] fromView:nil]; - CGPoint cgpt = cgpoint_win_from_mac(NSPointToCGPoint(pt)); + CGPoint cgpt = cgpoint_win_from_mac(NSPointToCGPoint(pt), retina_on); NSPasteboard* pb = [sender draggingPasteboard];
macdrv_query* query = macdrv_create_query(); @@ -3261,7 +3261,7 @@ - (BOOL) performDragOperation:(id <NSDraggingInfo>)sender { BOOL ret; NSPoint pt = [[self contentView] convertPoint:[sender draggingLocation] fromView:nil]; - CGPoint cgpt = cgpoint_win_from_mac(NSPointToCGPoint(pt)); + CGPoint cgpt = cgpoint_win_from_mac(NSPointToCGPoint(pt), retina_on); NSPasteboard* pb = [sender draggingPasteboard];
macdrv_query* query = macdrv_create_query(); diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 870fcae6691..26102f6534c 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -218,9 +218,9 @@ static inline CGPoint cgpoint_mac_from_win(CGPoint point, int retina_scale) return point; }
-static inline CGPoint cgpoint_win_from_mac(CGPoint point) +static inline CGPoint cgpoint_win_from_mac(CGPoint point, int retina_scale) { - if (retina_on) + if (retina_scale) { point.x *= 2; point.y *= 2;