comparison libvo/vo_macosx.m @ 15882:77aa290c726a

fix fullscreen menubar item behaviour

15881:ab6d02448e57

	}
	
	if(sender == kAspectFullCmd)
	{
		movie_aspect = 4.0f/3.0f;
		frame.size.width = d_width*winSizeMult;
		frame.size.height = (d_width/movie_aspect)*winSizeMult;
		[window setContentSize: frame.size];
		[self reshape];
	}
		
	if(sender == kAspectWideCmd)
	{
		movie_aspect = 16.0f/9.0f;
		frame.size.width = d_width*winSizeMult;
		frame.size.height = (d_width/movie_aspect)*winSizeMult;
		[window setContentSize: frame.size];
		[self reshape];
	}
}

/*
	Setup OpenGL

		GetTime(&d);
		DateToSeconds( &d, &curTime);
	
		if( ((curTime - lastTime) >= 5) || (lastTime == 0) )
		{
			HideMenuBar();
			HideCursor();
			mouseHide = YES;
			lastTime = curTime;
		}
	}

	//go fullscreen
	if(vo_fs)
	{
		if(!isRootwin)
		{
			//hide menubar and mouse if fullscreen on main display
			HideMenuBar();
			HideCursor();
			mouseHide = YES;
		}
		
		old_frame = [window frame];	//save main window size & position

		[self setNeedsDisplay:YES];
		[window setHasShadow:NO];
		isFullscreen = 1;
	}
	else
	{
		isFullscreen = 0;
		ShowMenuBar();
		ShowCursor();
		mouseHide = NO;

		//revert window to previous setting
		[self setFrame:old_view_frame];

*/
- (void) mouseMoved: (NSEvent *) theEvent
{
	if(isFullscreen && !isRootwin)
	{
		ShowMenuBar();
		ShowCursor();
		mouseHide = NO;
	}
}

15882:77aa290c726a

	}
	
	if(sender == kAspectFullCmd)
	{
		movie_aspect = 4.0f/3.0f;
		
		if(isFullscreen)
		{
			[self reshape];
		}
		else
		{
			frame.size.width = d_width*winSizeMult;
			frame.size.height = (d_width/movie_aspect)*winSizeMult;
			[window setContentSize: frame.size];
			[self reshape];
		}
	}
		
	if(sender == kAspectWideCmd)
	{
		movie_aspect = 16.0f/9.0f;

		if(isFullscreen)
		{
			[self reshape];
		}
		else
		{
			frame.size.width = d_width*winSizeMult;
			frame.size.height = (d_width/movie_aspect)*winSizeMult;
			[window setContentSize: frame.size];
			[self reshape];
		}
	}
}

/*
	Setup OpenGL

		GetTime(&d);
		DateToSeconds( &d, &curTime);
	
		if( ((curTime - lastTime) >= 5) || (lastTime == 0) )
		{
			HideCursor();
			mouseHide = YES;
			lastTime = curTime;
		}
	}

	//go fullscreen
	if(vo_fs)
	{
		if(!isRootwin)
		{
			SetSystemUIMode( kUIModeAllHidden, kUIOptionAutoShowMenuBar);
			HideCursor();
			mouseHide = YES;
		}
		
		old_frame = [window frame];	//save main window size & position

		[self setNeedsDisplay:YES];
		[window setHasShadow:NO];
		isFullscreen = 1;
	}
	else
	{	
		SetSystemUIMode( kUIModeNormal, NULL);
		
		isFullscreen = 0;
		ShowCursor();
		mouseHide = NO;

		//revert window to previous setting
		[self setFrame:old_view_frame];

*/
- (void) mouseMoved: (NSEvent *) theEvent
{
	if(isFullscreen && !isRootwin)
	{
		ShowCursor();
		mouseHide = NO;
	}
}