Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
gsk: Cosmetics

See merge request GNOME/gtk!5983
This commit is contained in:
Matthias Clasen
2023-05-17 00:58:48 +00:00
parent 2ec1bd7248 4a8a6e9f70
commit 4d66598f31
4 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gsk/gl/gskglcompiler.c
View File

@@ -124,7 +124,7 @@ gsk_gl_compiler_new (GskGLDriver *driver,
self->driver = g_object_ref (driver);
self->debug_shaders = !!debug_shaders;
context = gsk_gl_command_queue_get_context (self->driver->shared_command_queue);
context = gsk_gl_driver_get_context (self->driver);
if (gdk_gl_context_get_use_es (context))
{

2
gsk/gl/gskgldriver.c
View File

@@ -1131,7 +1131,7 @@ gsk_gl_driver_lookup_shader (GskGLDriver *self,
return program;
}
#ifdef G_ENABLE_DEBUG
#if 0
void
gsk_gl_driver_save_texture_to_png (GskGLDriver *driver,
int texture_id,

2
gsk/gl/gskgldriverprivate.h
View File

@@ -175,7 +175,7 @@ GskGLProgram * gsk_gl_driver_lookup_shader (GskGLDriver *s
GskGLShader *shader,
GError **error);
#ifdef G_ENABLE_DEBUG
#if 0
void gsk_gl_driver_save_texture_to_png (GskGLDriver *self,
int texture_id,
int width,

9
testsuite/gtk/propertylookuplistmodel.c
View File

@@ -165,6 +165,7 @@ test_create_empty (void)
GType type;
guint n_items;
char *property;
GObject *object;
model = new_model (FALSE);
assert_model (model, "");
@@ -173,10 +174,12 @@ test_create_empty (void)
g_assert_true (g_list_model_get_item_type (G_LIST_MODEL (model)) == GTK_TYPE_WIDGET);
g_object_get (model,
"item-type", &type,
"object", &object,
"n-items", &n_items,
"property", &property,
NULL);
g_assert_true (type == GTK_TYPE_WIDGET);
g_assert_null (object);
g_assert_true (n_items == 0);
g_assert_cmpstr (property, ==, "parent");
@@ -217,8 +220,12 @@ test_set_object (void)
gtk_property_lookup_list_model_set_object (model, widget);
assert_model (model, "GtkLabel GtkGrid GtkBox GtkWindow");
assert_changes (model, "0+4*");
g_object_unref (model);
g_object_set (model, "object", NULL, NULL);
assert_model (model, "");
assert_changes (model, "0-4*");
g_object_unref (model);
destroy_widgets ();
}