vlc | branch: master | Felix Paul Kühne <fe...@feepk.net> | Mon Jun 3 12:57:45 2019 +0200| [1e6859bcba7b8652abb64b7140452f4fc65d64ac] | committer: Felix Paul Kühne
macosx/playback UI: cosmetics > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1e6859bcba7b8652abb64b7140452f4fc65d64ac --- modules/gui/macosx/windows/mainwindow/VLCMainWindowControlsBar.h | 3 ++- modules/gui/macosx/windows/mainwindow/VLCMainWindowControlsBar.m | 1 + modules/gui/macosx/windows/video/VLCFSPanelController.h | 7 +++---- modules/gui/macosx/windows/video/VLCFSPanelController.m | 8 ++++++-- modules/gui/macosx/windows/video/VLCVideoOutputProvider.h | 2 -- modules/gui/macosx/windows/video/VLCVideoOutputProvider.m | 1 + modules/gui/macosx/windows/video/VLCVideoWindowCommon.h | 6 +----- modules/gui/macosx/windows/video/VLCVideoWindowCommon.m | 5 +++-- 8 files changed, 17 insertions(+), 16 deletions(-) diff --git a/modules/gui/macosx/windows/mainwindow/VLCMainWindowControlsBar.h b/modules/gui/macosx/windows/mainwindow/VLCMainWindowControlsBar.h index 8dfb54e335..a998fffdbb 100644 --- a/modules/gui/macosx/windows/mainwindow/VLCMainWindowControlsBar.h +++ b/modules/gui/macosx/windows/mainwindow/VLCMainWindowControlsBar.h @@ -23,9 +23,10 @@ #import <Cocoa/Cocoa.h> -#import "views/VLCVolumeSlider.h" #import "windows/mainwindow/VLCControlsBarCommon.h" +@class VLCVolumeSlider; + /***************************************************************************** * VLCMainWindowControlsBar * diff --git a/modules/gui/macosx/windows/mainwindow/VLCMainWindowControlsBar.m b/modules/gui/macosx/windows/mainwindow/VLCMainWindowControlsBar.m index f66d1ca27b..51fcf457c6 100644 --- a/modules/gui/macosx/windows/mainwindow/VLCMainWindowControlsBar.m +++ b/modules/gui/macosx/windows/mainwindow/VLCMainWindowControlsBar.m @@ -28,6 +28,7 @@ #import "main/VLCMain.h" #import "playlist/VLCPlaylistController.h" #import "playlist/VLCPlayerController.h" +#import "views/VLCVolumeSlider.h" /***************************************************************************** * VLCMainWindowControlsBar diff --git a/modules/gui/macosx/windows/video/VLCFSPanelController.h b/modules/gui/macosx/windows/video/VLCFSPanelController.h index 88e65ff9c0..a6c3bf96dc 100644 --- a/modules/gui/macosx/windows/video/VLCFSPanelController.h +++ b/modules/gui/macosx/windows/video/VLCFSPanelController.h @@ -25,10 +25,9 @@ #import <Cocoa/Cocoa.h> -#import "windows/video/VLCWindow.h" -#import "views/VLCDefaultValueSlider.h" -#import "views/VLCTimeField.h" -#import "views/VLCSlider.h" +@class VLCTimeField; +@class VLCSlider; +@class VLCDefaultValueSlider; extern NSString *VLCFSPanelShouldBecomeActive; extern NSString *VLCFSPanelShouldBecomeInactive; diff --git a/modules/gui/macosx/windows/video/VLCFSPanelController.m b/modules/gui/macosx/windows/video/VLCFSPanelController.m index 7db573123f..8b260cd07c 100644 --- a/modules/gui/macosx/windows/video/VLCFSPanelController.m +++ b/modules/gui/macosx/windows/video/VLCFSPanelController.m @@ -30,11 +30,16 @@ #import "playlist/VLCPlaylistController.h" #import "playlist/VLCPlayerController.h" #import "windows/video/VLCVideoWindowCommon.h" +#import "windows/video/VLCWindow.h" +#import "views/VLCDefaultValueSlider.h" +#import "views/VLCTimeField.h" +#import "views/VLCSlider.h" NSString *VLCFSPanelShouldBecomeActive = @"VLCFSPanelShouldBecomeActive"; NSString *VLCFSPanelShouldBecomeInactive = @"VLCFSPanelShouldBecomeInactive"; -@interface VLCFSPanelController () { +@interface VLCFSPanelController () +{ BOOL _isCounting; // Only used to track changes and trigger centering of FS panel @@ -45,7 +50,6 @@ NSString *VLCFSPanelShouldBecomeInactive = @"VLCFSPanelShouldBecomeInactive"; VLCPlaylistController *_playlistController; VLCPlayerController *_playerController; } - @end @implementation VLCFSPanelController diff --git a/modules/gui/macosx/windows/video/VLCVideoOutputProvider.h b/modules/gui/macosx/windows/video/VLCVideoOutputProvider.h index 6de04160b6..716ed439c8 100644 --- a/modules/gui/macosx/windows/video/VLCVideoOutputProvider.h +++ b/modules/gui/macosx/windows/video/VLCVideoOutputProvider.h @@ -25,8 +25,6 @@ #import <vlc_vout_window.h> -#import "os-integration/VLCKeyboardBacklightControl.h" - @class VLCControlsBarCommon; @class VLCVideoWindowCommon; @class VLCVoutView; diff --git a/modules/gui/macosx/windows/video/VLCVideoOutputProvider.m b/modules/gui/macosx/windows/video/VLCVideoOutputProvider.m index 5e77c1a85c..d9d6ce2026 100644 --- a/modules/gui/macosx/windows/video/VLCVideoOutputProvider.m +++ b/modules/gui/macosx/windows/video/VLCVideoOutputProvider.m @@ -34,6 +34,7 @@ #import "playlist/VLCPlaylistController.h" #import "playlist/VLCPlayerController.h" #import "library/VLCLibraryWindow.h" +#import "os-integration/VLCKeyboardBacklightControl.h" #import "panels/dialogs/VLCResumeDialogController.h" #import "panels/VLCVideoEffectsWindowController.h" diff --git a/modules/gui/macosx/windows/video/VLCVideoWindowCommon.h b/modules/gui/macosx/windows/video/VLCVideoWindowCommon.h index 89376c007c..dd3e073d25 100644 --- a/modules/gui/macosx/windows/video/VLCVideoWindowCommon.h +++ b/modules/gui/macosx/windows/video/VLCVideoWindowCommon.h @@ -27,13 +27,11 @@ extern NSString *VLCVideoWindowShouldShowFullscreenController; extern NSString *VLCVideoWindowDidEnterFullscreen; +extern const CGFloat VLCVideoWindowCommonMinimalHeight; @class VLCVoutView; - @class VLCControlsBarCommon; -extern const CGFloat VLCVideoWindowCommonMinimalHeight; - /***************************************************************************** * VLCVideoWindowCommon * @@ -56,8 +54,6 @@ extern const CGFloat VLCVideoWindowCommonMinimalHeight; - (NSRect)getWindowRectForProposedVideoViewSize:(NSSize)size; -- (void)setTitle:(NSString *)title; - /* fullscreen handling */ - (void)enterFullscreenWithAnimation:(BOOL)b_animation; - (void)leaveFullscreenWithAnimation:(BOOL)b_animation; diff --git a/modules/gui/macosx/windows/video/VLCVideoWindowCommon.m b/modules/gui/macosx/windows/video/VLCVideoWindowCommon.m index 8c69578096..311afe4f36 100644 --- a/modules/gui/macosx/windows/video/VLCVideoWindowCommon.m +++ b/modules/gui/macosx/windows/video/VLCVideoWindowCommon.m @@ -110,7 +110,7 @@ NSString *VLCVideoWindowDidEnterFullscreen = @"VLCVideoWindowDidEnterFullscreen" if (b_nativeFullscreenMode) { [self setCollectionBehavior: NSWindowCollectionBehaviorFullScreenPrimary]; - } else if (@available(macOS 10.11, *)) { + } else { // Native fullscreen seems to be default on El Capitan, this disables it explicitely [self setCollectionBehavior: NSWindowCollectionBehaviorFullScreenAuxiliary]; } @@ -900,9 +900,10 @@ NSString *VLCVideoWindowDidEnterFullscreen = @"VLCVideoWindowDidEnterFullscreen" [[[viewAnimations firstObject] objectForKey: NSViewAnimationEffectKey] isEqualToString:NSViewAnimationFadeInEffect]) { /* Fullscreen ended */ [self hasEndedFullscreen]; - } else + } else { /* Fullscreen started */ [self hasBecomeFullscreen]; + } } @end _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits