diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2023-04-06 15:06:26 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2023-04-06 15:06:26 +0000 |
| commit | 154ff6fe03bbb86470ad24c59a8f28ab690b1c0c (patch) | |
| tree | 90bc6d99d17d980c8d34b2a9a014303f97b107fd | |
| parent | 9608e4e503df28e31137f4841409876f5aaf1e0d (diff) | |
| parent | a65dc036b19a26a9922cd8f68fb2d71e4bd888d5 (diff) | |
| download | gtk+-154ff6fe03bbb86470ad24c59a8f28ab690b1c0c.tar.gz | |
Merge branch 'matthiasc/for-main' into 'main'
glarea: Fix property notification
See merge request GNOME/gtk!5797
| -rw-r--r-- | gtk/gtkglarea.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/gtk/gtkglarea.c b/gtk/gtkglarea.c index cbd18aebf7..0104fa1c96 100644 --- a/gtk/gtkglarea.c +++ b/gtk/gtkglarea.c @@ -1098,6 +1098,9 @@ gtk_gl_area_set_use_es (GtkGLArea *area, g_return_if_fail (GTK_IS_GL_AREA (area)); g_return_if_fail (!gtk_widget_get_realized (GTK_WIDGET (area))); + if ((priv->allowed_apis == GDK_GL_API_GLES) == use_es) + return; + priv->allowed_apis = use_es ? GDK_GL_API_GLES : GDK_GL_API_GL; g_object_notify_by_pspec (G_OBJECT (area), obj_props[PROP_USE_ES]); @@ -1149,6 +1152,7 @@ gtk_gl_area_set_allowed_apis (GtkGLArea *area, GdkGLAPI apis) { GtkGLAreaPrivate *priv = gtk_gl_area_get_instance_private (area); + GdkGLAPI old_allowed_apis; g_return_if_fail (GTK_IS_GL_AREA (area)); g_return_if_fail (!gtk_widget_get_realized (GTK_WIDGET (area))); @@ -1156,9 +1160,12 @@ gtk_gl_area_set_allowed_apis (GtkGLArea *area, if (priv->allowed_apis == apis) return; + old_allowed_apis = priv->allowed_apis; + priv->allowed_apis = apis; - g_object_notify_by_pspec (G_OBJECT (area), obj_props[PROP_USE_ES]); + if ((old_allowed_apis == GDK_GL_API_GLES) != (apis == GDK_GL_API_GLES)) + g_object_notify_by_pspec (G_OBJECT (area), obj_props[PROP_USE_ES]); g_object_notify_by_pspec (G_OBJECT (area), obj_props[PROP_ALLOWED_APIS]); } |