Commit 2e57a2c0 authored by Felix Paul Kühne's avatar Felix Paul Kühne

macosx: remove the window's resize button when VLC is linked against the 10.7...

macosx: remove the window's resize button when VLC is linked against the 10.7 SDK, but keep it as an empty view when linked against an older SDK but still running on Lion (refs #5742)
parent 168b48cb
......@@ -21,14 +21,14 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="4680"/>
<integer value="915"/>
<integer value="4758"/>
<integer value="1617"/>
<integer value="2730"/>
<integer value="29"/>
<integer value="2730"/>
<integer value="4722"/>
<integer value="4758"/>
<integer value="4596"/>
<integer value="915"/>
<integer value="4756"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
......@@ -7406,14 +7406,6 @@ LCAuLi4</string>
</object>
<int key="connectionID">4835</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_resize_view</string>
<reference key="source" ref="498338108"/>
<reference key="destination" ref="884724451"/>
</object>
<int key="connectionID">4841</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">delegate</string>
......@@ -7422,6 +7414,14 @@ LCAuLi4</string>
</object>
<int key="connectionID">4842</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_resize_view</string>
<reference key="source" ref="498338108"/>
<reference key="destination" ref="884724451"/>
</object>
<int key="connectionID">4843</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
......@@ -11852,7 +11852,7 @@ LCAuLi4</string>
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">4842</int>
<int key="maxID">4843</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
......
......@@ -76,7 +76,6 @@ static VLCMainWindow *_o_sharedInstance = nil;
{
#ifdef MAC_OS_X_VERSION_10_7
styleMask = NSBorderlessWindowMask | NSResizableWindowMask;
[o_resize_view removeFromSuperviewWithoutNeedingDisplay];
#else
styleMask = NSBorderlessWindowMask;
#endif
......@@ -414,6 +413,12 @@ static VLCMainWindow *_o_sharedInstance = nil;
[o_video_view setFrame: winrect];
previousSavedFrame = winrect;
if (OSX_LION)
[o_resize_view setImage: NULL];
if ([self styleMask] & NSResizableWindowMask)
[o_resize_view removeFromSuperviewWithoutNeedingDisplay];
[self display];
}
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