Commit 42444e4f authored by Felix Paul Kühne's avatar 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
parent b115a253
......@@ -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
......
......@@ -891,7 +891,6 @@ static VLCMainWindow *_o_sharedInstance = nil;
- (void)windowResizedOrMoved:(NSNotification *)notification
{
previousSavedFrame = [self frame];
[self saveFrameUsingName: [self frameAutosaveName]];
}
......
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment