vlc/vlc-2.0 | branch: master | Felix Paul Kühne <[email protected]> | Thu Feb 9 13:07:32 2012 +0100| [e0a547b585ccdd1cec6926c92e406785e1e46c70] | committer: Felix Paul Kühne
macosx: fixed zooming the main window when using the black style (fixes #5998) also make sure that the hotkeys plugin displays the correct string when autoscaling the vout (cherry picked from commit 42444e4fa148bbf7ff177d15a927156e5d367f1f) > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=e0a547b585ccdd1cec6926c92e406785e1e46c70 --- modules/control/hotkeys.c | 2 +- modules/gui/macosx/MainWindow.m | 1 - modules/video_output/macosx.m | 11 ++++------- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c index 74e74f0..d606f27 100644 --- a/modules/control/hotkeys.c +++ b/modules/control/hotkeys.c @@ -573,7 +573,7 @@ static int PutAction( intf_thread_t *p_intf, int i_action ) { bool b_autoscale = !var_GetBool( p_vout, "autoscale" ); var_SetBool( p_vout, "autoscale", b_autoscale ); - if( b_autoscale ) + if( !b_autoscale ) DisplayMessage( p_vout, SPU_DEFAULT_CHANNEL, "%s", _("Scaled to screen") ); else diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m index 55ba301..37025a7 100644 --- a/modules/gui/macosx/MainWindow.m +++ b/modules/gui/macosx/MainWindow.m @@ -891,7 +891,6 @@ static VLCMainWindow *_o_sharedInstance = nil; - (void)windowResizedOrMoved:(NSNotification *)notification { - previousSavedFrame = [self frame]; [self saveFrameUsingName: [self frameAutosaveName]]; } diff --git a/modules/video_output/macosx.m b/modules/video_output/macosx.m index e32ad4f..9cc8671 100644 --- a/modules/video_output/macosx.m +++ b/modules/video_output/macosx.m @@ -328,22 +328,19 @@ static int Control (vout_display_t *vd, int query, va_list ap) } case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED: { - [[sys->glView window] performSelectorOnMainThread:@selector(zoom:) withObject: nil waitUntilDone:NO]; + [[sys->glView window] performSelectorOnMainThread:@selector(performZoom:) withObject: nil waitUntilDone:NO]; return VLC_SUCCESS; } case VOUT_DISPLAY_CHANGE_ZOOM: case VOUT_DISPLAY_CHANGE_SOURCE_ASPECT: case VOUT_DISPLAY_CHANGE_SOURCE_CROP: + case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE: { - return VLC_SUCCESS; - } - case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE: - { - [sys->glView performSelectorOnMainThread:@selector(reshapeView:) withObject:nil waitUntilDone:NO]; - if (!config_GetInt( vd, "macosx-video-autoresize" )) return VLC_SUCCESS; + [sys->glView performSelectorOnMainThread:@selector(reshapeView:) withObject:nil waitUntilDone:NO]; + NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init]; NSPoint topleftbase; NSPoint topleftscreen; _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
