Commit 21445d78 authored by Felix Paul Kühne's avatar Felix Paul Kühne

* fspanel usability fixes (forward-port of [18077]) plus some further clean up

parent 7614e4ee
......@@ -177,7 +177,7 @@ static vlc_bool_t GetFiltersStatus( intf_thread_t *p_intf,
char *psz_bands, *psz_bands_init, *p_next;
vlc_bool_t b_2p;
int i;
vlc_bool_t b_enabled = GetFiltersStatus( p_intf, "equalizer" );
vlc_bool_t b_enabled = GetFiltersStatus( p_intf, (char *)"equalizer" );
vlc_object_t *p_object = vlc_object_find( p_intf,
VLC_OBJECT_AOUT, FIND_ANYWHERE );
......@@ -320,7 +320,7 @@ static vlc_bool_t GetFiltersStatus( intf_thread_t *p_intf,
- (IBAction)enable:(id)sender
{
ChangeFiltersString( VLCIntf, "equalizer", [sender state] );
ChangeFiltersString( VLCIntf, (char *)"equalizer", [sender state] );
}
- (IBAction)preampSliderUpdated:(id)sender
......
......@@ -30,6 +30,9 @@
BOOL b_keptVisible;
BOOL b_alreadyCounting;
int i_timeToKeepVisibleInSec;
BOOL b_displayed;
BOOL b_voutWasUpdated;
}
- (id)initWithContentRect: (NSRect)contentRect
styleMask: (unsigned int)aStyle
......@@ -61,6 +64,8 @@
- (void)mouseDown:(NSEvent *)theEvent;
- (void)mouseDragged:(NSEvent *)theEvent;
- (BOOL)isDisplayed;
- (void)setVoutWasUpdated;
@end
@interface VLCFSPanelView : NSView
......
......@@ -668,7 +668,6 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
vlc_value_t value_drawable;
int i_timeout;
id o_return = nil;
vout_thread_t * p_real_vout = [VLCVoutView getRealVout: p_vout];
var_Get( p_vout->p_libvlc, "drawable", &value_drawable );
......@@ -947,6 +946,14 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
if( p_vout->b_fullscreen )
{
/* move the FSPanel to front in case that it is currently shown
* this won't and is not supposed to work when it's fading right now */
if( [[[[VLCMain sharedInstance] getControls] getFSPanel] isDisplayed] )
[[[[VLCMain sharedInstance] getControls] getFSPanel] orderFront: self];
/* tell the fspanel to move itself to front next time it's triggered */
[[[[VLCMain sharedInstance] getControls] getFSPanel] setVoutWasUpdated];
CGDisplayFadeReservationToken token;
NSRect screen_rect = [o_screen frame];
screen_rect.origin.x = screen_rect.origin.y = 0;
......
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