Mercurial > hg > openttd

changeset 20680:bee44b68965c draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
-Fix: [OSX] Mouse cursor wasn't displayed properly after switching to fullscreen on 10.7+. (Based on patch by Maedhros)
author Michael Lutz <michi@icosahedron.de>
date Tue, 26 Feb 2013 02:33:35 +0100
parents 390a9a434896
children eda0607222af
files src/video/cocoa/cocoa_v.h src/video/cocoa/cocoa_v.mm
diffstat 2 files changed, 9 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/video/cocoa/cocoa_v.h
+++ b/src/video/cocoa/cocoa_v.h
@@ -253,6 +253,7 @@
 - (void)setDriver:(CocoaSubdriver*)drv;
 
 - (BOOL)windowShouldClose:(id)sender;
+- (void)windowDidEnterFullScreen:(NSNotification *)aNotification;
 @end
 
 
--- a/src/video/cocoa/cocoa_v.mm
+++ b/src/video/cocoa/cocoa_v.mm
@@ -776,6 +776,14 @@
 {
 	driver->active = false;
 }
+/** Window entered fullscreen mode (10.7). */
+- (void)windowDidEnterFullScreen:(NSNotification *)aNotification
+{
+	NSPoint loc = [ driver->cocoaview convertPoint:[ [ aNotification object ] mouseLocationOutsideOfEventStream ] fromView:nil ];
+	BOOL inside = ([ driver->cocoaview hitTest:loc ] == driver->cocoaview);
+
+	if (inside) [ driver->cocoaview mouseEntered:NULL ];
+}
 
 @end