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

Moved the combined spinbox back. Forgot to auto layout its contents :D

This commit is contained in:
Pietro Gagliardi 2015-08-02 09:10:17 -04:00
parent f0d1c5d171
commit 2daf46b711
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
redo/osxaltest/spinbox.m
View File

@ -15,6 +15,7 @@
@end @end
@implementation tSpinbox { @implementation tSpinbox {
tSpinboxContainer *c;
NSTextField *t; NSTextField *t;
NSStepper *s; NSStepper *s;
id<tControl> parent; id<tControl> parent;
@ -24,6 +25,8 @@
{ {
self = [super init]; self = [super init];
if (self) { if (self) {
self->c = [[tSpinboxContainer alloc] initWithFrame:NSZeroRect];
self->t = [[NSTextField alloc] initWithFrame:NSZeroRect]; self->t = [[NSTextField alloc] initWithFrame:NSZeroRect];
[self->t setSelectable:YES]; [self->t setSelectable:YES];
[self->t setFont:[NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:NSRegularControlSize]]]; [self->t setFont:[NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:NSRegularControlSize]]];
@ -33,12 +36,14 @@
[[self->t cell] setLineBreakMode:NSLineBreakByClipping]; [[self->t cell] setLineBreakMode:NSLineBreakByClipping];
[[self->t cell] setScrollable:YES]; [[self->t cell] setScrollable:YES];
[self->t setTranslatesAutoresizingMaskIntoConstraints:NO]; [self->t setTranslatesAutoresizingMaskIntoConstraints:NO];
[self->c addSubview:self->t];
self->s = [[NSStepper alloc] initWithFrame:NSZeroRect]; self->s = [[NSStepper alloc] initWithFrame:NSZeroRect];
[self->s setIncrement:1]; [self->s setIncrement:1];
[self->s setValueWraps:NO]; [self->s setValueWraps:NO];
[self->s setAutorepeat:YES]; [self->s setAutorepeat:YES];
[self->s setTranslatesAutoresizingMaskIntoConstraints:NO]; [self->s setTranslatesAutoresizingMaskIntoConstraints:NO];
[self->c addSubview:self->s];
self->parent = nil; self->parent = nil;
} }
@ -48,8 +53,7 @@
- (void)tSetParent:(id<tControl>)p addToView:(NSView *)v - (void)tSetParent:(id<tControl>)p addToView:(NSView *)v
{ {
self->parent = p; self->parent = p;
[v addSubview:self->t]; [v addSubview:self->c];
[v addSubview:self->s];
} }
- (void)tFillAutoLayoutHorz:(NSMutableArray *)horz - (void)tFillAutoLayoutHorz:(NSMutableArray *)horz
@ -59,17 +63,13 @@
views:(NSMutableDictionary *)views views:(NSMutableDictionary *)views
first:(uintmax_t *)n first:(uintmax_t *)n
{ {
NSString *keyt; NSString *key;
NSString *keys;
keyt = tAutoLayoutKey(*n); key = tAutoLayoutKey(*n);
keys = tAutoLayoutKey(*n + 1); (*n)++;
*n += 2; [horz addObject:[NSString stringWithFormat:@"[%@]", key]];
[horz addObject:[NSString stringWithFormat:@"[%@]-[%@]", keyt, keys]]; [vert addObject:[NSString stringWithFormat:@"[%@]", key]];
[vert addObject:[NSString stringWithFormat:@"[%@]", keyt]]; [views setObject:self->c forKey:key];
[vert addObject:[NSString stringWithFormat:@"[%@]", keys]];
[views setObject:self->t forKey:keyt];
[views setObject:self->s forKey:keys];
} }
- (void)tRelayout - (void)tRelayout

24
redo/osxaltest/spinbox.m_ → redo/osxaltest/spinbox.m.separate
View File

@ -15,7 +15,6 @@
@end @end
@implementation tSpinbox { @implementation tSpinbox {
tSpinboxContainer *c;
NSTextField *t; NSTextField *t;
NSStepper *s; NSStepper *s;
id<tControl> parent; id<tControl> parent;
@ -25,8 +24,6 @@
{ {
self = [super init]; self = [super init];
if (self) { if (self) {
self->c = [[tSpinboxContainer alloc] initWithFrame:NSZeroRect];
self->t = [[NSTextField alloc] initWithFrame:NSZeroRect]; self->t = [[NSTextField alloc] initWithFrame:NSZeroRect];
[self->t setSelectable:YES]; [self->t setSelectable:YES];
[self->t setFont:[NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:NSRegularControlSize]]]; [self->t setFont:[NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:NSRegularControlSize]]];
@ -36,14 +33,12 @@
[[self->t cell] setLineBreakMode:NSLineBreakByClipping]; [[self->t cell] setLineBreakMode:NSLineBreakByClipping];
[[self->t cell] setScrollable:YES]; [[self->t cell] setScrollable:YES];
[self->t setTranslatesAutoresizingMaskIntoConstraints:NO]; [self->t setTranslatesAutoresizingMaskIntoConstraints:NO];
[self->c addSubview:self->t];
self->s = [[NSStepper alloc] initWithFrame:NSZeroRect]; self->s = [[NSStepper alloc] initWithFrame:NSZeroRect];
[self->s setIncrement:1]; [self->s setIncrement:1];
[self->s setValueWraps:NO]; [self->s setValueWraps:NO];
[self->s setAutorepeat:YES]; [self->s setAutorepeat:YES];
[self->s setTranslatesAutoresizingMaskIntoConstraints:NO]; [self->s setTranslatesAutoresizingMaskIntoConstraints:NO];
[self->c addSubview:self->s];
self->parent = nil; self->parent = nil;
} }
@ -53,7 +48,8 @@
- (void)tSetParent:(id<tControl>)p addToView:(NSView *)v - (void)tSetParent:(id<tControl>)p addToView:(NSView *)v
{ {
self->parent = p; self->parent = p;
[v addSubview:self->c]; [v addSubview:self->t];
[v addSubview:self->s];
} }
- (void)tFillAutoLayoutHorz:(NSMutableArray *)horz - (void)tFillAutoLayoutHorz:(NSMutableArray *)horz
@ -63,13 +59,17 @@
views:(NSMutableDictionary *)views views:(NSMutableDictionary *)views
first:(uintmax_t *)n first:(uintmax_t *)n
{ {
NSString *key; NSString *keyt;
NSString *keys;
key = tAutoLayoutKey(*n); keyt = tAutoLayoutKey(*n);
(*n)++; keys = tAutoLayoutKey(*n + 1);
[horz addObject:[NSString stringWithFormat:@"[%@]", key]]; *n += 2;
[vert addObject:[NSString stringWithFormat:@"[%@]", key]]; [horz addObject:[NSString stringWithFormat:@"[%@]-[%@]", keyt, keys]];
[views setObject:self->c forKey:key]; [vert addObject:[NSString stringWithFormat:@"[%@]", keyt]];
[vert addObject:[NSString stringWithFormat:@"[%@]", keys]];
[views setObject:self->t forKey:keyt];
[views setObject:self->s forKey:keys];
} }
- (void)tRelayout - (void)tRelayout