mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-23 12:00:52 +00:00
* Source/NSWindow.m: Remove code in stringWithSavedFrame which was causing a
crash due to issues in NSToolbar described in bug#24601. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@26934 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
75a92b018f
commit
fcb9767969
2 changed files with 5 additions and 22 deletions
|
@ -1,3 +1,8 @@
|
|||
2008-10-18 19:06-EDT Gregory John Casamento <greg_casamento@yahoo.com>
|
||||
|
||||
* Source/NSWindow.m: Remove code in stringWithSavedFrame which was causing a
|
||||
crash due to issues in NSToolbar described in bug#24601.
|
||||
|
||||
2008-10-18 Riccardo Mottola <rmottola@users.sf.net>>
|
||||
|
||||
* Source/NSWorkspace.m: Removed c99-ism
|
||||
|
|
|
@ -4538,28 +4538,6 @@ current key view.<br />
|
|||
|
||||
fRect = _frame;
|
||||
|
||||
/*
|
||||
* FIXME: This may not be such an elegant solution, but it works.
|
||||
* I need to find a better way to handle this, maybe in the window
|
||||
* decoration view could handle these calculations.
|
||||
*/
|
||||
if([self toolbar] != nil)
|
||||
{
|
||||
NSView *tbview = [[self toolbar] _toolbarView];
|
||||
NSRect tbframe = [tbview frame];
|
||||
if([tbview superview] != nil)
|
||||
{
|
||||
NSRect r = [[self contentViewWithoutToolbar] frame];
|
||||
r = [NSWindow frameRectForContentRect: r
|
||||
styleMask: _styleMask];
|
||||
|
||||
// copy w/h
|
||||
fRect.size.width = r.size.width;
|
||||
fRect.size.height = r.size.height;
|
||||
fRect.origin.y += tbframe.size.height;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* The screen rectangle should gives the area of the screen in which
|
||||
* the window could be placed (ie a rectangle excluding the dock).
|
||||
|
|
Loading…
Reference in a new issue