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

macosx: fixed appearance issue when collapsing / expanding the playlist while...

macosx: fixed appearance issue when collapsing / expanding the playlist while it is empty (close #6382)
parent 219dd45d
......@@ -22,15 +22,15 @@
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="1617"/>
<integer value="915"/>
<integer value="4756"/>
<integer value="4596"/>
<integer value="4739"/>
<integer value="4722"/>
<integer value="2770"/>
<integer value="2730"/>
<integer value="29"/>
<integer value="915"/>
<integer value="4850"/>
<integer value="4948"/>
<integer value="4756"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
......@@ -7981,6 +7981,14 @@ LCAuLi4</string>
</object>
<int key="connectionID">5006</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_dropzone_box</string>
<reference key="source" ref="498338108"/>
<reference key="destination" ref="83235998"/>
</object>
<int key="connectionID">5007</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
......@@ -12863,7 +12871,7 @@ LCAuLi4</string>
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">5006</int>
<int key="maxID">5007</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
......@@ -15845,6 +15853,17 @@ LCAuLi4</string>
<object class="IBPartialClassDescription">
<string key="className">VLCDetachedVideoWindow</string>
<string key="superclassName">NSWindow</string>
<object class="NSMutableDictionary" key="actions">
<string key="NS.key.0">customZoom:</string>
<string key="NS.object.0">id</string>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<string key="NS.key.0">customZoom:</string>
<object class="IBActionInfo" key="NS.object.0">
<string key="name">customZoom:</string>
<string key="candidateClassName">id</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="2393087">
<string key="majorKey">IBDocumentRelativeSource</string>
<string key="minorKey">../../../../../modules/gui/macosx/MainWindow.h</string>
......@@ -17209,6 +17228,7 @@ LCAuLi4</string>
<string>o_detached_time_sld_fancygradient_view</string>
<string>o_detached_titlebar_view</string>
<string>o_detached_video_window</string>
<string>o_dropzone_box</string>
<string>o_dropzone_btn</string>
<string>o_dropzone_lbl</string>
<string>o_dropzone_view</string>
......@@ -17264,6 +17284,7 @@ LCAuLi4</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>VLCFSPanel</string>
<string>id</string>
<string>id</string>
......@@ -17314,6 +17335,7 @@ LCAuLi4</string>
<string>o_detached_time_sld_fancygradient_view</string>
<string>o_detached_titlebar_view</string>
<string>o_detached_video_window</string>
<string>o_dropzone_box</string>
<string>o_dropzone_btn</string>
<string>o_dropzone_lbl</string>
<string>o_dropzone_view</string>
......@@ -17413,6 +17435,10 @@ LCAuLi4</string>
<string key="name">o_detached_video_window</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_dropzone_box</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_dropzone_btn</string>
<string key="candidateClassName">id</string>
......
......@@ -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;
......
......@@ -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;
}
......
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