Commit a16d7de0 authored by Felix Paul Kühne's avatar Felix Paul Kühne

macosx/MainWindow: modernize getter

parent 0d05deab
...@@ -146,6 +146,7 @@ ...@@ -146,6 +146,7 @@
id o_current_video_window; id o_current_video_window;
} }
+ (VLCMainWindow *)sharedInstance; + (VLCMainWindow *)sharedInstance;
@property (readonly) BOOL fullscreen;
- (IBAction)play:(id)sender; - (IBAction)play:(id)sender;
- (IBAction)prev:(id)sender; - (IBAction)prev:(id)sender;
...@@ -165,7 +166,7 @@ ...@@ -165,7 +166,7 @@
- (IBAction)dropzoneButtonAction:(id)sender; - (IBAction)dropzoneButtonAction:(id)sender;
- (void)setTitle:(NSString *)title; - (void)setTitle:(NSString *)title;
- (void) customZoom:(id)sender; - (void)customZoom:(id)sender;
- (void)windowResizedOrMoved:(NSNotification *)notification; - (void)windowResizedOrMoved:(NSNotification *)notification;
- (void)showDropZone; - (void)showDropZone;
...@@ -198,7 +199,6 @@ ...@@ -198,7 +199,6 @@
/* fullscreen handling */ /* fullscreen handling */
- (void)showFullscreenController; - (void)showFullscreenController;
- (BOOL)isFullscreen;
- (void)lockFullscreenAnimation; - (void)lockFullscreenAnimation;
- (void)unlockFullscreenAnimation; - (void)unlockFullscreenAnimation;
- (void)enterFullscreen; - (void)enterFullscreen;
......
...@@ -2043,7 +2043,7 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -2043,7 +2043,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
[o_fspanel fadeIn]; [o_fspanel fadeIn];
} }
- (BOOL)isFullscreen - (BOOL)fullscreen
{ {
return b_fullscreen; return b_fullscreen;
} }
......
...@@ -268,7 +268,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -268,7 +268,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
// This is the result of [NSEvent standardMagnificationThreshold]. // This is the result of [NSEvent standardMagnificationThreshold].
// Unfortunately, this is a private API, currently. // Unfortunately, this is a private API, currently.
CGFloat f_threshold = 0.3; CGFloat f_threshold = 0.3;
BOOL b_fullscreen = [[VLCMainWindow sharedInstance] isFullscreen]; BOOL b_fullscreen = [[VLCMainWindow sharedInstance] fullscreen];
if( ( f_cumulated_magnification > f_threshold && !b_fullscreen ) || ( f_cumulated_magnification < -f_threshold && b_fullscreen ) ) if( ( f_cumulated_magnification > f_threshold && !b_fullscreen ) || ( f_cumulated_magnification < -f_threshold && b_fullscreen ) )
{ {
......
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