Skip to content

V
vlc-2-2
Commit ff9af3f6 authored by David Fuhrmann's avatar David Fuhrmann
Browse files
Options

macosx: fix main window positioning on startup (close #9818)

parent e580a8fe
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 17 deletions
extras/package/macosx/Resources/English.lproj/MainWindow.xib
View file @ ff9af3f6
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data> <data>
<int key="IBDocument.SystemTarget">1050</int> <int key="IBDocument.SystemTarget">1050</int>
<string key="IBDocument.SystemVersion">13C62</string> <string key="IBDocument.SystemVersion">12F45</string>
<string key="IBDocument.InterfaceBuilderVersion">851</string> <string key="IBDocument.InterfaceBuilderVersion">851</string>
<string key="IBDocument.AppKitVersion">1265.19</string> <string key="IBDocument.AppKitVersion">1187.40</string>
<string key="IBDocument.HIToolboxVersion">697.40</string> <string key="IBDocument.HIToolboxVersion">626.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys"> <object class="NSArray" key="dict.sortedKeys">
...@@ -21,10 +21,10 @@ ...@@ -21,10 +21,10 @@
</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="4722"/> <integer value="21"/>
<integer value="4682"/>
<integer value="4850"/>
<integer value="5260"/> <integer value="5260"/>
<integer value="4850"/>
<integer value="4722"/>
</object> </object>
<object class="NSArray" key="IBDocument.PluginDependencies"> <object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
...@@ -268,7 +268,6 @@ ...@@ -268,7 +268,6 @@
</object> </object>
</object> </object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool> <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
<string key="themeKey">gradientTheme</string> <string key="themeKey">gradientTheme</string>
</object> </object>
<object class="NSSearchField" id="596740638"> <object class="NSSearchField" id="596740638">
...@@ -338,7 +337,6 @@ ...@@ -338,7 +337,6 @@
<int key="NSMaximumRecents">10</int> <int key="NSMaximumRecents">10</int>
</object> </object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool> <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
</object> </object>
<object class="NSImageView" id="447614808"> <object class="NSImageView" id="447614808">
<reference key="NSNextResponder" ref="440594360"/> <reference key="NSNextResponder" ref="440594360"/>
...@@ -822,7 +820,6 @@ ...@@ -822,7 +820,6 @@
</object> </object>
</object> </object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool> <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
</object> </object>
<object class="NSButton" id="963106097"> <object class="NSButton" id="963106097">
<reference key="NSNextResponder" ref="1038517863"/> <reference key="NSNextResponder" ref="1038517863"/>
...@@ -1083,7 +1080,7 @@ ...@@ -1083,7 +1080,7 @@
</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>
<string key="NSFrameAutosaveName">mainwindow</string> <string key="NSFrameAutosaveName"/>
<bool key="NSWindowIsRestorable">YES</bool> <bool key="NSWindowIsRestorable">YES</bool>
</object> </object>
<object class="NSCustomObject" id="878580547"> <object class="NSCustomObject" id="878580547">
...@@ -1119,7 +1116,6 @@ ...@@ -1119,7 +1116,6 @@
</object> </object>
</object> </object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool> <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
</object> </object>
<object class="NSButton" id="725350360"> <object class="NSButton" id="725350360">
<reference key="NSNextResponder" ref="661733562"/> <reference key="NSNextResponder" ref="661733562"/>
...@@ -1262,7 +1258,6 @@ ...@@ -1262,7 +1258,6 @@
<reference key="NSTextColor" ref="1018329413"/> <reference key="NSTextColor" ref="1018329413"/>
</object> </object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool> <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
</object> </object>
<object class="NSImageView" id="684815277"> <object class="NSImageView" id="684815277">
<reference key="NSNextResponder" ref="457727486"/> <reference key="NSNextResponder" ref="457727486"/>
...@@ -1522,7 +1517,6 @@ ...@@ -1522,7 +1517,6 @@
<reference key="NSTextColor" ref="306532497"/> <reference key="NSTextColor" ref="306532497"/>
</object> </object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool> <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
</object> </object>
<object class="NSTextField" id="380575444"> <object class="NSTextField" id="380575444">
<reference key="NSNextResponder" ref="383192078"/> <reference key="NSNextResponder" ref="383192078"/>
...@@ -1540,7 +1534,6 @@ ...@@ -1540,7 +1534,6 @@
<reference key="NSTextColor" ref="306532497"/> <reference key="NSTextColor" ref="306532497"/>
</object> </object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool> <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
</object> </object>
<object class="NSButton" id="819678038"> <object class="NSButton" id="819678038">
<reference key="NSNextResponder" ref="383192078"/> <reference key="NSNextResponder" ref="383192078"/>
...@@ -1610,7 +1603,6 @@ ...@@ -1610,7 +1603,6 @@
</object> </object>
</object> </object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool> <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
</object> </object>
</object> </object>
<string key="NSFrameSize">{612, 159}</string> <string key="NSFrameSize">{612, 159}</string>
...@@ -1654,7 +1646,6 @@ ...@@ -1654,7 +1646,6 @@
<reference key="NSTextColor" ref="306532497"/> <reference key="NSTextColor" ref="306532497"/>
</object> </object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool> <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
</object> </object>
<object class="NSTextField" id="926334721"> <object class="NSTextField" id="926334721">
<reference key="NSNextResponder" ref="306630988"/> <reference key="NSNextResponder" ref="306630988"/>
...@@ -1672,7 +1663,6 @@ ...@@ -1672,7 +1663,6 @@
<reference key="NSTextColor" ref="306532497"/> <reference key="NSTextColor" ref="306532497"/>
</object> </object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool> <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
</object> </object>
<object class="NSButton" id="956657117"> <object class="NSButton" id="956657117">
<reference key="NSNextResponder" ref="306630988"/> <reference key="NSNextResponder" ref="306630988"/>
......
modules/gui/macosx/MainWindow.m
View file @ ff9af3f6
...@@ -158,6 +158,10 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -158,6 +158,10 @@ static VLCMainWindow *_o_sharedInstance = nil;
BOOL b_splitviewShouldBeHidden = NO; BOOL b_splitviewShouldBeHidden = NO;
if (!OSX_SNOW_LEOPARD)
[self setRestorable: NO];
[self setFrameAutosaveName:@"mainwindow"];
/* setup the styled interface */ /* setup the styled interface */
b_nativeFullscreenMode = NO; b_nativeFullscreenMode = NO;
#ifdef MAC_OS_X_VERSION_10_7 #ifdef MAC_OS_X_VERSION_10_7
......
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