Fixed compile errors. Runtime errors, on the other hand...
This commit is contained in:
parent
d528fae1f4
commit
faa989aefd
|
@ -3,12 +3,12 @@
|
||||||
|
|
||||||
// TODO wrap the child in a view if its align isn't fill
|
// TODO wrap the child in a view if its align isn't fill
|
||||||
// maybe it's easier to do it regardless of align
|
// maybe it's easier to do it regardless of align
|
||||||
@interface gridChild
|
@interface gridChild : NSObject
|
||||||
@property uiControl *c;
|
@property uiControl *c;
|
||||||
@property intmax_t left;
|
@property intmax_t left;
|
||||||
@property intmax_t top;
|
@property intmax_t top;
|
||||||
@property intmax_t hspan;
|
@property intmax_t xspan;
|
||||||
@property intmax_t vspan;
|
@property intmax_t yspan;
|
||||||
@property int hexpand;
|
@property int hexpand;
|
||||||
@property uiAlign halign;
|
@property uiAlign halign;
|
||||||
@property int vexpand;
|
@property int vexpand;
|
||||||
|
@ -48,7 +48,7 @@ struct uiGrid {
|
||||||
gridView *view;
|
gridView *view;
|
||||||
};
|
};
|
||||||
|
|
||||||
@implementation formChild
|
@implementation gridChild
|
||||||
|
|
||||||
- (NSView *)view
|
- (NSView *)view
|
||||||
{
|
{
|
||||||
|
@ -66,7 +66,8 @@ struct uiGrid {
|
||||||
self->g = gg;
|
self->g = gg;
|
||||||
self->padded = 0;
|
self->padded = 0;
|
||||||
self->children = [NSMutableArray new];
|
self->children = [NSMutableArray new];
|
||||||
self->nStretchy = 0;
|
self->nhexpand = 0;
|
||||||
|
self->nvexpand = 0;
|
||||||
|
|
||||||
self->edges = [NSMutableArray new];
|
self->edges = [NSMutableArray new];
|
||||||
self->inBetweens = [NSMutableArray new];
|
self->inBetweens = [NSMutableArray new];
|
||||||
|
@ -344,13 +345,13 @@ struct uiGrid {
|
||||||
|
|
||||||
[self establishOurConstraints];
|
[self establishOurConstraints];
|
||||||
update = NO;
|
update = NO;
|
||||||
if (fc.hexpand) {
|
if (gc.hexpand) {
|
||||||
oldn = self->nhexpand;
|
oldn = self->nhexpand;
|
||||||
self->nhexpand++;
|
self->nhexpand++;
|
||||||
if (oldn == 0)
|
if (oldn == 0)
|
||||||
update = YES;
|
update = YES;
|
||||||
}
|
}
|
||||||
if (fc.vexpand) {
|
if (gc.vexpand) {
|
||||||
oldn = self->nvexpand;
|
oldn = self->nvexpand;
|
||||||
self->nvexpand++;
|
self->nvexpand++;
|
||||||
if (oldn == 0)
|
if (oldn == 0)
|
||||||
|
@ -546,7 +547,7 @@ void uiGridSetPadded(uiGrid *g, int padded)
|
||||||
[g->view setPadded:padded];
|
[g->view setPadded:padded];
|
||||||
}
|
}
|
||||||
|
|
||||||
uiGrid *uiNewForm(void)
|
uiGrid *uiNewGrid(void)
|
||||||
{
|
{
|
||||||
uiGrid *g;
|
uiGrid *g;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue