# HG changeset patch # User Olaf Wintermann # Date 1727618156 -7200 # Node ID d96ba820083ac3145e920c3bfd74c3dcc3bbd654 # Parent b679cc6059abb95d40bce38a29263507f0fd4722 implement file dialog for gtk4 diff -r b679cc6059ab -r d96ba820083a ui/gtk/headerbar.c --- a/ui/gtk/headerbar.c Sun Sep 29 15:01:14 2024 +0200 +++ b/ui/gtk/headerbar.c Sun Sep 29 15:55:56 2024 +0200 @@ -152,19 +152,28 @@ UiObject *obj, enum UiToolbarPos pos) { + + +#if GTK_MAJOR_VERSION >= 4 GtkWidget *menubutton = gtk_menu_button_new(); - if(item->args.label) { gtk_menu_button_set_label(GTK_MENU_BUTTON(menubutton), item->args.label); } if(item->args.icon) { gtk_menu_button_set_icon_name(GTK_MENU_BUTTON(menubutton), item->args.icon); } - + GMenu *menu = g_menu_new(); ui_gmenu_add_menu_items(menu, 0, &item->menu, obj); gtk_menu_button_set_menu_model(GTK_MENU_BUTTON(menubutton), G_MENU_MODEL(menu)); +#else + GtkWidget *menubutton = gtk_menu_button_new(); + + // TODO + + +#endif headerbar_add(headerbar, box, menubutton, pos); } diff -r b679cc6059ab -r d96ba820083a ui/gtk/text.c --- a/ui/gtk/text.c Sun Sep 29 15:01:14 2024 +0200 +++ b/ui/gtk/text.c Sun Sep 29 15:55:56 2024 +0200 @@ -701,7 +701,6 @@ } static void ui_path_textfield_destroy(GtkWidget *object, UiPathTextField *pathtf) { - free(pathtf->hbox); g_object_unref(pathtf->entry); free(pathtf); } diff -r b679cc6059ab -r d96ba820083a ui/gtk/toolkit.c --- a/ui/gtk/toolkit.c Sun Sep 29 15:01:14 2024 +0200 +++ b/ui/gtk/toolkit.c Sun Sep 29 15:55:56 2024 +0200 @@ -394,7 +394,12 @@ size_t numClasses = cx_strsplit_a(cxDefaultAllocator, cx_str(style_classes), CX_STR(" "), 128, &cls); for(int i=0;i= 4 gtk_widget_add_css_class(widget, m.ptr); +#elif GTK_MAJOR_VERSION >= 3 + GtkStyleContext *ctx = gtk_widget_get_style_context(widget); + gtk_style_context_add_class(ctx, m.ptr); +#endif free(m.ptr); } free(cls); diff -r b679cc6059ab -r d96ba820083a ui/gtk/window.c --- a/ui/gtk/window.c Sun Sep 29 15:01:14 2024 +0200 +++ b/ui/gtk/window.c Sun Sep 29 15:55:56 2024 +0200 @@ -259,11 +259,66 @@ } -#if GTK_MAJOR_VERSION >= 4 +#if GTK_MAJOR_VERSION >= 40 static void ui_gtkfilechooser(UiObject *obj, GtkFileChooserAction action, unsigned int mode, ui_callback file_selected_callback, void *cbdata) { // TODO } #else + + + +static void filechooser_response(GtkDialog* self, gint response_id, UiEventData *data) { + UiEvent evt; + evt.obj = data->obj; + evt.document = evt.obj->ctx->document; + evt.window = evt.obj->window; + evt.intval = 0; + + UiFileList flist; + flist.files = NULL; + flist.nfiles = 0; + evt.eventdata = &flist; + + if(response_id == GTK_RESPONSE_ACCEPT) { +#if GTK_CHECK_VERSION(4, 0, 0) + GListModel *selection = gtk_file_chooser_get_files(GTK_FILE_CHOOSER(self)); + flist.nfiles = g_list_model_get_n_items(selection); + flist.files = calloc(flist.nfiles, sizeof(char*)); + for(int i=0;idata; + flist.files[i] = strdup(file); + g_free(file); + selection = selection->next; + i++; + } + g_slist_free(selection); +#endif + } + + + if(data->callback) { + data->callback(&evt, data->userdata); + } + + for(int i=0;iobj = obj; + event->userdata = cbdata; + event->callback = file_selected_callback; + event->value = 0; + event->customdata = NULL; + + g_signal_connect( + dialog, + "response", + G_CALLBACK(filechooser_response), + event); + g_signal_connect( + dialog, + "destroy", + G_CALLBACK(ui_destroy_userdata), + event); + + UiEvent evt; evt.obj = obj; evt.document = evt.obj->ctx->document; @@ -316,31 +390,7 @@ flist.nfiles = 0; evt.eventdata = &flist; - int result = gtk_dialog_run(GTK_DIALOG (dialog)); - GSList *selection = NULL; - if(result == GTK_RESPONSE_ACCEPT) { - selection = gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(dialog)); - flist.nfiles = g_slist_length(selection); - flist.files = calloc(flist.nfiles, sizeof(char*)); - int i = 0; - while(selection) { - flist.files[i] = selection->data; - selection = selection->next; - i++; - } - } - - if(file_selected_callback) { - file_selected_callback(&evt, cbdata); - } - - for(int i=0;i