RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-11 17:37:23 +00:00
Code Issues Releases Wiki Activity

window now save is old position when going in fullscreen or while using resize preset

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13819 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
nplourde 2004-10-30 19:56:41 +00:00
parent 40bcb850cf
commit 6ec468e599
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libvo/vo_quartz.c
View File

@ -10,7 +10,8 @@
MPlayer Mac OSX Quartz video out module. MPlayer Mac OSX Quartz video out module.
todo: -screen overlay output todo: -screen overlay output
-Add sub-option to select fullscreen resolution -clear window background after live resize
-fit osd in black bar when available
-RGB32 lost HW accel in fullscreen -RGB32 lost HW accel in fullscreen
-(add sugestion here) -(add sugestion here)
*/ */
@ -350,7 +351,6 @@ static OSStatus MainWindowCommandHandler(EventHandlerCallRef nextHandler, EventR
} }
SizeWindow(theWindow, (d_width/2), ((d_width/movie_aspect)/2)+border, 1); SizeWindow(theWindow, (d_width/2), ((d_width/movie_aspect)/2)+border, 1);
RepositionWindow(theWindow, NULL, kWindowCascadeOnMainScreen);
window_resized(); window_resized();
break; break;
@ -361,7 +361,6 @@ static OSStatus MainWindowCommandHandler(EventHandlerCallRef nextHandler, EventR
} }
SizeWindow(theWindow, d_width, (d_width/movie_aspect)+border, 1); SizeWindow(theWindow, d_width, (d_width/movie_aspect)+border, 1);
RepositionWindow(theWindow, NULL, kWindowCascadeOnMainScreen);
window_resized(); window_resized();
break; break;
@ -372,7 +371,6 @@ static OSStatus MainWindowCommandHandler(EventHandlerCallRef nextHandler, EventR
} }
SizeWindow(theWindow, (d_width*2), ((d_width/movie_aspect)*2)+border, 1); SizeWindow(theWindow, (d_width*2), ((d_width/movie_aspect)*2)+border, 1);
RepositionWindow(theWindow, NULL, kWindowCascadeOnMainScreen);
window_resized(); window_resized();
break; break;
@ -628,9 +626,8 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32
} }
//Show window //Show window
RepositionWindow(theWindow, NULL, kWindowCascadeOnMainScreen); RepositionWindow(theWindow, NULL, kWindowCenterOnMainScreen);
ShowWindow (theWindow); ShowWindow (theWindow);
SetPort(GetWindowPort(theWindow));
switch (image_format) switch (image_format)
{ {
@ -1190,8 +1187,7 @@ void window_resized()
//Clear Background //Clear Background
tmpBounds = CGRectMake( 0, border, winRect.right, winRect.bottom); tmpBounds = CGRectMake( 0, border, winRect.right, winRect.bottom);
CreateCGContextForPort(GetWindowPort(theWindow),&context); CreateCGContextForPort(GetWindowPort(theWindow),&context);
CGContextSetRGBFillColor(context, 0.0, 0.0, 0.0, 1.0); CGContextClearRect(context, tmpBounds);
CGContextFillRect(context, tmpBounds);
switch (image_format) switch (image_format)
{ {
@ -1262,6 +1258,7 @@ void window_fullscreen()
static Ptr restoreState = NULL; static Ptr restoreState = NULL;
RGBColor black={0,0,0}; RGBColor black={0,0,0};
GDHandle deviceHdl; GDHandle deviceHdl;
static Rect oldWinBounds;
//go fullscreen //go fullscreen
if(vo_fs) if(vo_fs)
@ -1286,7 +1283,10 @@ void window_fullscreen()
//save old window size //save old window size
if (!vo_quartz_fs) if (!vo_quartz_fs)
{
GetWindowPortBounds(theWindow, &oldWinRect); GetWindowPortBounds(theWindow, &oldWinRect);
GetWindowBounds(theWindow, kWindowContentRgn, &oldWinBounds);
}
//go fullscreen //go fullscreen
border = 0; border = 0;
@ -1319,7 +1319,7 @@ void window_fullscreen()
border = 20; border = 20;
ChangeWindowAttributes(theWindow, kWindowResizableAttribute, 0); ChangeWindowAttributes(theWindow, kWindowResizableAttribute, 0);
SizeWindow(theWindow, oldWinRect.right, oldWinRect.bottom,1); SizeWindow(theWindow, oldWinRect.right, oldWinRect.bottom,1);
RepositionWindow(theWindow, NULL, kWindowCascadeOnMainScreen); MoveWindow(theWindow, oldWinBounds.left, oldWinBounds.top, 1);
vo_quartz_fs = 0; vo_quartz_fs = 0;
} }