AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'matthiasc/for-master' into 'master'

Browse Source 
Matthiasc/for master

See merge request GNOME/gtk!2988
This commit is contained in:
Matthias Clasen 2020-12-22 02:29:03 +00:00
commit 6d042d9e61
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gdk/gdkvulkancontext.c
View File

@ -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."; return "An unknown error has occurred; either the application has provided invalid input, or an implementation failure has occurred.";
#endif #endif
#if VK_HEADER_VERSION >= 135 #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: 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."; 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: case VK_THREAD_DONE_KHR:
@ -221,7 +225,7 @@ gdk_vulkan_strerror (VkResult result)
case VK_ERROR_PIPELINE_COMPILE_REQUIRED_EXT: 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."; return "A requested pipeline creation would have required compilation, but the application requested compilation to not be performed.";
#endif #endif
#if VK_HEADER_VERSION < 140 #if VK_HEADER_VERSION < 142
case VK_RESULT_RANGE_SIZE: case VK_RESULT_RANGE_SIZE:
#endif #endif
case VK_RESULT_MAX_ENUM: case VK_RESULT_MAX_ENUM:

5
gtk/gtkmodelbutton.c
View File

@ -73,7 +73,7 @@
* and #GtkModelButton:icon properties. * and #GtkModelButton:icon properties.
* *
* The appearance of model buttons can be influenced with the * 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. * Model buttons have built-in support for submenus in #GtkPopoverMenu.
* To make a GtkModelButton that opens a submenu when activated, set * To make a GtkModelButton that opens a submenu when activated, set
@ -177,7 +177,6 @@ struct _GtkModelButton
GtkEventController *controller; GtkEventController *controller;
guint active : 1; guint active : 1;
guint centered : 1;
guint iconic : 1; guint iconic : 1;
guint keep_open : 1; guint keep_open : 1;
}; };
@ -760,8 +759,6 @@ gtk_model_button_set_iconic (GtkModelButton *self,
gtk_widget_add_css_class (widget, "flat"); gtk_widget_add_css_class (widget, "flat");
} }
self->centered = iconic;
if (!iconic) if (!iconic)
{ {
if (self->start_indicator) if (self->start_indicator)