draggablePanel for multiple Vout Windows

modules/gui/macosx/VLCFSPanelController.h

@@ -63,11 +63,10 @@
 - (void)setActive;
 - (void)setNonActive;
 - (void)setVoutWasUpdated:(VLCWindow *)voutWindow;
+- (void)centerPanel; //Have to find a better alternative than to centering each time on resize/drag
 
 - (void)fixTitleBar;
 - (void)unFixTitleBar;
-- (void)showTitleBar;
-- (void)hideTitleBar;
 
 - (void)setSeekable:(BOOL)seekable;
 - (void)setVolumeLevel:(int)value;

modules/gui/macosx/VLCFSPanelController.m

@@ -238,7 +238,7 @@ static NSString *kAssociatedFullscreenRect = @"VLCFullscreenAssociatedWindowRect
     //Issue-3, the titleBar should be shown/hidden only for the respective window of FSPanel...
     _associatedVoutWindow.styleMask = NSTitledWindowMask | NSClosableWindowMask | NSResizableWindowMask
     | NSMiniaturizableWindowMask;
-    [self showTitleBar];
+//    [self showTitleBar];
     //[_associatedVoutWindow showControlsBar]; //It apparently does not have showControlsBar, because it is a NSWindow... would have to figure out a way to hide/show it
 }
 
@@ -247,12 +247,6 @@ static NSString *kAssociatedFullscreenRect = @"VLCFullscreenAssociatedWindowRect
     _associatedVoutWindow.styleMask |= NSFullSizeContentViewWindowMask;
 }
 
