toolkit: comparison ui/gtk/list.c

-:6c1fc70cd1c8
+:0f052f6f532c
 pango_attr_list_insert(attr, pango_attr_foreground_new(r, g, b));
 return attr;
 }
-static void column_factory_bind(GtkListItemFactory *factory, GtkListItem *item, gpointer userdata) {
+static void column_factory_bind(GtkListItemFactory *unused, GtkListItem *item, gpointer userdata) {
 UiColData *col = userdata;
 UiList *list = col->listview->var ? col->listview->var->value : NULL;
 UiListView *listview = col->listview;
 ObjWrapper *obj = gtk_list_item_get_item(item);
 UiModel *model = col->listview->model;
 UiModelType type = model->types[col->model_column];
+// cache the GtkListItem
+CxHashKey row_key = cx_hash_key(&obj->i, sizeof(int));
+UiRowItems *row = cxMapGet(listview->bound_rows, row_key);
+if(row) {
+if(row->items[col->model_column] == NULL) {
+row->bound++;
+}
+} else {
+row = calloc(1, sizeof(UiRowItems) + listview->numcolumns * sizeof(GtkListItem*));
+cxMapPut(listview->bound_rows, row_key, row);
+row->bound = 1;
+}
+row->items[col->model_column] = item;
 UiBool freevalue = FALSE;
 void *data = listview->getvalue(list, obj->data, obj->i, col->data_column, listview->getvaluedata, &freevalue);
 GtkWidget *child = gtk_list_item_get_child(item);
 if(attributes != listview->current_row_attributes) {
 pango_attr_list_unref(attributes);
 }
 }
+static void column_factory_unbind(GtkSignalListItemFactory *self, GtkListItem *item, UiColData *col) {
+ObjWrapper *obj = gtk_list_item_get_item(item);
+UiListView *listview = col->listview;
+CxHashKey row_key = cx_hash_key(&obj->i, sizeof(int));
+UiRowItems *row = cxMapGet(listview->bound_rows, row_key);
+if(row) {
+row->items[col->model_column] = NULL;
+row->bound--;
+if(row->bound == 0) {
+cxMapRemove(listview->bound_rows, row_key);
+}
+} // else: should not happen
+}
 static GtkSelectionModel* create_selection_model(UiListView *listview, GListStore *liststore, bool multiselection) {
 GtkSelectionModel *selection_model;
 if(multiselection) {
 selection_model = GTK_SELECTION_MODEL(gtk_multi_selection_new(G_LIST_MODEL(liststore)));
 } else {
 UiListView *listview = create_listview(obj, args);
 if(!args->getvalue && !args->getvalue2) {
 listview->getvalue = str_getvalue;
 }
+listview->numcolumns = 1;
 listview->columns = malloc(sizeof(UiColData));
 listview->columns->listview = listview;
 listview->columns->data_column = 0;
 listview->columns->model_column = 0;
+listview->bound_rows = cxHashMapCreate(NULL, CX_STORE_POINTERS, 128);
+listview->bound_rows->collection.simple_destructor = (cx_destructor_func)free;
 GtkListItemFactory *factory = gtk_signal_list_item_factory_new();
 g_signal_connect(factory, "setup", G_CALLBACK(column_factory_setup), listview->columns);
 g_signal_connect(factory, "bind", G_CALLBACK(column_factory_bind), listview->columns);
 if(!args->getvalue && !args->getvalue2) {
 listview->getvalue = str_getvalue;
 }
+listview->numcolumns = 1;
 listview->columns = malloc(sizeof(UiColData));
 listview->columns->listview = listview;
 listview->columns->data_column = 0;
 listview->columns->model_column = 0;
+listview->bound_rows = cxHashMapCreate(NULL, CX_STORE_POINTERS, 128);
+listview->bound_rows->collection.simple_destructor = (cx_destructor_func)free;
 GtkListItemFactory *factory = gtk_signal_list_item_factory_new();
 g_signal_connect(factory, "setup", G_CALLBACK(column_factory_setup), listview->columns);
 g_signal_connect(factory, "bind", G_CALLBACK(column_factory_bind), listview->columns);
 // create columns from UiModel
 UiModel *model = args->model;
 int columns = model ? model->columns : 0;
 tableview->columns = calloc(columns, sizeof(UiColData));
+tableview->numcolumns = columns;
+tableview->bound_rows = cxHashMapCreate(NULL, CX_STORE_POINTERS, 128);
+tableview->bound_rows->collection.simple_destructor = (cx_destructor_func)free;
 int addi = 0;
 for(int i=0;i<columns;i++) {
 tableview->columns[i].listview = tableview;
 tableview->columns[i].model_column = i;
 if(i < 0) {
 ui_update_liststore(view->liststore, list);
 } else {
 void *value = list->get(list, i);
 if(value) {
-ObjWrapper *obj = obj_wrapper_new(value, i);
+ObjWrapper *obj = g_list_model_get_item(G_LIST_MODEL(view->liststore), i);
-UiListSelection sel = list->getselection(list);
+if(obj) {
-// TODO: if index i is selected, the selection is lost
+obj->data = value;
-// is it possible to update the item without removing it?
+}
-// workaround: save selection and reapply it
-int count = g_list_model_get_n_items(G_LIST_MODEL(view->liststore));
+CxHashKey row_key = cx_hash_key(&i, sizeof(int));
-if(count <= i) {
+UiRowItems *row = cxMapGet(view->bound_rows, row_key);
-g_list_store_splice(view->liststore, i, 0, (void **)&obj, 1);
+if(row) {
-} else {
+for(int c=0;c<view->numcolumns;c++) {
-g_list_store_splice(view->liststore, i, 1, (void **)&obj, 1);
+if(row->items[c] != NULL) {
-}
+column_factory_bind(NULL, row->items[c], &view->columns[c]);
-if(sel.count > 0) {
+}
-list->setselection(list, sel);
+}
 }
-ui_listselection_free(sel);
 }
 }
 }
 UiListSelection ui_listview_getselection2(UiList *list) {
 }
 #if GTK_CHECK_VERSION(4, 10, 0)
 free(v->columns);
 pango_attr_list_unref(v->default_attributes);
 pango_attr_list_unref(v->current_row_attributes);
+cxMapFree(v->bound_rows);
 #endif
 free(v->selection.rows);
 free(v);
 }

Mercurial > hg > toolkit / file comparison

comparison: ui/gtk/list.c

ui/gtk/list.c