tests: Update prop-editor adjustment usage for sealing

[~andy/gtk] / tests / testframe.c

diff --git a/tests/testframe.c b/tests/testframe.c
index 1ab6e2902f2170bbe0026d826f08cde5404f8ddd..0070f5a3a9cc987e53e170375c50ba6c9581dfce 100644 (file)
--- a/tests/testframe.c
+++ b/tests/testframe.c
@@ -24,28 +24,68 @@ static void
 spin_ythickness_cb (GtkSpinButton *spin, gpointer user_data)
 {
   GtkWidget *frame = user_data;
-  GtkRcStyle *rcstyle;
-
-  rcstyle = gtk_rc_style_new ();
-  rcstyle->xthickness = gtk_widget_get_style (frame)->xthickness;
-  rcstyle->ythickness = gtk_spin_button_get_value (spin);
-  gtk_widget_modify_style (frame, rcstyle);
-
-  g_object_unref (rcstyle);
+  GtkCssProvider *provider;
+  GtkStyleContext *context;
+  gchar *data;
+  GtkBorder *pad;
+
+  context = gtk_widget_get_style_context (frame);
+  provider = g_object_get_data (G_OBJECT (frame), "provider");
+  if (provider == NULL)
+    {
+      provider = gtk_css_provider_new ();
+      g_object_set_data (G_OBJECT (frame), "provider", provider);
+      gtk_style_context_add_provider (context,
+                                      GTK_STYLE_PROVIDER (provider),
+                                      GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+    }
+
+  gtk_style_context_get (context, 0, "padding", &pad, NULL);
+
+  data = g_strdup_printf ("GtkFrame { padding: %d %d }",
+                          pad->top,
+                          (gint)gtk_spin_button_get_value (spin));
+
+  gtk_css_provider_load_from_data (provider, data, -1, NULL);
+  g_free (data);
+  gtk_border_free (pad);
+
+  gtk_style_context_invalidate (context);
+  gtk_widget_queue_resize (frame);
 }
 
 static void
 spin_xthickness_cb (GtkSpinButton *spin, gpointer user_data)
 {
   GtkWidget *frame = user_data;
-  GtkRcStyle *rcstyle;
-
-  rcstyle = gtk_rc_style_new ();
-  rcstyle->xthickness = gtk_spin_button_get_value (spin);
-  rcstyle->ythickness = gtk_widget_get_style (frame)->ythickness;
-  gtk_widget_modify_style (frame, rcstyle);
-
-  g_object_unref (rcstyle);
+  GtkCssProvider *provider;
+  GtkStyleContext *context;
+  gchar *data;
+  GtkBorder *pad;
+
+  context = gtk_widget_get_style_context (frame);
+  provider = g_object_get_data (G_OBJECT (frame), "provider");
+  if (provider == NULL)
+    {
+      provider = gtk_css_provider_new ();
+      g_object_set_data (G_OBJECT (frame), "provider", provider);
+      gtk_style_context_add_provider (context,
+                                      GTK_STYLE_PROVIDER (provider),
+                                      GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+    }
+
+  gtk_style_context_get (context, 0, "padding", &pad, NULL);
+
+  data = g_strdup_printf ("GtkFrame { padding: %d %d }",
+                          (gint)gtk_spin_button_get_value (spin),
+                          pad->left);
+
+  gtk_css_provider_load_from_data (provider, data, -1, NULL);
+  g_free (data);
+  gtk_border_free (pad);
+
+  gtk_style_context_invalidate (context);
+  gtk_widget_queue_resize (frame);
 }
 
 /* Function to normalize rounding errors in FP arithmetic to
@@ -88,7 +128,8 @@ spin_yalign_cb (GtkSpinButton *spin, GtkFrame *frame)
 
 int main (int argc, char **argv)
 {
-  GtkStyle *style;
+  GtkStyleContext *context;
+  GtkBorder *pad;
   GtkWidget *window, *frame, *xthickness_spin, *ythickness_spin, *vbox;
   GtkWidget *xalign_spin, *yalign_spin, *button, *table, *label;
   gfloat xalign, yalign;
@@ -113,7 +154,8 @@ int main (int argc, char **argv)
   table = gtk_table_new (4, 2, FALSE);
   gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
 
-  style = gtk_widget_get_style (frame);
+  context = gtk_widget_get_style_context (frame);
+  gtk_style_context_get (context, 0, "padding", &pad, NULL);
 
   /* Spin to control xthickness */
   label = gtk_label_new ("xthickness: ");
@@ -121,7 +163,7 @@ int main (int argc, char **argv)
 
   xthickness_spin = gtk_spin_button_new_with_range (0, 250, 1);
   g_signal_connect (G_OBJECT (xthickness_spin), "value-changed", G_CALLBACK (spin_xthickness_cb), frame);
-  gtk_spin_button_set_value (GTK_SPIN_BUTTON (xthickness_spin), style->xthickness);
+  gtk_spin_button_set_value (GTK_SPIN_BUTTON (xthickness_spin), pad->left);
   gtk_table_attach_defaults (GTK_TABLE (table), xthickness_spin, 1, 2, 0, 1);
 
   /* Spin to control ythickness */
@@ -130,9 +172,11 @@ int main (int argc, char **argv)
 
   ythickness_spin = gtk_spin_button_new_with_range (0, 250, 1);
   g_signal_connect (G_OBJECT (ythickness_spin), "value-changed", G_CALLBACK (spin_ythickness_cb), frame);
-  gtk_spin_button_set_value (GTK_SPIN_BUTTON (ythickness_spin), style->ythickness);
+  gtk_spin_button_set_value (GTK_SPIN_BUTTON (ythickness_spin), pad->top);
   gtk_table_attach_defaults (GTK_TABLE (table), ythickness_spin, 1, 2, 1, 2);
 
+  gtk_border_free (pad);
+
   gtk_frame_get_label_align (GTK_FRAME (frame), &xalign, &yalign);
 
   /* Spin to control label xalign */