gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 10:01:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add implementation for horizontal view without containers

Browse source
This commit is contained in:
Gregory John Casamento 2021-05-24 07:14:44 -04:00
parent ba065e55e2
commit 1414cfeff6
1 changed files with 52 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
Source/NSStackView.m
View file

@ -76,27 +76,54 @@
NSSize s = currentFrame.size;
NSArray *sv = [view subviews];
NSUInteger n = [sv count];
CGFloat h = 0.0;
CGFloat sp = 0.0;
CGFloat x = 0.0;
CGFloat y = 0.0;
CGFloat newHeight = 0.0;
CGFloat newWidth = 0.0;
NSUInteger i = 0;
h = 0.0;
if ([view isKindOfClass: [NSStackViewContainer class]])
{
h = (s.height / (CGFloat)n); // / 2.0;
sp = (s.height / (CGFloat)n); // / 2.0;
}
if ([view isKindOfClass: [NSStackView class]])
{
h = [(NSStackView *)view spacing];
sp = [(NSStackView *)view spacing];
}
NSLog(@"Subviews = %ld", n);
NSLog(@"Spacing = %f", h);
newFrame.size.height += h; // * 2; // expand height
newFrame.origin.y -= (h/2); // move the view down.
newHeight = newFrame.size.height; // start at top of view...
NSLog(@"Spacing = %f", sp);
if (o == NSUserInterfaceLayoutOrientationVertical)
{
if (sp == 0.0)
{
if (n >= 0)
{
NSView *v = [sv objectAtIndex: 0];
sp = [v frame].size.height;
}
}
newFrame.size.height += sp; // * 2; // expand height
newFrame.origin.y -= (sp / 2.0); // move the view down.
newHeight = newFrame.size.height; // start at top of view...
}
else
{
if (sp == 0.0)
{
if (n >= 0)
{
NSView *v = [sv objectAtIndex: 0];
sp = [v frame].size.width;
}
}
newFrame.size.width += sp;
newWidth = newFrame.size.width;
}
NSLog(@"frame for stack view %@", NSStringFromRect(newFrame));
[view setFrame: newFrame];
@ -109,17 +136,24 @@
{
f.origin.x = 0.0;
}
if (o == NSUserInterfaceLayoutOrientationVertical)
{
y = (newHeight - ((CGFloat)i * sp)) - f.size.height;
f.origin.y = y;
}
else
{
x = ((CGFloat)i * sp);
f.origin.x = x;
}
y = (newHeight - ((CGFloat)i * h)) - f.size.height;
f.origin.y = y;
[v setFrame: f];
NSLog(@"new frame = %@", NSStringFromRect(f));
i++;
}
END_FOR_IN(sv);
[view setNeedsDisplay: YES];
NSLog(@"Vertical no containers");
}
- (void) _refreshView
@ -165,6 +199,11 @@
}
}
}
else
{
[self _layoutViewsInView: self withOrientation: _orientation];
NSLog(@"Horizontal no containers");
}
}
else
{