diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2020-12-22 02:29:03 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2020-12-22 02:29:03 +0000 |
| commit | 6d042d9e61806c7f6655dee0bb32c55934172c73 (patch) | |
| tree | c226fe34703b0e3df920de5f462df32aa665faa6 | |
| parent | aebf8e3c2996d9fabb3a0ea54884247666c9a8dc (diff) | |
| parent | 4310f24a4eec66ed701500bd56d787c9b5261b33 (diff) | |
| download | gtk+-6d042d9e61806c7f6655dee0bb32c55934172c73.tar.gz | |
Merge branch 'matthiasc/for-master' into 'master'
Matthiasc/for master
See merge request GNOME/gtk!2988
| -rw-r--r-- | gdk/gdkvulkancontext.c | 6 | ||||
| -rw-r--r-- | gtk/gtkmodelbutton.c | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/gdk/gdkvulkancontext.c b/gdk/gdkvulkancontext.c index d0e47055c9..a561476dce 100644 --- a/gdk/gdkvulkancontext.c +++ b/gdk/gdkvulkancontext.c @@ -210,6 +210,10 @@ gdk_vulkan_strerror (VkResult result) return "An unknown error has occurred; either the application has provided invalid input, or an implementation failure has occurred."; #endif #if VK_HEADER_VERSION >= 135 +#if VK_HEADER_VERSION < 162 + case VK_ERROR_INCOMPATIBLE_VERSION_KHR: + return "This error was removed by the Vulkan gods."; +#endif case VK_THREAD_IDLE_KHR: return "A deferred operation is not complete but there is currently no work for this thread to do at the time of this call."; case VK_THREAD_DONE_KHR: @@ -221,7 +225,7 @@ gdk_vulkan_strerror (VkResult result) case VK_ERROR_PIPELINE_COMPILE_REQUIRED_EXT: return "A requested pipeline creation would have required compilation, but the application requested compilation to not be performed."; #endif -#if VK_HEADER_VERSION < 140 +#if VK_HEADER_VERSION < 142 case VK_RESULT_RANGE_SIZE: #endif case VK_RESULT_MAX_ENUM: diff --git a/gtk/gtkmodelbutton.c b/gtk/gtkmodelbutton.c index b644a7fe61..b6ce026da9 100644 --- a/gtk/gtkmodelbutton.c +++ b/gtk/gtkmodelbutton.c @@ -73,7 +73,7 @@ * and #GtkModelButton:icon properties. * * The appearance of model buttons can be influenced with the - * #GtkModelButton:centered and #GtkModelButton:iconic properties. + * #GtkModelButton:iconic property. * * Model buttons have built-in support for submenus in #GtkPopoverMenu. * To make a GtkModelButton that opens a submenu when activated, set @@ -177,7 +177,6 @@ struct _GtkModelButton GtkEventController *controller; guint active : 1; - guint centered : 1; guint iconic : 1; guint keep_open : 1; }; @@ -760,8 +759,6 @@ gtk_model_button_set_iconic (GtkModelButton *self, gtk_widget_add_css_class (widget, "flat"); } - self->centered = iconic; - if (!iconic) { if (self->start_indicator) |