Commit 733940c8 authored by Felix Paul Kühne's avatar Felix Paul Kühne

macosx: make sure there is enough space to display the remaining time for movies longer than 1 hour

additionally, allow switching the time display also in fullscreen mode
parent 60b06277
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<integer value="2"/> <integer value="2"/>
<integer value="2417"/>
</object> </object>
<object class="NSArray" key="IBDocument.PluginDependencies"> <object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
...@@ -3369,7 +3370,7 @@ ...@@ -3369,7 +3370,7 @@
<nil key="NSUserInterfaceItemIdentifier"/> <nil key="NSUserInterfaceItemIdentifier"/>
<string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
<object class="NSView" key="NSWindowView" id="351701434"> <object class="NSView" key="NSWindowView" id="351701434">
<nil key="NSNextResponder"/> <reference key="NSNextResponder"/>
<int key="NSvFlags">256</int> <int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews"> <object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
...@@ -3500,7 +3501,7 @@ ...@@ -3500,7 +3501,7 @@
<object class="NSSlider" id="400811827"> <object class="NSSlider" id="400811827">
<reference key="NSNextResponder" ref="351701434"/> <reference key="NSNextResponder" ref="351701434"/>
<int key="NSvFlags">290</int> <int key="NSvFlags">290</int>
<string key="NSFrame">{{158, 6}, {17, 15}}</string> <string key="NSFrame">{{158, 6}, {9, 15}}</string>
<reference key="NSSuperview" ref="351701434"/> <reference key="NSSuperview" ref="351701434"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSSliderCell" key="NSCell" id="295635233"> <object class="NSSliderCell" key="NSCell" id="295635233">
...@@ -3618,7 +3619,7 @@ ...@@ -3618,7 +3619,7 @@
<object class="NSTextField" id="262403346"> <object class="NSTextField" id="262403346">
<reference key="NSNextResponder" ref="351701434"/> <reference key="NSNextResponder" ref="351701434"/>
<int key="NSvFlags">289</int> <int key="NSvFlags">289</int>
<string key="NSFrame">{{172, 7}, {46, 13}}</string> <string key="NSFrame">{{165, 7}, {53, 13}}</string>
<reference key="NSSuperview" ref="351701434"/> <reference key="NSSuperview" ref="351701434"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="742071211"> <object class="NSTextFieldCell" key="NSCell" id="742071211">
...@@ -3643,7 +3644,8 @@ ...@@ -3643,7 +3644,8 @@
<string key="NSExtension">NSView</string> <string key="NSExtension">NSView</string>
</object> </object>
</object> </object>
<string key="NSFrame">{{7, 11}, {238, 63}}</string> <string key="NSFrameSize">{238, 63}</string>
<reference key="NSSuperview"/>
</object> </object>
<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string> <string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
<string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
......
...@@ -400,8 +400,8 @@ ...@@ -400,8 +400,8 @@
[o_button setAction: @selector(action:)]; \ [o_button setAction: @selector(action:)]; \
[self addSubview:o_button]; [self addSubview:o_button];
#define addTextfield( o_text, align, font, color, size ) \ #define addTextfield( class, o_text, align, font, color, size ) \
o_text = [[NSTextField alloc] initWithFrame: s_rc]; \ o_text = [[class alloc] initWithFrame: s_rc]; \
[o_text setDrawsBackground: NO]; \ [o_text setDrawsBackground: NO]; \
[o_text setBordered: NO]; \ [o_text setBordered: NO]; \
[o_text setEditable: NO]; \ [o_text setEditable: NO]; \
...@@ -463,11 +463,11 @@ ...@@ -463,11 +463,11 @@
s_rc.origin.y = 64; s_rc.origin.y = 64;
s_rc.size.width = 352; s_rc.size.width = 352;
s_rc.size.height = 14; s_rc.size.height = 14;
addTextfield( o_streamTitle_txt, NSCenterTextAlignment, systemFontOfSize, whiteColor, 0 ); addTextfield( NSTextField, o_streamTitle_txt, NSCenterTextAlignment, systemFontOfSize, whiteColor, 0 );
s_rc.origin.x = 486; s_rc.origin.x = 481;
s_rc.origin.y = 64; s_rc.origin.y = 64;
s_rc.size.width = 50; s_rc.size.width = 55;
addTextfield( o_streamPosition_txt, NSRightTextAlignment, systemFontOfSize, whiteColor, 0 ); addTextfield( VLCTimefield, o_streamPosition_txt, NSRightTextAlignment, systemFontOfSize, whiteColor, 0 );
return view; return view;
} }
......
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