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

Fixed a bunch of bugs in GTK+ table.c.

This commit is contained in:
Pietro Gagliardi 2016-06-27 12:24:14 -04:00
parent 40e943eb43
commit af0dbd3a0e
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
unix/table.c
View File

@ -59,7 +59,7 @@ static GType uiTableModel_get_column_type(GtkTreeModel *mm, gint index)
case uiTableModelColumnString: case uiTableModelColumnString:
return G_TYPE_STRING; return G_TYPE_STRING;
case uiTableModelColumnImage: case uiTableModelColumnImage:
// TODO return G_TYPE_POINTER;
case uiTableModelColumnInt: case uiTableModelColumnInt:
return G_TYPE_INT; return G_TYPE_INT;
case uiTableModelColumnColor: case uiTableModelColumnColor:
@ -120,7 +120,8 @@ static void uiTableModel_get_value(GtkTreeModel *mm, GtkTreeIter *iter, gint col
g_value_take_string(value, (char *) data); g_value_take_string(value, (char *) data);
return; return;
case uiTableModelColumnImage: case uiTableModelColumnImage:
// TODO g_value_init(value, G_TYPE_POINTER);
g_value_set_pointer(value, data);
return; return;
case uiTableModelColumnInt: case uiTableModelColumnInt:
g_value_init(value, G_TYPE_INT); g_value_init(value, G_TYPE_INT);
@ -387,6 +388,8 @@ static void dataFunc(GtkTreeViewColumn *c, GtkCellRenderer *r, GtkTreeModel *mm,
rgba = (GdkRGBA *) g_value_get_boxed(&value); rgba = (GdkRGBA *) g_value_get_boxed(&value);
if (rgba != NULL) if (rgba != NULL)
g_object_set(r, "cell-background-rgba", rgba, NULL); g_object_set(r, "cell-background-rgba", rgba, NULL);
else
g_object_set(r, "cell-background-set", FALSE, NULL);
g_value_unset(&value); g_value_unset(&value);
} }
} }
@ -417,7 +420,7 @@ void uiTableColumnAppendImagePart(uiTableColumn *c, int modelColumn, int expand)
part = uiNew(struct tablePart); part = uiNew(struct tablePart);
part->type = partImage; part->type = partImage;
part->textColumn = modelColumn; part->imageColumn = modelColumn;
part->tv = c->tv; part->tv = c->tv;
part->editable = 0; part->editable = 0;