diff --git a/extras/package/macosx/Resources/English.lproj/MainMenu.xib b/extras/package/macosx/Resources/English.lproj/MainMenu.xib index c34d17898b..6fb61b27c6 100644 --- a/extras/package/macosx/Resources/English.lproj/MainMenu.xib +++ b/extras/package/macosx/Resources/English.lproj/MainMenu.xib @@ -22,15 +22,15 @@ YES - - - + + + YES @@ -7981,6 +7981,14 @@ LCAuLi4 5006 + + + o_dropzone_box + + + + 5007 + @@ -12863,7 +12871,7 @@ LCAuLi4 - 5006 + 5007 @@ -15845,6 +15853,17 @@ LCAuLi4 VLCDetachedVideoWindow NSWindow + + customZoom: + id + + + customZoom: + + customZoom: + id + + IBDocumentRelativeSource ../../../../../modules/gui/macosx/MainWindow.h @@ -17209,6 +17228,7 @@ LCAuLi4 o_detached_time_sld_fancygradient_view o_detached_titlebar_view o_detached_video_window + o_dropzone_box o_dropzone_btn o_dropzone_lbl o_dropzone_view @@ -17264,6 +17284,7 @@ LCAuLi4 id id id + id VLCFSPanel id id @@ -17314,6 +17335,7 @@ LCAuLi4 o_detached_time_sld_fancygradient_view o_detached_titlebar_view o_detached_video_window + o_dropzone_box o_dropzone_btn o_dropzone_lbl o_dropzone_view @@ -17413,6 +17435,10 @@ LCAuLi4 o_detached_video_window id + + o_dropzone_box + id + o_dropzone_btn id diff --git a/modules/gui/macosx/MainWindow.h b/modules/gui/macosx/MainWindow.h index 7839551d2a..cbd7baea1d 100644 --- a/modules/gui/macosx/MainWindow.h +++ b/modules/gui/macosx/MainWindow.h @@ -66,6 +66,7 @@ IBOutlet id o_dropzone_view; IBOutlet id o_dropzone_btn; IBOutlet id o_dropzone_lbl; + IBOutlet id o_dropzone_box; IBOutlet VLCFSPanel *o_fspanel; IBOutlet id o_titlebar_view; diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m index 5938fbef7a..1373befd38 100644 --- a/modules/gui/macosx/MainWindow.m +++ b/modules/gui/macosx/MainWindow.m @@ -633,6 +633,13 @@ static VLCMainWindow *_o_sharedInstance = nil; plrect = [[o_playlist_table animator] frame]; plrect.size.height = i_lastSplitViewHeight - 19.0; // actual pl top bar height, which differs from its frame [[o_playlist_table animator] setFrame: plrect]; + + NSRect rightSplitRect; + rightSplitRect = [o_right_split_view frame]; + plrect = [[o_dropzone_box animator] frame]; + plrect.origin.x = (rightSplitRect.size.width - plrect.size.width) / 2; + plrect.origin.y = (rightSplitRect.size.height - plrect.size.height) / 2; + [[o_dropzone_box animator] setFrame: plrect]; } - (IBAction)togglePlaylist:(id)sender @@ -1109,6 +1116,7 @@ static VLCMainWindow *_o_sharedInstance = nil; - (void)showSplitView { + [self updateWindow]; if (b_dark_interface) [self setContentMinSize:NSMakeSize( 604., 288. + [o_titlebar_view frame].size.height )]; else @@ -1122,7 +1130,6 @@ static VLCMainWindow *_o_sharedInstance = nil; [self setFrame: winrect display: YES animate: YES]; [self performSelector:@selector(resizePlaylistAfterCollapse) withObject: nil afterDelay:0.75]; - [self performSelector:@selector(updateWindow) withObject: nil afterDelay:0.3]; b_splitview_removed = NO; }