gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-22 18:11:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Patch by n pero for nsbox

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@4781 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 1999-09-01 07:57:29 +00:00
parent a3c6189002
commit 4638341453
2 changed files with 95 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
ChangeLog
View file

@ -1,3 +1,24 @@
Wed Sep 1 9:17:00 1999 n.pero@mi.flashnet.it
* Source/NSBox.m: (-initWithFrame:) changed default border type to
NSGrooveBorder (as in MacOS-X). Resize content view to fit the box.
Turn off autoresizing of subviews.
(-setContentViewMargins:) removed the code which resized the content
view (as required by MacOS-X specs).
(-setFrame:) added method. It resizes also the content view when
the box is resized, as required by MacOS-X specs.
(-setFrameSize:) idem.
(-setFrameFromContentFrame:) Tried to make the GNUstep method compliant
with MacOS-X specs. In particular, the origin of the NSBox has to be
changed too, and contentFrame is relative to the superview's coordinate
system.
(-sizeToFit) Tried to make the GNUstep method compliant with MacOS-X
specs. In particular, try the sizeToFit message to the content_view
before resizing it; check that the title fits, otherwise make the box
bigger to have the title displayed; modified slightly the loop to give
correct answer in case the min of the origin's of the subviews is
positive; keep better care of the fact that frames are not expressed
always in the same coordinate system.
Tue Aug 31 9:45:00 1999 Richard Frith-Macdonald <richard@brainstorm.co.uk>
Fixes to remove hard-coded colors from gui. I'm not sure this is

93
Source/NSBox.m
View file

@ -70,11 +70,13 @@
offsets.width = 5;
offsets.height = 5;
border_rect = bounds;
border_type = NSLineBorder;
border_type = NSGrooveBorder;
title_position = NSAtTop;
title_rect = NSZeroRect;
[self setAutoresizesSubviews: NO];
content_view = [NSView new];
[super addSubview: content_view];
[content_view setFrame: [self calcSizesAllowingNegative: NO]];
[content_view release];
return self;
@ -111,6 +113,7 @@
}
}
// TODO: implement the macosx behaviour for setTitle:
- (void) setTitle: (NSString *)aString
{
[cell setStringValue: aString];
@ -118,6 +121,8 @@
[self setNeedsDisplay: YES];
}
// TODO: - (void) setTitleWithMnemonic: (NSString *)aString
- (void) setTitleFont: (NSFont *)fontObj
{
[cell setFont: fontObj];
@ -189,13 +194,21 @@
@"illegal margins supplied");
offsets = offsetSize;
[content_view setFrame: [self calcSizesAllowingNegative: NO]];
[self setNeedsDisplay: YES];
}
//
// Resizing the Box
//
- (void) setFrame: (NSRect)frameRect
{
[super setFrame: frameRect];
[content_view setFrame: [self calcSizesAllowingNegative: NO]];
}
- (void) setFrameSize: (NSSize)newSize
{
[super setFrameSize: newSize];
[content_view setFrame: [self calcSizesAllowingNegative: NO]];
}
- (void) setFrameFromContentFrame: (NSRect)contentFrame
{
// First calc the sizes to see how much we are off by
@ -205,34 +218,76 @@
NSAssert(contentFrame.size.width >= 0 && contentFrame.size.height >= 0,
@"illegal content frame supplied");
if ([self superview])
r = [[self superview] convertRect: r fromView: self];
// Add the difference to the frame
f.size.width = f.size.width + (contentFrame.size.width - r.size.width);
f.size.height = f.size.height + (contentFrame.size.height - r.size.height);
f.origin.x = f.origin.x + (contentFrame.origin.x - r.origin.x);
f.origin.y = f.origin.y + (contentFrame.origin.y - r.origin.y);
[self setFrame: f];
[content_view setFrame: [self calcSizesAllowingNegative: NO]];
if ([self superview])
[content_view setFrame: [self convertRect: contentFrame
fromView: [self superview]]];
else // ![self superview]
[content_view setFrame: contentFrame];
}
- (void) sizeToFit
{
NSRect r = NSZeroRect;
id o, e = [[content_view subviews] objectEnumerator];
NSRect f;
// Loop through subviews and calculate rect to encompass all
while ((o = [e nextObject]))
{
NSRect f = [o frame];
if (f.origin.x < r.origin.x)
r.origin.x = f.origin.x;
if (f.origin.y < f.origin.y)
r.origin.y = f.origin.y;
if ((f.origin.x + f.size.width) > (r.origin.x + r.size.width))
r.size.width = (f.origin.x + f.size.width) - r.origin.x;
if ((f.origin.y + f.size.height) > (r.origin.y + r.size.height))
r.size.height = (f.origin.y + f.size.height) - r.origin.y;
if ([content_view respondsToSelector: @selector(sizeToFit)])
[content_view sizeToFit];
else // content_view !respondsToSelector: sizeToFit
{
NSArray *subviewArray = [content_view subviews];
if ([subviewArray count])
{
id o, e = [subviewArray objectEnumerator];
NSRect r = [[e nextObject] frame];
// Loop through subviews and calculate rect to encompass all
while ((o = [e nextObject]))
{
f = [o frame];
if (f.origin.x < r.origin.x)
r.origin.x = f.origin.x;
if (f.origin.y < f.origin.y)
r.origin.y = f.origin.y;
if ((f.origin.x + f.size.width) > (r.origin.x + r.size.width))
r.size.width = (f.origin.x + f.size.width) - r.origin.x;
if ((f.origin.y + f.size.height) > (r.origin.y + r.size.height))
r.size.height = (f.origin.y + f.size.height) - r.origin.y;
}
[content_view setBoundsOrigin: r.origin];
r.size = [self convertSize: r.size fromView: content_view];
[content_view setAutoresizesSubviews: NO];
[content_view setFrameSize: r.size];
[content_view setAutoresizesSubviews: YES];
}
else // content_view has no subviews
{
[content_view setFrame: NSZeroRect];
}
}
[self setFrameFromContentFrame: r];
f = [content_view frame];
// The box width should be enough to display the title
if (title_position != NSNoTitle)
{
NSSize titleSize = [cell cellSize];
titleSize.width += 1;
if (f.size.width < titleSize.width)
f.size.width = titleSize.width;
}
if ([self superview])
[self setFrameFromContentFrame: [self convertRect: f toView: [self superview]]];
else // ![self superview]
[self setFrameFromContentFrame: f];
}
- (void) resizeWithOldSuperviewSize: (NSSize)oldSize