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

Adjusted tablecolumn.m to use the new data functions.

This commit is contained in:
Pietro Gagliardi 2018-06-03 17:39:02 -04:00
parent 43b1a46669
commit c04f3d3fbe
1 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
darwin/tablecolumn.m
View File

@ -56,7 +56,8 @@ static void layoutCellSubview(NSView *superview, NSView *subview, NSView *leadin
static BOOL isCellEditable(uiTableModel *m, NSInteger row, int modelColumn) static BOOL isCellEditable(uiTableModel *m, NSInteger row, int modelColumn)
{ {
void *data; uiTableData *data;
int value;
switch (modelColumn) { switch (modelColumn) {
case uiTableModelColumnNeverEditable: case uiTableModelColumnNeverEditable:
@ -65,7 +66,9 @@ static BOOL isCellEditable(uiTableModel *m, NSInteger row, int modelColumn)
return YES; return YES;
} }
data = (*(m->mh->CellValue))(m->mh, m, row, modelColumn); data = (*(m->mh->CellValue))(m->mh, m, row, modelColumn);
return uiTableModelTakeInt(data) != 0; value = uiTableDataInt(data);
uiFreeTableData(data);
return value != 0;
// TODO free data // TODO free data
} }
@ -227,7 +230,7 @@ struct textColumnCreateParams {
- (void)uiprivUpdate:(NSInteger)row - (void)uiprivUpdate:(NSInteger)row
{ {
void *data; uiTableData *data;
BOOL editable; BOOL editable;
if (self->tv != nil) { if (self->tv != nil) {
@ -235,30 +238,41 @@ struct textColumnCreateParams {
BOOL editable; BOOL editable;
data = (*(self->m->mh->CellValue))(self->m->mh, self->m, row, self->textModelColumn); data = (*(self->m->mh->CellValue))(self->m->mh, self->m, row, self->textModelColumn);
str = uiprivToNSString((char *) data); str = uiprivToNSString(uiTableDataString(data));
uiprivFree(data); uiFreeTableData(data);
[self->tf setStringValue:str]; [self->tf setStringValue:str];
[self->tf setEditable:isCellEditable(self->m, row, self->textEditableColumn)]; [self->tf setEditable:isCellEditable(self->m, row, self->textEditableColumn)];
color = nil; color = nil;
if (self->textParams.ColorModelColumn != -1) if (self->textParams.ColorModelColumn != -1) {
color = (NSColor *) ((*(self->m->mh->CellValue))(self->m->mh, self->m, row, self->textParams.ColorModelColumn)); double r, g, b, a;
data = (*(self->m->mh->CellValue))(self->m->mh, self->m, row, self->textParams.ColorModelColumn);
uiTableDataColor(data, &r, &g, &b, &a);
uiFreeTableData(data);
xx TODO
}
if (color == nil) if (color == nil)
color = [NSColor controlTextColor]; color = [NSColor controlTextColor];
[self->tf setColor:color]; [self->tf setColor:color];
// TODO release color // TODO release color
} }
if (self->iv != nil) { if (self->iv != nil) {
uiImage *img;
data = (*(self->m->mh->CellValue))(self->m->mh, self->m, row, self->imageModelColumn); data = (*(self->m->mh->CellValue))(self->m->mh, self->m, row, self->imageModelColumn);
[self->iv setImage:uiprivImageNSImage((uiImage *) data)]; img = uiTableDataImage(data);
uiFreeTableData(data);
[self->iv setImage:uiprivImageNSImage(img)];
} }
if (self->cb != nil) { if (self->cb != nil) {
data = (*(self->m->mh->CellValue))(self->m->mh, self->m, row, self->imageModelColumn); data = (*(self->m->mh->CellValue))(self->m->mh, self->m, row, self->imageModelColumn);
if (TODO(data)) if (uiTableDataInt(data) != 0)
[self->cb setState:NSOnState]; [self->cb setState:NSOnState];
else else
[self->cb setState:NSOffState]; [self->cb setState:NSOffState];
uiFreeTableData(data);
[self->cb setEditable:isCellEditable(self->m, row, self->checkboxEditableColumn)]; [self->cb setEditable:isCellEditable(self->m, row, self->checkboxEditableColumn)];
} }
@ -267,12 +281,13 @@ struct textColumnCreateParams {
- (IBAction)uiprivOnTextFieldAction:(id)sender - (IBAction)uiprivOnTextFieldAction:(id)sender
{ {
NSInteger row; NSInteger row;
const void *data; uiTableData *data;
row = [self->t->tv rowForView:self->tf]; row = [self->t->tv rowForView:self->tf];
data = [[self->tf stringValue] UTF8String]; data = uiNewTableDataString([[self->tf stringValue] UTF8String]);
(*(self->m->mh->SetCellValue))(self->m->mh, self->m, (*(self->m->mh->SetCellValue))(self->m->mh, self->m,
row, self->textModelColumn, data); row, self->textModelColumn, data);
uiFreeTableData(data);
// always refresh the value in case the model rejected it // always refresh the value in case the model rejected it
[self uiprivUpdate:row]; [self uiprivUpdate:row];
} }
@ -280,14 +295,13 @@ struct textColumnCreateParams {
- (IBAction)uiprivOnCheckboxAction:(id)sender - (IBAction)uiprivOnCheckboxAction:(id)sender
{ {
NSInteger row; NSInteger row;
int val;
void *data; void *data;
row = [self->t->tv rowForView:self->cb]; row = [self->t->tv rowForView:self->cb];
val = [self->cb state] != NSOffState; data = uiNewTableDataInt([self->cb state] != NSOffState);
data = TODO(val);
(*(self->m->mh->SetCellValue))(self->m->mh, self->m, (*(self->m->mh->SetCellValue))(self->m->mh, self->m,
row, self->checkboxModelColumn, data); row, self->checkboxModelColumn, data);
uiFreeTableData(data);
// always refresh the value in case the model rejected it // always refresh the value in case the model rejected it
[self uiprivUpdate:row]; [self uiprivUpdate:row];
} }