toolkit: comparison ui/gtk/list.c

-:a04cb4398034
+:380ec881faa2
 }
 if(sublist->separator) {
 GtkWidget *separator = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL);
 gtk_list_box_row_set_header(row, separator);
-} else if(sublist->header) {
+} else if(sublist->header && !listbox->header_is_item) {
 GtkWidget *header = gtk_label_new(sublist->header);
 gtk_widget_set_halign(header, GTK_ALIGN_START);
 if(row == listbox->first_row) {
 WIDGET_ADD_CSS_CLASS(header, "ui-listbox-header-first");
 } else {
 ct->add(ct, scroll_area, &layout);
 UiListBox *uilistbox = malloc(sizeof(UiListBox));
 uilistbox->obj = obj;
 uilistbox->listbox = GTK_LIST_BOX(listbox);
+uilistbox->header_is_item = args->header_is_item;
 uilistbox->getvalue = args->getvalue;
 uilistbox->getvaluedata = args->getvaluedata;
 uilistbox->onactivate = args->onactivate;
 uilistbox->onactivatedata = args->onactivatedata;
 uilistbox->onbuttonclick = args->onbuttonclick;
 data->callback2(&event, data->userdata2);
 }
 }
 static void listbox_fill_row(UiListBox *listbox, GtkWidget *row, UiListBoxSubList *sublist, UiSubListItem *item, int index) {
+UiBool is_header = index < 0;
 GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10);
 if(item->icon) {
 GtkWidget *icon = ICON_IMAGE(item->icon);
 BOX_ADD(hbox, icon);
 }
 GtkWidget *label = gtk_label_new(item->label);
+if(is_header) {
+WIDGET_ADD_CSS_CLASS(label, "ui-listbox-header-row");
+}
 gtk_widget_set_halign(label, GTK_ALIGN_START);
 BOX_ADD_EXPAND(hbox, label);
 if(item->badge) {
 }
 event->callback = listbox->onactivate;
 event->userdata = listbox->onactivatedata;
 event->callback2 = listbox->onbuttonclick;
 event->userdata2 = listbox->onbuttonclickdata;
 event->value0 = index;
+// TODO: semi-memory leak when listbox_fill_row is called again for the same row
+// each row update will create a new UiEventDataExt object and a separate destroy handler
 g_signal_connect(
 row,
 "destroy",
 G_CALLBACK(ui_destroy_userdata),
 );
 }
 }
 static void update_sublist_item(UiListBox *listbox, UiListBoxSubList *sublist, int index) {
-GtkListBoxRow *row = gtk_list_box_get_row_at_index(listbox->listbox, sublist->startpos + index);
+int header_row = listbox->header_is_item && sublist->header ? 1 : 0;
+GtkListBoxRow *row = gtk_list_box_get_row_at_index(listbox->listbox, sublist->startpos + index + header_row);
 if(!row) {
 return;
 }
 UiList *list = sublist->var->value;
 if(!list) {
 UiList *list = sublist->var->value;
 if(!list) {
 return;
 }
-size_t index = 0;
+int index = 0;
 void *elm = list->first(list);
+void *first = elm;
-if(!elm && sublist->header) {
+if(sublist->header && !listbox->header_is_item && !elm) {
 // empty row for header
 GtkWidget *row = gtk_list_box_row_new();
 cxListAdd(sublist->widgets, row);
 g_object_set_data(G_OBJECT(row), "ui_listbox", listbox);
 g_object_set_data(G_OBJECT(row), "ui_listbox_sublist", sublist);
 intptr_t rowindex = listbox_insert_index + index;
-g_object_set_data(G_OBJECT(row), "ui_listbox_row_index", (gpointer)rowindex);
+//g_object_set_data(G_OBJECT(row), "ui_listbox_row_index", (gpointer)rowindex);
 gtk_list_box_insert(listbox->listbox, row, listbox_insert_index + index);
 sublist->numitems = 1;
 return;
+}
+int first_index = 0;
+int header_row = 0;
+if(listbox->header_is_item && sublist->header) {
+index = -1;
+first_index = -1;
+header_row = 1;
+elm = sublist->header;
 }
 while(elm) {
 UiSubListItem item = { NULL, NULL, NULL, NULL, NULL, NULL };
 if(listbox->getvalue) {
 item.label = strdup(elm);
 }
 // create listbox item
 GtkWidget *row = gtk_list_box_row_new();
-listbox_fill_row(listbox, row, sublist, &item, (int)index);
+listbox_fill_row(listbox, row, sublist, &item, index);
-if(index == 0) {
+if(index == first_index) {
 // first row in the sublist, set ui_listbox data to the row
 // which is then used by the headerfunc
 g_object_set_data(G_OBJECT(row), "ui_listbox", listbox);
 g_object_set_data(G_OBJECT(row), "ui_listbox_sublist", sublist);
 // first row in the GtkListBox
 listbox->first_row = GTK_LIST_BOX_ROW(row);
 }
 }
 intptr_t rowindex = listbox_insert_index + index;
-g_object_set_data(G_OBJECT(row), "ui_listbox_row_index", (gpointer)rowindex);
+//g_object_set_data(G_OBJECT(row), "ui_listbox_row_index", (gpointer)rowindex);
-gtk_list_box_insert(listbox->listbox, row, listbox_insert_index + index);
+gtk_list_box_insert(listbox->listbox, row, listbox_insert_index + index + header_row);
 cxListAdd(sublist->widgets, row);
 // cleanup
 free(item.label);
 free(item.icon);
 free(item.button_label);
 free(item.button_icon);
 free(item.badge);
 // next row
-elm = list->next(list);
+elm = index >= 0 ? list->next(list) : first;
 index++;
 }
 sublist->numitems = cxListSize(sublist->widgets);
 }
 UiSubListEventData eventdata;
 eventdata.list = sublist->var->value;
 eventdata.sublist_index = sublist->index;
 eventdata.row_index = data->value0;
 eventdata.sublist_userdata = sublist->userdata;
-eventdata.row_data = eventdata.list->get(eventdata.list, eventdata.row_index);
+eventdata.row_data = eventdata.row_index >= 0 ? eventdata.list->get(eventdata.list, eventdata.row_index) : NULL;
 eventdata.event_data = data->customdata2;
 UiEvent event;
 event.obj = data->obj;
 event.window = event.obj->window;

Mercurial > hg > toolkit / file comparison

comparison: ui/gtk/list.c

ui/gtk/list.c