From c25a13e82d0fc07a0f95a77ad6d60093e242fcc8 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 16 Jan 2025 20:46:31 -0500 Subject: [PATCH 1/2] vulkan: Handle VK_PRESENT_MODE_FIFO_LATEST_READY_EXT Yay for growing enums. --- gdk/gdkvulkancontext.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gdk/gdkvulkancontext.c b/gdk/gdkvulkancontext.c index 08759e1a9bc..3b69ed195e9 100644 --- a/gdk/gdkvulkancontext.c +++ b/gdk/gdkvulkancontext.c @@ -300,6 +300,10 @@ surface_present_mode_to_string (VkPresentModeKHR present_mode) return "VK_PRESENT_MODE_FIFO_KHR"; case VK_PRESENT_MODE_FIFO_RELAXED_KHR: return "VK_PRESENT_MODE_FIFO_RELAXED_KHR"; +#if VK_HEADER_VERSION >= 304 + case VK_PRESENT_MODE_FIFO_LATEST_READY_EXT: + return "VK_PRESENT_MODE_FIFO_LATEST_READY_EXT"; +#endif case VK_PRESENT_MODE_SHARED_DEMAND_REFRESH_KHR: case VK_PRESENT_MODE_SHARED_CONTINUOUS_REFRESH_KHR: case VK_PRESENT_MODE_MAX_ENUM_KHR: -- GitLab From 710aedf3dd7a09bb94707009f6d6a703be6c825b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 16 Jan 2025 20:47:11 -0500 Subject: [PATCH 2/2] filechooser portal: Cosmetics Drop an unnecessary error dialog. --- gtk/gtkfilechoosernativeportal.c | 34 +++++++++++++------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/gtk/gtkfilechoosernativeportal.c b/gtk/gtkfilechoosernativeportal.c index 41b5f8e2f2d..cfdf05b58b4 100644 --- a/gtk/gtkfilechoosernativeportal.c +++ b/gtk/gtkfilechoosernativeportal.c @@ -419,12 +419,11 @@ show_portal_file_chooser (GtkFileChooserNative *self, } if (self->current_file) { - char *path; + const char *path; - path = g_file_get_path (GTK_FILE_CHOOSER_NATIVE (self)->current_file); + path = g_file_peek_path (GTK_FILE_CHOOSER_NATIVE (self)->current_file); g_variant_builder_add (&opt_builder, "{sv}", "current_file", g_variant_new_bytestring (path)); - g_free (path); } if (self->choices) @@ -475,7 +474,6 @@ gtk_file_chooser_native_portal_show (GtkFileChooserNative *self) FilechooserPortalData *data; GtkWindow *transient_for; GDBusConnection *connection; - GtkFileChooserAction action; const char *method_name; GdkDisplay *display; @@ -505,23 +503,19 @@ gtk_file_chooser_native_portal_show (GtkFileChooserNative *self) return TRUE; } - action = gtk_file_chooser_get_action (GTK_FILE_CHOOSER (self)); - - if (action == GTK_FILE_CHOOSER_ACTION_OPEN) - method_name = "OpenFile"; - else if (action == GTK_FILE_CHOOSER_ACTION_SAVE) - method_name = "SaveFile"; - else if (action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER) - method_name = "OpenFile"; - else + switch (gtk_file_chooser_get_action (GTK_FILE_CHOOSER (self))) { - GtkAlertDialog *alert; - - alert = gtk_alert_dialog_new (_("The create-folder action is not supported with portals")); - gtk_alert_dialog_show (alert, transient_for); - g_object_unref (alert); - - return TRUE; + case GTK_FILE_CHOOSER_ACTION_OPEN: + method_name = "OpenFile"; + break; + case GTK_FILE_CHOOSER_ACTION_SAVE: + method_name = "SaveFile"; + break; + case GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER: + method_name = "OpenFile"; + break; + default: + g_assert_not_reached (); } data = g_new0 (FilechooserPortalData, 1); -- GitLab