-- (void)showTitleBar
-{
-
-    [[[[_associatedVoutWindow standardWindowButton:NSWindowCloseButton] superview] animator] setAlphaValue:1];
-}
-
 - (void)hideTitleBar
 {
     [[[[_associatedVoutWindow standardWindowButton:NSWindowCloseButton] superview] animator] setAlphaValue:0];
@@ -446,7 +440,7 @@ static NSString *kAssociatedFullscreenRect = @"VLCFullscreenAssociatedWindowRect
         [self fadeOut];
         [self hideMouse];
 
-        //Issue-3
+        //Issue-3 //maybe not the right way to go about it. Why hide titleBars for all vout windows? and maybe this should not be a part of draggablepanel at all
         [[[VLCMain sharedInstance] voutProvider] updateDraggablePanelsUsingBlock:^(VLCFSPanelController *draggablepanel) {
             [draggablepanel hideTitleBar];
         }];

modules/gui/macosx/VLCFSPanelDraggableView.m

@@ -34,10 +34,12 @@
 
 - (void)mouseDown:(NSEvent *)event
 {
+    NSLog(@"mouseDown"); //Debug-Statement
     NSWindow *window = [self window];
     NSRect mouseLocationInWindow = {[event locationInWindow], {0,0}};
     NSPoint originalMouseLocation = [window convertRectToScreen:mouseLocationInWindow].origin;
     NSRect originalFrame = [window frame];
+    NSLog(@"%f",originalFrame.origin.x); //Debug-Statement
 
     while (YES)
     {

modules/gui/macosx/VLCMainWindow.m

@@ -215,9 +215,6 @@ static const float f_min_window_height = 307.;
     // Set that here as IB seems to be buggy
     [self setContentMinSize:NSMakeSize(604., f_min_window_height)];
 
-    _fspanel = [[VLCFSPanelController alloc] init];
-    [_fspanel showWindow:self];
-
     /* make sure we display the desired default appearance when VLC launches for the first time */
     if (![defaults objectForKey:@"VLCFirstRun"]) {
         [defaults setObject:[NSDate date] forKey:@"VLCFirstRun"];
@@ -371,7 +368,7 @@ static const float f_min_window_height = 307.;
 }
 
 // Show split view and hide the video view
-- (void)makeSplitViewVisible
+- (void)makeSplitViewVisible//making the playlist view visible
 {
     [self setContentMinSize: NSMakeSize(604., f_min_window_height)];
 
@@ -389,7 +386,7 @@ static const float f_min_window_height = 307.;
     [_splitView setHidden:NO];
     if (self.nativeFullscreenMode && [self fullscreen]) {
         [self showControlsBar];
-        [self.fspanel setNonActive];
+//        [self.fspanel setNonActive];
     }
 
     [self makeFirstResponder:_playlistScrollView];
@@ -404,7 +401,7 @@ static const float f_min_window_height = 307.;
     [self.videoView setHidden:NO];
     if (self.nativeFullscreenMode && [self fullscreen]) {
         [self hideControlsBar];
-        [self.fspanel setActive];
+//        [self.fspanel setActive];
     }
 
     if ([[self.videoView subviews] count] > 0)
@@ -415,7 +412,7 @@ static const float f_min_window_height = 307.;
 {
     // Beware, this code is really ugly
 
-    msg_Dbg(getIntf(), "toggle playlist from state: removed splitview %i, minimized view %i. Event %i", b_splitview_removed, b_minimized_view, event);
+    msg_Err(getIntf(), "toggle playlist from state: removed splitview %i, minimized view %i. Event %i", b_splitview_removed, b_minimized_view, event);
     if (![self isVisible] && event == psUserMenuEvent) {
         [self makeKeyAndOrderFront: nil];
         return;
@@ -473,7 +470,7 @@ static const float f_min_window_height = 307.;
         }
     }
 
-    msg_Dbg(getIntf(), "toggle playlist to state: removed splitview %i, minimized view %i", b_splitview_removed, b_minimized_view);
+    msg_Err(getIntf(), "toggle playlist to state: removed splitview %i, minimized view %i", b_splitview_removed, b_minimized_view);
 }
 
 - (IBAction)dropzoneButtonAction:(id)sender
@@ -484,8 +481,15 @@ static const float f_min_window_height = 307.;
 #pragma mark -
 #pragma mark overwritten default functionality
 
+- (void)windowDidMove:(NSNotification *)notification{
+    [[self draggablepanel] centerPanel];
+    msg_Err(getIntf(),"windowDidMove so I am re-centering the draggablepanel"); //Debug-Statement
+    NSLog(@"%f",[self frame].origin.x); //Debug-Statement
+}
+
 - (void)windowResizedOrMoved:(NSNotification *)notification
 {
+    //What is this for? It does not get trigger on neither resize nor move. And it does not seem to be in apple documentation
     [self saveFrameUsingName:[self frameAutosaveName]];
 }
 
@@ -570,7 +574,12 @@ static const float f_min_window_height = 307.;
 - (void)updateTimeSlider
 {
     [self.controlsBar updateTimeSlider];
-    [self.fspanel updatePositionAndTime];
+//    [[[[VLCMain sharedInstance] voutProvider] fspanel] updatePositionAndTime];
+    [self.draggablepanel updatePositionAndTime];
+
+    [[[VLCMain sharedInstance] voutProvider] updateDraggablePanelsUsingBlock:^(VLCFSPanelController *draggablepanel) {
+        [draggablepanel updatePositionAndTime];
+    }];
 
     [[[VLCMain sharedInstance] voutProvider] updateControlsBarsUsingBlock:^(VLCControlsBarCommon *controlsBar) {
         [controlsBar updateTimeSlider];
@@ -626,7 +635,12 @@ static const float f_min_window_height = 307.;
                 [o_window setTitle:aString];
             }];
 
-            [self.fspanel setStreamTitle: aString];
+//            [[[[VLCMain sharedInstance] voutProvider] fspanel] setStreamTitle: aString];
+            [self.draggablepanel setStreamTitle: aString];
+            [[[VLCMain sharedInstance] voutProvider] updateDraggablePanelsUsingBlock:^(VLCFSPanelController *draggablepanel) {
+                [draggablepanel setStreamTitle: aString];
+            }];
+
         } else {
             [self setTitle: _NS("VLC media player")];
             [self setRepresentedURL: nil];
@@ -658,8 +672,14 @@ static const float f_min_window_height = 307.;
     }
 
     [self updateTimeSlider];
-    if ([self.fspanel respondsToSelector:@selector(setSeekable:)])
-        [self.fspanel setSeekable: b_seekable];
+    if ([self.draggablepanel respondsToSelector:@selector(setSeekable:)])
+        [self.draggablepanel setSeekable: b_seekable];
+    [[[VLCMain sharedInstance] voutProvider] updateDraggablePanelsUsingBlock:^(VLCFSPanelController *draggablepanel) {
+        if ([draggablepanel respondsToSelector:@selector(setSeekable:)])
+            [draggablepanel setSeekable: b_seekable];
+    }];
+//    if ([ [ [[VLCMain sharedInstance] voutProvider] fspanel] respondsToSelector:@selector(setSeekable:) ])
+//        [[[[VLCMain sharedInstance] voutProvider] fspanel] setSeekable: b_seekable];
 
     PL_LOCK;
     if ([[[[VLCMain sharedInstance] playlist] model] currentRootType] != ROOT_TYPE_PLAYLIST ||
@@ -676,27 +696,42 @@ static const float f_min_window_height = 307.;
 - (void)setPause
 {
     [self.controlsBar setPause];
-    [self.fspanel setPause];
+//    [[[[VLCMain sharedInstance] voutProvider] fspanel] setPause];
+    [self.draggablepanel setPause];
 
     [[[VLCMain sharedInstance] voutProvider] updateControlsBarsUsingBlock:^(VLCControlsBarCommon *controlsBar) {
         [controlsBar setPause];
     }];
+    [[[VLCMain sharedInstance] voutProvider] updateDraggablePanelsUsingBlock:^(VLCFSPanelController *draggablepanel) {
+        [draggablepanel setPause];
+    }];
 }
 
 - (void)setPlay
 {
     [self.controlsBar setPlay];
-    [self.fspanel setPlay];
+    [self.draggablepanel setPlay];
+//    [[[[VLCMain sharedInstance] voutProvider] fspanel] setPlay];
 
     [[[VLCMain sharedInstance] voutProvider] updateControlsBarsUsingBlock:^(VLCControlsBarCommon *controlsBar) {
         [controlsBar setPlay];
     }];
+    [[[VLCMain sharedInstance] voutProvider] updateDraggablePanelsUsingBlock:^(VLCFSPanelController *draggablepanel) {
+        [draggablepanel setPlay];
+    }];
 }
 
 - (void)updateVolumeSlider
 {
     [(VLCMainWindowControlsBar *)[self controlsBar] updateVolumeSlider];
-    [self.fspanel setVolumeLevel:[[VLCCoreInteraction sharedInstance] volume]];
+//    [self.fspanel setVolumeLevel:[[VLCCoreInteraction sharedInstance] volume]];
+    [self.draggablepanel setVolumeLevel:[[VLCCoreInteraction sharedInstance] volume]];
+    [[[VLCMain sharedInstance] voutProvider] updateDraggablePanelsUsingBlock:^(VLCFSPanelController *draggablepanel) {
+        [draggablepanel setVolumeLevel:[[VLCCoreInteraction sharedInstance] volume]];
+    }];
+//    msg_Err(getIntf(), "DAX WAS HERE #10 updateVolumeSlider");
+//    [[[[VLCMain sharedInstance] voutProvider] fspanel] setVolumeLevel:[[VLCCoreInteraction sharedInstance] volume] ];
+
 }
 
 #pragma mark -
@@ -718,14 +753,9 @@ static const float f_min_window_height = 307.;
         msg_Err(getIntf(), "Going from VIDEO TO PLAYLIST");//Debug-Statement
         NSLog(@"Active Video: %hhd, setting Titled Window",b_videoPlayback);//Debug-Statement
         //Issue-3
-        //        self.styleMask = NSTitledWindowMask | NSClosableWindowMask | NSResizableWindowMask
-        //        | NSMiniaturizableWindowMask;
-        //        [[[[[[VLCMain sharedInstance] mainWindow] standardWindowButton:NSWindowCloseButton] superview] animator] setAlphaValue:1];
-        //        [self showControlsBar];
-
-        [[[VLCMain sharedInstance] voutProvider] updateDraggablePanelsUsingBlock:^(VLCFSPanelController *draggablepanel) {
-            [draggablepanel fixTitleBar];
-        }];
+        self.styleMask = NSTitledWindowMask | NSClosableWindowMask | NSResizableWindowMask | NSMiniaturizableWindowMask;
+        [[[[[[VLCMain sharedInstance] mainWindow] standardWindowButton:NSWindowCloseButton] superview] animator] setAlphaValue:1];
+        [self showControlsBar];
 
 
         if (!self.nonembedded && (!self.nativeFullscreenMode || (self.nativeFullscreenMode && !self.fullscreen)) && frameBeforePlayback.size.width > 0 && frameBeforePlayback.size.height > 0) {
@@ -757,11 +787,9 @@ static const float f_min_window_height = 307.;
     }
     else{
         NSLog(@"Active Video: %hhd, setting FullSize Window",b_videoPlayback);//Debug-Statement
-        //        self.styleMask |= NSFullSizeContentViewWindowMask;
-        //        [self hideControlsBar];
-        [[[VLCMain sharedInstance] voutProvider] updateDraggablePanelsUsingBlock:^(VLCFSPanelController *draggablepanel) {
-            [draggablepanel unFixTitleBar];
-        }];
+//        self.styleMask |= NSFullSizeContentViewWindowMask;
+//        [self hideControlsBar];
+
     }
 }
 
@@ -770,15 +798,11 @@ static const float f_min_window_height = 307.;
 
 - (void)showFullscreenController
 {
-    id currentWindow = [NSApp keyWindow];
-    if ([currentWindow respondsToSelector:@selector(hasActiveVideo)] && [currentWindow hasActiveVideo]) {
-        if ([currentWindow respondsToSelector:@selector(fullscreen)] && [currentWindow fullscreen] && ![[currentWindow videoView] isHidden]) {
-
-            if ([[VLCMain sharedInstance] activeVideoPlayback])
-                [self.fspanel fadeIn];
-        }
-    }
-
+    //see if we need it...
+//    id currentWindow = [NSApp keyWindow];
+//    if ([currentWindow respondsToSelector:@selector(hasActiveVideo)] && [currentWindow hasActiveVideo]) {
+//        [self.draggablepanel setActive];
+//    }
 }
 
 #pragma mark -
@@ -811,6 +835,10 @@ static const float f_min_window_height = 307.;
 
 - (void)mainSplitViewDidResizeSubviews:(id)object
 {
+    [[self draggablepanel] centerPanel];
+    msg_Err(getIntf(),"Heyyy, I am trying");
+    NSLog(@"%f",[self frame].origin.x); //Debug-Statement
+
     f_lastLeftSplitViewWidth = [_splitViewLeft frame].size.width;
     [[[VLCMain sharedInstance] mainMenu] updateSidebarMenuItem: ![_splitView isSubviewCollapsed:_splitViewLeft]];
 }
@@ -1235,6 +1263,19 @@ static const float f_min_window_height = 307.;
     [self setAcceptsMouseMovedEvents: YES];
 
     [self setContentMinSize: NSMakeSize(363., f_min_video_height + [[self controlsBar] height])];
+    self.styleMask |= NSFullSizeContentViewWindowMask;//alternative placement. Stilll does hang the player while quitting //Issue-3
+}
+
+
+- (void)windowDidMove:(NSNotification *)notification{
+    [[self draggablepanel] centerPanel];
+    msg_Err(getIntf(),"VOUT windowDidMove so I am re-centering the draggablepanel"); //Debug-Statement
+    //    NSLog(@"%f",[self frame].origin.x); //Debug-Statement
+}
+
+- (void)windowDidResize:(NSNotification *)notification{
+    [[self draggablepanel] centerPanel];
+    msg_Err(getIntf(),"VOUT windowDidResize so I am re-centering the draggablepanel"); //Debug-Statement
 }
 
 @end

modules/gui/macosx/VLCVideoOutputProvider.h

@@ -26,6 +26,7 @@
 
 #import <vlc_vout_window.h>
 #import "VLCKeyboardBacklightControl.h"
+#import "VLCFSPanelController.h"
 
 @class VLCControlsBarCommon;
 @class VLCVideoWindowCommon;
@@ -42,6 +43,7 @@
 - (void)setFullscreen:(int)i_full forWindow:(vout_window_t *)p_wnd withAnimation:(BOOL)b_animation;
 
 - (void)updateControlsBarsUsingBlock:(void (^)(VLCControlsBarCommon *controlsBar))block;
+- (void)updateDraggablePanelsUsingBlock: (void (^)(VLCFSPanelController *draggablepanel))block;
 - (void)updateWindowsUsingBlock:(void (^)(VLCVideoWindowCommon *o_window))windowUpdater;
 
 - (void)updateWindowLevelForHelperWindows:(NSInteger)i_level;

modules/gui/macosx/VLCVideoOutputProvider.m

@@ -368,6 +368,9 @@ void WindowClose(vout_window_t *p_wnd)
 
     [voutView setVoutThread:(vout_thread_t *)p_wnd->obj.parent];
     [newVideoWindow setHasActiveVideo: YES];
+//    newVideoWindow.styleMask |= NSFullSizeContentViewWindowMask;//would this be the right place for it? //Issue-3
+    [newVideoWindow hideControlsBar];
+
     [voutWindows setObject:newVideoWindow forKey:[NSValue valueWithPointer:p_wnd]];
 
     [[VLCMain sharedInstance] setActiveVideoPlayback: YES];
@@ -560,6 +563,18 @@ void WindowClose(vout_window_t *p_wnd)
     }];
 }
 
