Commit aa7f483a authored by David Fuhrmann's avatar David Fuhrmann

vout_macosx: fix mouse position in vout for retina displays (close #11214)

parent a113b849
...@@ -770,24 +770,21 @@ static void OpenglSwap (vlc_gl_t *gl) ...@@ -770,24 +770,21 @@ static void OpenglSwap (vlc_gl_t *gl)
- (void)mouseMoved:(NSEvent *)o_event - (void)mouseMoved:(NSEvent *)o_event
{ {
NSPoint ml;
NSRect s_rect;
BOOL b_inside;
/* on HiDPI displays, the point bounds don't equal the actual pixel based bounds */ /* on HiDPI displays, the point bounds don't equal the actual pixel based bounds */
if (OSX_LION) NSPoint ml = [self convertPoint: [o_event locationInWindow] fromView: nil];
s_rect = [self convertRectToBacking:[self bounds]]; NSRect videoRect = [self bounds];
else BOOL b_inside = [self mouse: ml inRect: videoRect];
s_rect = [self bounds];
ml = [self convertPoint: [o_event locationInWindow] fromView: nil]; if (OSX_LION) {
b_inside = [self mouse: ml inRect: s_rect]; ml = [self convertPointToBacking: ml];
videoRect = [self convertRectToBacking: videoRect];
}
if (b_inside) { if (b_inside) {
@synchronized (self) { @synchronized (self) {
if (vd) { if (vd) {
vout_display_SendMouseMovedDisplayCoordinates(vd, ORIENT_NORMAL, vout_display_SendMouseMovedDisplayCoordinates(vd, ORIENT_NORMAL,
(int)ml.x, s_rect.size.height - (int)ml.y, (int)ml.x, videoRect.size.height - (int)ml.y,
&vd->sys->place); &vd->sys->place);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment