mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-23 13:20:47 +00:00
Fix bug where a window was ignoring its autosaved frame when loaded
from a .nib file. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@30396 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
6c2fb0bd9b
commit
b90707ed47
2 changed files with 10 additions and 3 deletions
|
@ -1,3 +1,8 @@
|
|||
2010-05-15 Wolfgang Lux <wolfgang.lux@gmail.com>
|
||||
|
||||
* Source/GSNibLoading.m (-nibInstantiate): Fix bug where a window
|
||||
was ignoring its autosaved frame when loaded from a .nib file.
|
||||
|
||||
2010-05-15 Wolfgang Lux <wolfgang.lux@gmail.com>
|
||||
|
||||
* Source/NSFontManager.m (-fontMenu): Remove key equivalents that
|
||||
|
|
|
@ -458,8 +458,7 @@ static BOOL _isInInterfaceBuilder = NO;
|
|||
initWithContentRect: _windowRect
|
||||
styleMask: _windowStyle
|
||||
backing: _backingStoreType
|
||||
defer: _flags.isDeferred
|
||||
screen: nil];
|
||||
defer: _flags.isDeferred];
|
||||
|
||||
// set flags...
|
||||
[_realObject setHidesOnDeactivate: _flags.isHiddenOnDeactivate];
|
||||
|
@ -472,7 +471,7 @@ static BOOL _isInInterfaceBuilder = NO;
|
|||
// [_realObject setAutoPositionMask: _flags.autoPositionMask]; // currently not implemented for nibs
|
||||
// [_realObject setAutoPosition: _flags.autoPosition];
|
||||
[_realObject setDynamicDepthLimit: _flags.dynamicDepthLimit];
|
||||
[_realObject setFrameAutosaveName: _autosaveName];
|
||||
// [_realObject setFrameAutosaveName: _autosaveName]; // done after setting the min/max sizes
|
||||
|
||||
// reset attributes...
|
||||
[_realObject setContentView: _view];
|
||||
|
@ -482,10 +481,13 @@ static BOOL _isInInterfaceBuilder = NO;
|
|||
|
||||
[_view _fixSubviews];
|
||||
|
||||
// FIXME What is the point of calling -setFrame:display: here? It looks
|
||||
// like an effective no op to me.
|
||||
// resize the window...
|
||||
[_realObject setFrame: [NSWindow frameRectForContentRect: [self windowRect]
|
||||
styleMask: [self windowStyle]]
|
||||
display: NO];
|
||||
[_realObject setFrameAutosaveName: _autosaveName];
|
||||
}
|
||||
return _realObject;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue