Commit 7b80f575 authored by Felix Paul Kühne's avatar Felix Paul Kühne

macosx: implemented playback controls for the detached video window...

macosx: implemented playback controls for the detached video window (bwd/play/fwd, position, time, fullscreen)

2 things todo:

- get custom artwork for the fullscreen button

- implement window title when using the black ui mode
(cherry picked from commit 05a4b8a6f245d3487570dfee38bacad4a03175de)
parent 0afe7c38
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -71,6 +71,19 @@ ...@@ -71,6 +71,19 @@
IBOutlet id o_titlebar_view; IBOutlet id o_titlebar_view;
IBOutlet id o_resize_view; IBOutlet id o_resize_view;
IBOutlet id o_detached_play_btn;
IBOutlet id o_detached_fwd_btn;
IBOutlet id o_detached_bwd_btn;
IBOutlet id o_detached_fullscreen_btn;
IBOutlet id o_detached_time_fld;
IBOutlet id o_detached_time_sld;
IBOutlet id o_detached_time_sld_background;
IBOutlet id o_detached_progress_bar;
IBOutlet id o_detached_time_sld_fancygradient_view;
IBOutlet id o_detached_bottombar_view;
IBOutlet id o_detached_titlebar_view;
IBOutlet id o_detached_video_window;
BOOL b_dark_interface; BOOL b_dark_interface;
BOOL b_nativeFullscreenMode; BOOL b_nativeFullscreenMode;
BOOL b_video_playback_enabled; BOOL b_video_playback_enabled;
...@@ -101,7 +114,6 @@ ...@@ -101,7 +114,6 @@
BOOL just_triggered_previous; BOOL just_triggered_previous;
NSMutableArray *o_sidebaritems; NSMutableArray *o_sidebaritems;
VLCWindow * o_nonembedded_window;
BOOL b_nonembedded; BOOL b_nonembedded;
VLCWindow * o_fullscreen_window; VLCWindow * o_fullscreen_window;
...@@ -183,3 +195,11 @@ ...@@ -183,3 +195,11 @@
- (void)windowWillExitFullScreen:(NSNotification *)notification; - (void)windowWillExitFullScreen:(NSNotification *)notification;
@end @end
@interface VLCDetachedVideoWindow : NSWindow
{
}
- (BOOL)isFullscreen;
@end
This diff is collapsed.
...@@ -154,6 +154,7 @@ struct intf_sys_t ...@@ -154,6 +154,7 @@ struct intf_sys_t
- (void)setIntf:(intf_thread_t *)p_mainintf; - (void)setIntf:(intf_thread_t *)p_mainintf;
- (id)mainMenu; - (id)mainMenu;
- (id)mainWindow;
- (id)controls; - (id)controls;
- (id)bookmarks; - (id)bookmarks;
- (id)open; - (id)open;
......
...@@ -1563,6 +1563,11 @@ unsigned int CocoaKeyToVLC( unichar i_key ) ...@@ -1563,6 +1563,11 @@ unsigned int CocoaKeyToVLC( unichar i_key )
return o_mainmenu; return o_mainmenu;
} }
- (id)mainWindow
{
return o_mainwindow;
}
- (id)controls - (id)controls
{ {
if( o_controls ) if( o_controls )
......
...@@ -669,7 +669,7 @@ void _drawFrameInRect(NSRect frameRect) ...@@ -669,7 +669,7 @@ void _drawFrameInRect(NSRect frameRect)
- (void)drawRect:(NSRect)rect - (void)drawRect:(NSRect)rect
{ {
[(VLCMainWindow *)[self window] drawFancyGradientEffectForTimeSlider]; [[[VLCMain sharedInstance] mainWindow] drawFancyGradientEffectForTimeSlider];
msleep( 10000 ); //wait for the gradient to draw completely msleep( 10000 ); //wait for the gradient to draw completely
/* Draw default to make sure the slider behaves correctly */ /* Draw default to make sure the slider behaves correctly */
......
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