diff options
| author | nplourde <nplourde@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-07-03 12:24:48 +0000 |
|---|---|---|
| committer | nplourde <nplourde@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-07-03 12:24:48 +0000 |
| commit | 706952e30dff75e0af68483f8287ca620a3e8998 (patch) | |
| tree | 26b625929e99e186d52282762a8e7fa017713c0b /libvo | |
| parent | ff5fef698f4fdc9675a44cbc9755b020418b603c (diff) | |
| download | mpv-706952e30dff75e0af68483f8287ca620a3e8998.tar.bz2 mpv-706952e30dff75e0af68483f8287ca620a3e8998.tar.xz | |
fix various window resizing bug with menu option
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15903 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/vo_macosx.m | 20 | ||||
| -rw-r--r-- | libvo/vo_quartz.c | 7 |
2 files changed, 21 insertions, 6 deletions
diff --git a/libvo/vo_macosx.m b/libvo/vo_macosx.m index 16360440c6..69e97f65b3 100644 --- a/libvo/vo_macosx.m +++ b/libvo/vo_macosx.m @@ -477,15 +477,25 @@ static uint32_t control(uint32_t request, void *data, ...) [kPanScanCmd setState:NSOnState]; else [kPanScanCmd setState:NSOffState]; + + [self panscan]; } if(sender == kAspectOrgCmd) { movie_aspect = old_movie_aspect; - frame.size.width = d_width*winSizeMult; - frame.size.height = (d_width/movie_aspect)*winSizeMult; - [window setContentSize: frame.size]; - [self reshape]; + + 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 == kAspectFullCmd) @@ -705,7 +715,7 @@ static uint32_t control(uint32_t request, void *data, ...) } else { - SetSystemUIMode( kUIModeNormal, NULL); + SetSystemUIMode( kUIModeNormal, 0); isFullscreen = 0; ShowCursor(); diff --git a/libvo/vo_quartz.c b/libvo/vo_quartz.c index 1491db7359..4ed3bf842c 100644 --- a/libvo/vo_quartz.c +++ b/libvo/vo_quartz.c @@ -427,7 +427,10 @@ static OSStatus WindowEventHandler(EventHandlerCallRef nextHandler, EventRef eve case kAspectOrgCmd: movie_aspect = old_movie_aspect; - SizeWindow(theWindow, dstRect.right, (dstRect.right/movie_aspect),1); + if(!vo_quartz_fs) + { + SizeWindow(theWindow, dstRect.right, (dstRect.right/movie_aspect),1); + } window_resized(); break; @@ -452,6 +455,8 @@ static OSStatus WindowEventHandler(EventHandlerCallRef nextHandler, EventRef eve case kPanScanCmd: vo_panscan = (!(vo_panscan)); CheckMenuItem (aspectMenu, 2, vo_panscan); + window_panscan(); + window_resized(); break; default: |