toolkit: comparison ui/gtk/list.c

-:073a5e893050
+:0206161e92d5
 { "text/plain",    0, 1 },
 { "text/uri-list", 0, 2 },
 };
 */
+static void listview_copy_static_elements(UiListView *listview, char **elm, size_t nelm) {
+listview->elements = calloc(nelm, sizeof(char*));
+listview->nelm = nelm;
+for(int i=0;i<nelm;i++) {
+listview->elements[i] = strdup(elm[i]);
+}
+}
 #if GTK_CHECK_VERSION(4, 10, 0)
 /* BEGIN GObject wrapper for generic pointers */
 tableview->ondrop = args.ondrop;
 tableview->ondropdata = args.ondropsdata;
 tableview->selection.count = 0;
 tableview->selection.rows = NULL;
 return tableview;
-}
-static void listview_copy_static_elements(UiListView *listview, char **elm, size_t nelm) {
-listview->elements = calloc(nelm, sizeof(char*));
-listview->nelm = nelm;
-for(int i=0;i<nelm;i++) {
-listview->elements[i] = strdup(elm[i]);
-}
 }
 UIWIDGET ui_listview_create(UiObject *obj, UiListArgs args) {
 UiObject* current = uic_current_obj(obj);
 GtkListStore *listmodel = create_list_store(list, model);
 gtk_tree_view_set_model(GTK_TREE_VIEW(view), GTK_TREE_MODEL(listmodel));
 g_object_unref(listmodel);
 UiListView *listview = malloc(sizeof(UiListView));
+memset(listview, 0, sizeof(UiListView));
 listview->obj = obj;
 listview->widget = view;
 listview->var = var;
 listview->model = model;
 listview->selection.count = 0;
 //g_signal_connect(view, "drag-end", G_CALLBACK(drag_end), NULL);
 // add TreeView as observer to the UiList to update the TreeView if the
 // data changes
 UiListView *tableview = malloc(sizeof(UiListView));
+memset(tableview, 0, sizeof(UiListView));
 tableview->obj = obj;
 tableview->widget = view;
 tableview->var = var;
 tableview->model = model;
 tableview->ondragstart = args.ondragstart;
 UiModel *model = ui_model(obj->ctx, UI_STRING, "", -1);
 model->getvalue = args.getvalue ? args.getvalue : ui_strmodel_getvalue;
 UiVar* var = uic_widget_var(obj->ctx, current->ctx, args.list, args.varname, UI_VAR_LIST);
-GtkWidget *combobox = ui_create_combobox(obj, model, var, args.onactivate, args.onactivatedata);
+GtkWidget *combobox = ui_create_combobox(obj, model, var, args.static_elements, args.static_nelm, args.onactivate, args.onactivatedata);
 ui_set_name_and_style(combobox, args.name, args.style_class);
 ui_set_widget_groups(obj->ctx, combobox, args.groups);
 UI_APPLY_LAYOUT1(current, args);
 current->container->add(current->container, combobox, FALSE);
 current->container->current = combobox;
 return combobox;
 }
-GtkWidget* ui_create_combobox(UiObject *obj, UiModel *model, UiVar *var, ui_callback f, void *udata) {
+GtkWidget* ui_create_combobox(UiObject *obj, UiModel *model, UiVar *var, char **elm, size_t nelm, ui_callback f, void *udata) {
 GtkWidget *combobox = gtk_combo_box_new();
 UiListView *uicbox = malloc(sizeof(UiListView));
+memset(uicbox, 0, sizeof(UiListView));
 uicbox->obj = obj;
 uicbox->widget = combobox;
 UiList *list = var ? var->value : NULL;
 GtkListStore *listmodel = create_list_store(list, model);
+if(!list && elm && nelm > 0) {
+listview_copy_static_elements(uicbox, elm, nelm);
+for(int i=0;i<nelm;i++) {
+GtkTreeIter iter;
+GValue value = G_VALUE_INIT;
+gtk_list_store_insert(listmodel, &iter, -1);
+g_value_init(&value, G_TYPE_STRING);
+g_value_set_string(&value, uicbox->elements[i]);
+gtk_list_store_set_value(listmodel, &iter, 0, &value);
+}
+}
 if(listmodel) {
 gtk_combo_box_set_model(GTK_COMBO_BOX(combobox), GTK_TREE_MODEL(listmodel));
 g_object_unref(listmodel);
 }
 UiEventData *event = ui_malloc(obj->ctx, sizeof(UiEventData));
 event->obj = obj;
 event->userdata = udata;
 event->callback = f;
 event->value = 0;
-event->customdata = NULL;
+event->customdata = uicbox;
 g_signal_connect(
 combobox,
 "changed",
 G_CALLBACK(ui_combobox_change_event),
 return combobox;
 }
 void ui_combobox_change_event(GtkComboBox *widget, UiEventData *e) {
+int index = gtk_combo_box_get_active(widget);
+UiListView *listview = e->customdata;
+void *eventdata = NULL;
+if(listview->var && listview->var->value) {
+UiList *list = listview->var->value;
+eventdata = ui_list_get(list, index);
+} else if(listview->elements && listview->nelm > index) {
+eventdata = listview->elements[index];
+}
 UiEvent event;
 event.obj = e->obj;
 event.window = event.obj->window;
 event.document = event.obj->ctx->document;
-event.eventdata = NULL;
+event.eventdata = eventdata;
-event.intval = gtk_combo_box_get_active(widget);
+event.intval = index;
 e->callback(&event, e->userdata);
 }
 void ui_combobox_modelupdate(UiList *list, int i) {
 UiListView *view = list->obj;
 free(v->selection.rows);
 free(v);
 }
 void ui_combobox_destroy(GtkWidget *w, UiListView *v) {
-ui_destroy_boundvar(v->obj->ctx, v->var);
+if(v->var) {
+ui_destroy_boundvar(v->obj->ctx, v->var);
+}
+if(v->elements) {
+for(int i=0;i<v->nelm;i++) {
+free(v->elements[i]);
+}
+free(v->elements);
+}
 free(v);
 }
 /* ------------------------------ Source List ------------------------------ */

Mercurial > hg > toolkit / file comparison

comparison: ui/gtk/list.c

ui/gtk/list.c