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

macosx: improve dropzone resizing (fixes #6018)

(cherry picked from commit 09eb7369def8cb77e0958a690b7e35deb4ddb57c)
parent 3e6ea2c9
...@@ -21,16 +21,16 @@ ...@@ -21,16 +21,16 @@
</object> </object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<integer value="21"/>
<integer value="283"/>
<integer value="4596"/>
<integer value="2730"/>
<integer value="915"/>
<integer value="29"/> <integer value="29"/>
<integer value="1617"/> <integer value="1617"/>
<integer value="4895"/>
<integer value="4596"/>
<integer value="283"/>
<integer value="4722"/> <integer value="4722"/>
<integer value="2770"/> <integer value="2770"/>
<integer value="4895"/> <integer value="915"/>
<integer value="2730"/>
<integer value="21"/>
</object> </object>
<object class="NSArray" key="IBDocument.PluginDependencies"> <object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
<nil key="NSViewClass"/> <nil key="NSViewClass"/>
<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>
<string key="NSWindowContentMinSize">{400, 288}</string> <string key="NSWindowContentMinSize">{604, 310}</string>
<object class="NSView" key="NSWindowView" id="429932428"> <object class="NSView" key="NSWindowView" id="429932428">
<reference key="NSNextResponder"/> <reference key="NSNextResponder"/>
<int key="NSvFlags">256</int> <int key="NSvFlags">256</int>
...@@ -1151,7 +1151,7 @@ ...@@ -1151,7 +1151,7 @@
<int key="NSViewLayerContentsRedrawPolicy">2</int> <int key="NSViewLayerContentsRedrawPolicy">2</int>
</object> </object>
<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string> <string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
<string key="NSMinSize">{400, 310}</string> <string key="NSMinSize">{604, 332}</string>
<string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
<string key="NSFrameAutosaveName">mainwindow</string> <string key="NSFrameAutosaveName">mainwindow</string>
<bool key="NSWindowIsRestorable">YES</bool> <bool key="NSWindowIsRestorable">YES</bool>
...@@ -4296,7 +4296,7 @@ LCAuLi4</string> ...@@ -4296,7 +4296,7 @@ LCAuLi4</string>
<object class="NSTextField" id="551534796"> <object class="NSTextField" id="551534796">
<reference key="NSNextResponder" ref="457727486"/> <reference key="NSNextResponder" ref="457727486"/>
<int key="NSvFlags">301</int> <int key="NSvFlags">301</int>
<string key="NSFrame">{{16, 69}, {416, 22}}</string> <string key="NSFrame">{{0, 69}, {416, 22}}</string>
<reference key="NSSuperview" ref="457727486"/> <reference key="NSSuperview" ref="457727486"/>
<int key="NSViewLayerContentsRedrawPolicy">2</int> <int key="NSViewLayerContentsRedrawPolicy">2</int>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
...@@ -4329,7 +4329,7 @@ LCAuLi4</string> ...@@ -4329,7 +4329,7 @@ LCAuLi4</string>
<string>NeXT TIFF v4.0 pasteboard type</string> <string>NeXT TIFF v4.0 pasteboard type</string>
</object> </object>
</object> </object>
<string key="NSFrame">{{171, 108}, {108, 108}}</string> <string key="NSFrame">{{147, 108}, {108, 108}}</string>
<reference key="NSSuperview" ref="457727486"/> <reference key="NSSuperview" ref="457727486"/>
<int key="NSViewLayerContentsRedrawPolicy">2</int> <int key="NSViewLayerContentsRedrawPolicy">2</int>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
...@@ -4350,7 +4350,7 @@ LCAuLi4</string> ...@@ -4350,7 +4350,7 @@ LCAuLi4</string>
<object class="NSButton" id="959811945"> <object class="NSButton" id="959811945">
<reference key="NSNextResponder" ref="457727486"/> <reference key="NSNextResponder" ref="457727486"/>
<int key="NSvFlags">301</int> <int key="NSvFlags">301</int>
<string key="NSFrame">{{148, 14}, {153, 25}}</string> <string key="NSFrame">{{125, 14}, {153, 25}}</string>
<reference key="NSSuperview" ref="457727486"/> <reference key="NSSuperview" ref="457727486"/>
<int key="NSViewLayerContentsRedrawPolicy">2</int> <int key="NSViewLayerContentsRedrawPolicy">2</int>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
...@@ -4369,12 +4369,12 @@ LCAuLi4</string> ...@@ -4369,12 +4369,12 @@ LCAuLi4</string>
</object> </object>
</object> </object>
</object> </object>
<string key="NSFrameSize">{448, 229}</string> <string key="NSFrameSize">{402, 229}</string>
<reference key="NSSuperview" ref="83235998"/> <reference key="NSSuperview" ref="83235998"/>
<int key="NSViewLayerContentsRedrawPolicy">2</int> <int key="NSViewLayerContentsRedrawPolicy">2</int>
</object> </object>
</object> </object>
<string key="NSFrame">{{17, 11}, {448, 229}}</string> <string key="NSFrame">{{0, 10}, {402, 229}}</string>
<reference key="NSSuperview" ref="256817023"/> <reference key="NSSuperview" ref="256817023"/>
<int key="NSViewLayerContentsRedrawPolicy">2</int> <int key="NSViewLayerContentsRedrawPolicy">2</int>
<string key="NSOffsets">{0, 0}</string> <string key="NSOffsets">{0, 0}</string>
...@@ -4411,7 +4411,7 @@ LCAuLi4</string> ...@@ -4411,7 +4411,7 @@ LCAuLi4</string>
<string>NeXT TIFF v4.0 pasteboard type</string> <string>NeXT TIFF v4.0 pasteboard type</string>
</object> </object>
</object> </object>
<string key="NSFrameSize">{482, 254}</string> <string key="NSFrame">{{0, -2}, {482, 254}}</string>
<reference key="NSSuperview" ref="256817023"/> <reference key="NSSuperview" ref="256817023"/>
<int key="NSViewLayerContentsRedrawPolicy">2</int> <int key="NSViewLayerContentsRedrawPolicy">2</int>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
...@@ -4430,7 +4430,7 @@ LCAuLi4</string> ...@@ -4430,7 +4430,7 @@ LCAuLi4</string>
<bool key="NSEditable">YES</bool> <bool key="NSEditable">YES</bool>
</object> </object>
</object> </object>
<string key="NSFrameSize">{482, 254}</string> <string key="NSFrameSize">{402, 252}</string>
<reference key="NSSuperview"/> <reference key="NSSuperview"/>
<bool key="NSViewIsLayerTreeHost">YES</bool> <bool key="NSViewIsLayerTreeHost">YES</bool>
<object class="CIDarkenBlendMode" key="NSViewCompositeFilter"> <object class="CIDarkenBlendMode" key="NSViewCompositeFilter">
...@@ -11204,7 +11204,7 @@ LCAuLi4</string> ...@@ -11204,7 +11204,7 @@ LCAuLi4</string>
<boolean value="YES"/> <boolean value="YES"/>
<boolean value="NO"/> <boolean value="NO"/>
<boolean value="YES"/> <boolean value="YES"/>
<string>{400, 288}</string> <string>{604, 310}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/> <boolean value="YES"/>
<string>{{816, 490}, {64, 6}}</string> <string>{{816, 490}, {64, 6}}</string>
...@@ -11732,7 +11732,7 @@ LCAuLi4</string> ...@@ -11732,7 +11732,7 @@ LCAuLi4</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{329, 491}, {482, 254}}</string> <string>{{726, 458}, {402, 252}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform"/> <object class="NSAffineTransform"/>
<string>VLBrushedMetalImageView</string> <string>VLBrushedMetalImageView</string>
......
...@@ -248,9 +248,9 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -248,9 +248,9 @@ static VLCMainWindow *_o_sharedInstance = nil;
[self setAcceptsMouseMovedEvents: YES]; [self setAcceptsMouseMovedEvents: YES];
// Set that here as IB seems to be buggy // Set that here as IB seems to be buggy
if (b_dark_interface) if (b_dark_interface)
[self setContentMinSize:NSMakeSize(500., (288. + [o_titlebar_view frame].size.height))]; [self setContentMinSize:NSMakeSize(604., (288. + [o_titlebar_view frame].size.height))];
else else
[self setContentMinSize:NSMakeSize(500., 288.)]; [self setContentMinSize:NSMakeSize(604., 288.)];
[self setTitle: _NS("VLC media player")]; [self setTitle: _NS("VLC media player")];
[o_playlist_btn setEnabled:NO]; [o_playlist_btn setEnabled:NO];
o_temp_view = [[NSView alloc] init]; o_temp_view = [[NSView alloc] init];
......
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