interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactored NSScrollView auto layout stuff. I should probably just split it into a separate file when I do implementt he shared scrollview source code.

This commit is contained in:
Pietro Gagliardi 2016-05-27 01:13:45 -04:00
parent 3adb485c66
commit b65175a19c
2 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
darwin/autolayout.m
View File

@ -185,25 +185,25 @@ void scrollViewConstraintsEstablish(struct scrollViewConstraints *c, NSScrollVie
[sv addConstraint:c->documentTop];
[c->documentTop retain];
if (!hscroll) {
c->documentTrailing = mkConstraint(dv, NSLayoutAttributeTrailing,
NSLayoutRelationEqual,
cv, NSLayoutAttributeTrailing,
1, 0,
[desc stringByAppendingString:@"document trailing constraint"]);
c->hscroll = hscroll;
c->documentTrailing = mkConstraint(dv, NSLayoutAttributeTrailing,
NSLayoutRelationEqual,
cv, NSLayoutAttributeTrailing,
1, 0,
[desc stringByAppendingString:@"document trailing constraint"]);
if (!c->hscroll)
[sv addConstraint:c->documentTrailing];
[c->documentTrailing retain];
}
[c->documentTrailing retain];
if (!vscroll) {
c->documentBottom = mkConstraint(dv, NSLayoutAttributeBottom,
NSLayoutRelationEqual,
sv, NSLayoutAttributeBottom,
1, 0,
[desc stringByAppendingString:@"document bottom constraint"]);
c->vscroll = vscroll;
c->documentBottom = mkConstraint(dv, NSLayoutAttributeBottom,
NSLayoutRelationEqual,
sv, NSLayoutAttributeBottom,
1, 0,
[desc stringByAppendingString:@"document bottom constraint"]);
if (!c->vscroll)
[sv addConstraint:c->documentBottom];
[c->documentBottom retain];
}
[c->documentBottom retain];
}
void scrollViewConstraintsRemove(struct scrollViewConstraints *c, NSScrollView *sv)
@ -219,23 +219,15 @@ void scrollViewConstraintsRemove(struct scrollViewConstraints *c, NSScrollView *
c->documentTop = nil;
}
if (c->documentTrailing != nil) {
[sv removeConstraint:c->documentTrailing];
if (!c->hscroll)
[sv removeConstraint:c->documentTrailing];
[c->documentTrailing release];
c->documentTrailing = nil;
}
if (c->documentBottom != nil) {
[sv removeConstraint:c->documentBottom];
if (!c->vscroll)
[sv removeConstraint:c->documentBottom];
[c->documentBottom release];
c->documentBottom = nil;
}
if (c->documentWidth != nil) {
[sv removeConstraint:c->documentWidth];
[c->documentWidth release];
c->documentWidth = nil;
}
if (c->documentHeight != nil) {
[sv removeConstraint:c->documentHeight];
[c->documentHeight release];
c->documentHeight = nil;
}
}

4
darwin/uipriv_darwin.h
View File

@ -75,10 +75,10 @@ extern void singleChildConstraintsSetMargined(struct singleChildConstraints *c,
struct scrollViewConstraints {
NSLayoutConstraint *documentLeading;
NSLayoutConstraint *documentTop;
BOOL hscroll;
NSLayoutConstraint *documentTrailing;
BOOL vscroll;
NSLayoutConstraint *documentBottom;
NSLayoutConstraint *documentWidth;
NSLayoutConstraint *documentHeight;
};
extern void scrollViewConstraintsEstablish(struct scrollViewConstraints *c, NSScrollView *sv, BOOL hscroll, BOOL vscroll, NSString *desc);
extern void scrollViewConstraintsRemove(struct scrollViewConstraints *c, NSScrollView *sv);