callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

testframe: Don’t unnecessarily query the padding

Browse Source 
The [hv]padding variables control and hence track this.
Also, simplify the CSS using shorthand 2-value notation (again).
This commit is contained in:
Daniel Boles 2017-03-07 01:32:24 +00:00
parent ec30a03153
commit 5f24d87a5b
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/testframe.c
View File

@ -27,7 +27,6 @@ spin_hpadding_cb (GtkSpinButton *spin, gpointer user_data)
GtkCssProvider *provider; GtkCssProvider *provider;
GtkStyleContext *context; GtkStyleContext *context;
gchar *data; gchar *data;
GtkBorder pad;
context = gtk_widget_get_style_context (frame); context = gtk_widget_get_style_context (frame);
provider = g_object_get_data (G_OBJECT (frame), "provider"); provider = g_object_get_data (G_OBJECT (frame), "provider");
@ -40,14 +39,9 @@ spin_hpadding_cb (GtkSpinButton *spin, gpointer user_data)
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
} }
gtk_style_context_save (context);
gtk_style_context_set_state (context, GTK_STATE_FLAG_NORMAL);
gtk_style_context_get_padding (context, gtk_style_context_get_state (context), &pad);
gtk_style_context_restore (context);
hpadding = (gint)gtk_spin_button_get_value (spin); hpadding = (gint)gtk_spin_button_get_value (spin);
data = g_strdup_printf ("frame > border { padding: %dpx %dpx %dpx %dpx }", data = g_strdup_printf ("frame > border { padding: %dpx %dpx }",
vpadding, hpadding, vpadding, hpadding); vpadding, hpadding);
gtk_css_provider_load_from_data (provider, data, -1, NULL); gtk_css_provider_load_from_data (provider, data, -1, NULL);
g_free (data); g_free (data);
@ -62,7 +56,6 @@ spin_vpadding_cb (GtkSpinButton *spin, gpointer user_data)
GtkCssProvider *provider; GtkCssProvider *provider;
GtkStyleContext *context; GtkStyleContext *context;
gchar *data; gchar *data;
GtkBorder pad;
context = gtk_widget_get_style_context (frame); context = gtk_widget_get_style_context (frame);
provider = g_object_get_data (G_OBJECT (frame), "provider"); provider = g_object_get_data (G_OBJECT (frame), "provider");
@ -75,14 +68,9 @@ spin_vpadding_cb (GtkSpinButton *spin, gpointer user_data)
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
} }
gtk_style_context_save (context);
gtk_style_context_set_state (context, GTK_STATE_FLAG_NORMAL);
gtk_style_context_get_padding (context, gtk_style_context_get_state (context), &pad);
gtk_style_context_restore (context);
vpadding = (gint)gtk_spin_button_get_value (spin); vpadding = (gint)gtk_spin_button_get_value (spin);
data = g_strdup_printf ("frame > border { padding: %dpx %dpx %dpx %dpx }", data = g_strdup_printf ("frame > border { padding: %dpx %dpx }",
vpadding, hpadding, vpadding, hpadding); vpadding, hpadding);
gtk_css_provider_load_from_data (provider, data, -1, NULL); gtk_css_provider_load_from_data (provider, data, -1, NULL);
g_free (data); g_free (data);