RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-07 22:57:42 +00:00
Code Issues Releases Wiki Activity

keep window size when changing aspect

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15856 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
nplourde 2005-06-29 21:54:48 +00:00
parent 7d73ce2371
commit c60e560af2
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libvo/vo_macosx.h
View File

@ -31,6 +31,7 @@
GLfloat upperLeft[2];
BOOL mouseHide;
float winSizeMult;
//menu command id
NSMenuItem *kQuitCmd;

26
libvo/vo_macosx.m
View File

@ -288,6 +288,7 @@ static uint32_t control(uint32_t request, void *data, ...)
[window setTitle:@"MPlayer - The Movie Player"];
isFullscreen = 0;
winSizeMult = 1;
}
- (id) config
@ -359,7 +360,7 @@ static uint32_t control(uint32_t request, void *data, ...)
kDoubleScreenCmd = menuItem;
menuItem = [[NSMenuItem alloc] initWithTitle:@"Full Size" action:@selector(menuAction:) keyEquivalent:@"f"]; [menu addItem:menuItem];
kFullScreenCmd = menuItem;
menuItem = (NSMenuItem *)[NSMenuItem separatorItem]; [menu addItem:menuItem];
//menuItem = (NSMenuItem *)[NSMenuItem separatorItem]; [menu addItem:menuItem];
NSMenu *aspectMenu;
aspectMenu = [[NSMenu alloc] initWithTitle:@"Aspect Ratio"];
@ -424,8 +425,9 @@ static uint32_t control(uint32_t request, void *data, ...)
vo_fs = (!(vo_fs)); [self fullscreen:YES];
}
frame.size.width = (d_width/2);
frame.size.height = ((d_width/movie_aspect)/2);
winSizeMult = 0.5;
frame.size.width = (d_width*winSizeMult);
frame.size.height = ((d_width/movie_aspect)*winSizeMult);
[window setContentSize: frame.size];
[self reshape];
}
@ -435,6 +437,7 @@ static uint32_t control(uint32_t request, void *data, ...)
vo_fs = (!(vo_fs)); [self fullscreen:YES];
}
winSizeMult = 1;
frame.size.width = d_width;
frame.size.height = d_width/movie_aspect;
[window setContentSize: frame.size];
@ -446,8 +449,9 @@ static uint32_t control(uint32_t request, void *data, ...)
vo_fs = (!(vo_fs)); [self fullscreen:YES];
}
frame.size.width = d_width*2;
frame.size.height = (d_width/movie_aspect)*2;
winSizeMult = 2;
frame.size.width = d_width*winSizeMult;
frame.size.height = (d_width/movie_aspect)*winSizeMult;
[window setContentSize: frame.size];
[self reshape];
}
@ -478,8 +482,8 @@ static uint32_t control(uint32_t request, void *data, ...)
if(sender == kAspectOrgCmd)
{
movie_aspect = old_movie_aspect;
frame.size.width = d_width;
frame.size.height = d_width/movie_aspect;
frame.size.width = d_width*winSizeMult;
frame.size.height = (d_width/movie_aspect)*winSizeMult;
[window setContentSize: frame.size];
[self reshape];
}
@ -487,8 +491,8 @@ static uint32_t control(uint32_t request, void *data, ...)
if(sender == kAspectFullCmd)
{
movie_aspect = 4.0f/3.0f;
frame.size.width = d_width;
frame.size.height = d_width/movie_aspect;
frame.size.width = d_width*winSizeMult;
frame.size.height = (d_width/movie_aspect)*winSizeMult;
[window setContentSize: frame.size];
[self reshape];
}
@ -496,8 +500,8 @@ static uint32_t control(uint32_t request, void *data, ...)
if(sender == kAspectWideCmd)
{
movie_aspect = 16.0f/9.0f;
frame.size.width = d_width;
frame.size.height = d_width/movie_aspect;
frame.size.width = d_width*winSizeMult;
frame.size.height = (d_width/movie_aspect)*winSizeMult;
[window setContentSize: frame.size];
[self reshape];
}