Skip to content

V
vlc
Commit 0af51801 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

macosx: fixed progress bar position (refs #5742)

parent c483088f
Show whitespace changes
Inline Side-by-side
Showing with 17 additions and 16 deletions
extras/package/macosx/Resources/English.lproj/MainMenu.xib
View file @ 0af51801
......@@ -21,14 +21,14 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="21"/>
<integer value="29"/>
<integer value="4722"/>
<integer value="4596"/>
<integer value="4895"/>
<integer value="1617"/>
<integer value="4596"/>
<integer value="4756"/>
<integer value="2730"/>
<integer value="4895"/>
<integer value="4722"/>
<integer value="915"/>
<integer value="29"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
......@@ -622,6 +622,16 @@
<int key="NSvFlags">290</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSProgressIndicator" id="664576649">
<reference key="NSNextResponder" ref="129808516"/>
<int key="NSvFlags">-2147482334</int>
<object class="NSPSMatrix" key="NSDrawMatrix"/>
<string key="NSFrame">{{217, 13}, {185, 12}}</string>
<reference key="NSSuperview" ref="129808516"/>
<int key="NSViewLayerContentsRedrawPolicy">2</int>
<int key="NSpiFlags">16650</int>
<double key="NSMaxValue">100</double>
</object>
<object class="NSImageView" id="884724451">
<reference key="NSNextResponder" ref="129808516"/>
<int key="NSvFlags">289</int>
......@@ -1059,16 +1069,6 @@
</object>
<bool key="NSEditable">YES</bool>
</object>
<object class="NSProgressIndicator" id="664576649">
<reference key="NSNextResponder" ref="129808516"/>
<int key="NSvFlags">-2147482334</int>
<object class="NSPSMatrix" key="NSDrawMatrix"/>
<string key="NSFrame">{{219, 12}, {180, 12}}</string>
<reference key="NSSuperview" ref="129808516"/>
<int key="NSViewLayerContentsRedrawPolicy">2</int>
<int key="NSpiFlags">16650</int>
<double key="NSMaxValue">100</double>
</object>
<object class="NSButton" id="809192538">
<reference key="NSNextResponder" ref="129808516"/>
<int key="NSvFlags">260</int>
......
modules/gui/macosx/MainWindow.m
View file @ 0af51801
......@@ -263,7 +263,6 @@ static VLCMainWindow *_o_sharedInstance = nil;
moveItem( o_volume_track_view );
moveItem( o_volume_down_btn );
moveItem( o_time_fld );
moveItem( o_time_sld_background );
#undef moveItem
#define enlargeItem( item ) \
......@@ -522,11 +521,13 @@ static VLCMainWindow *_o_sharedInstance = nil;
if ([o_video_view isHidden] && [o_playlist_btn isEnabled]) {
[o_split_view setHidden: YES];
[o_video_view setHidden: NO];
NSLog( @"showing pl" );
}
else
{
[o_video_view setHidden: YES];
[o_split_view setHidden: NO];
NSLog( @"show vout" );
}
}
else
......
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