+- (void)updateDraggablePanelsUsingBlock: (void (^)(VLCFSPanelController *draggablepanel))block
+{
+    [voutWindows enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
+
+        if ([obj respondsToSelector:@selector(draggablepanel)]) {
+            VLCFSPanelController *o_draggablepanel = [obj draggablepanel];
+            if (o_draggablepanel && block)
+                block(o_draggablepanel);
+        }
+    }];
+}
+
 - (void)updateWindowsUsingBlock:(void (^)(VLCVideoWindowCommon *o_window))windowUpdater
 {
     [voutWindows enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {

modules/gui/macosx/VLCVideoWindowCommon.h

@@ -24,6 +24,7 @@
 
 #import <Cocoa/Cocoa.h>
 #import "VLCWindow.h"
+#import "VLCFSPanelController.h"
 
 @class VLCVoutView;
 
@@ -47,6 +48,7 @@ static const float f_min_video_height = 70.0;
 @property (readonly) BOOL windowShouldExitFullscreenWhenFinished;
 @property (readwrite, assign) NSRect previousSavedFrame;
 @property (nonatomic, readwrite, assign) NSSize nativeVideoSize;
+@property (readonly) VLCFSPanelController* draggablepanel;
 
 - (void)setWindowLevel:(NSInteger)i_state;
 - (void)resizeWindow;

modules/gui/macosx/VLCVideoWindowCommon.m

@@ -80,6 +80,12 @@
 
 - (void)awakeFromNib
 {
+    _draggablepanel = [[VLCFSPanelController alloc] init];
+    [_draggablepanel showWindow:self];
+    [[self draggablepanel] setVoutWasUpdated:self];
+//    [self.draggablepanel setActive]; //doubtful
+    NSLog(@"AWAKEFROMNIB in VLCVideoWindowCommon"); //Debug-Statement
+
     BOOL b_nativeFullscreenMode = var_InheritBool(getIntf(), "macosx-nativefullscreenmode");
 
     if (b_nativeFullscreenMode) {
@@ -377,17 +383,22 @@
     [super becomeKeyWindow];
 
     // change fspanel state for the case when multiple windows are in fullscreen
-    if ([self hasActiveVideo] && [self fullscreen])
-        [[[[VLCMain sharedInstance] mainWindow] fspanel] setActive];
-    else
-        [[[[VLCMain sharedInstance] mainWindow] fspanel] setNonActive];
+    //I am not sure what this means... earlier there was just one fspanel...
+
+    //removing it for now, as it is creating an error: when video is played in a separate Vout window then the controller on ML/Playlist window becomes active when the Vout window becomes keyWindow
+//    NSLog(@"becomeKeyWindow and activeVideo %hhd", [self hasActiveVideo]);
+//    if ([self hasActiveVideo])
+//        [[[[VLCMain sharedInstance] mainWindow] draggablepanel] setActive];
+//    else
+//        [[[[VLCMain sharedInstance] mainWindow] draggablepanel] setNonActive];
 }
 
 - (void)resignKeyWindow
 {
     [super resignKeyWindow];
 
-    [[[[VLCMain sharedInstance] mainWindow] fspanel] setNonActive];
+    //This file is for all the video windows right? Then how do I know whether mainWindow has resigned as KeyWindow or is it some other vout window? because, I will have to set Not Active that particular window's draggablepanel. Right?
+    [[[[VLCMain sharedInstance] mainWindow] draggablepanel] setNonActive];
 }
 
 -(NSArray*)customWindowsToEnterFullScreenForWindow:(NSWindow *)window
@@ -472,11 +483,12 @@
     [self setFullscreen: YES];
     _inFullscreenTransition = NO;
 
-    if ([self hasActiveVideo]) {
-        [[[[VLCMain sharedInstance] mainWindow] fspanel] setVoutWasUpdated:self];
-        if (![_videoView isHidden])
-            [[[[VLCMain sharedInstance] mainWindow] fspanel] setActive];
-    }
+    //Would I need to do something here? #check
+//    if ([self hasActiveVideo]) {
+//        [[[[VLCMain sharedInstance] mainWindow] fspanel] setVoutWasUpdated:self];
+//        if (![_videoView isHidden])
+//            [[[[VLCMain sharedInstance] mainWindow] fspanel] setActive];
+//    }
 
     NSArray *subviews = [[self videoView] subviews];
     NSUInteger count = [subviews count];
@@ -503,7 +515,6 @@
     }
 
     [NSCursor setHiddenUntilMouseMoves: NO];
-    [[[[VLCMain sharedInstance] mainWindow] fspanel] setNonActive];
 
     if (![_videoView isHidden]) {
         [self showControlsBar];
@@ -684,9 +695,7 @@
     [o_fullscreen_window makeKeyWindow];
     [o_fullscreen_window setAcceptsMouseMovedEvents: YES];
 
-    /* tell the fspanel to move itself to front next time it's triggered */
-    [[[[VLCMain sharedInstance] mainWindow] fspanel] setVoutWasUpdated:o_fullscreen_window];
-    [[[[VLCMain sharedInstance] mainWindow] fspanel] setActive];
+    [[[[VLCMain sharedInstance] mainWindow] draggablepanel] setVoutWasUpdated:o_fullscreen_window]; //fix
 
     if ([self isVisible])
         [self orderOut: self];
@@ -715,7 +724,6 @@
         return;
     }
 
-    [[[[VLCMain sharedInstance] mainWindow] fspanel] setNonActive];
     [[o_fullscreen_window screen] setNonFullscreenPresentationOptions];
 
     if (o_fullscreen_anim1) {

modules/gui/macosx/VLCVoutView.m

@@ -229,19 +229,11 @@
 {
     NSPoint ml = [self convertPoint: [o_event locationInWindow] fromView: nil];
     if ([self mouse: ml inRect: [self bounds]]){
-        //NSLog(@"VLCVoutView mouseMoved");//Debug-Statement
+        // NSLog(@"VLCVoutView mouseMoved");//Debug-Statement
         //It is triggered only in the Video Playing windows, not Playlist view, which is perfect
 
-        //Issue-3
-//        [[[[[[VLCMain sharedInstance] mainWindow] standardWindowButton:NSWindowCloseButton] superview] animator] setAlphaValue:1];
-        [[[VLCMain sharedInstance] voutProvider] updateDraggablePanelsUsingBlock:^(VLCFSPanelController *draggablepanel) {
-            [draggablepanel showTitleBar];
-        }];
-
-        //[[VLCMain sharedInstance] mainWindow].titlebarAppearsTransparent = false;//<seems unneccesary
-
-
-        [[VLCMain sharedInstance] showFullscreenController];
+        [[[[((VLCVideoWindowCommon*)self.window) standardWindowButton:NSWindowCloseButton] superview] animator] setAlphaValue:1]; //Issue-3
+        [[((VLCVideoWindowCommon*)self.window) draggablepanel] setActive];
     }
 
     [super mouseMoved: o_event];