tests: Update prop-editor adjustment usage for sealing

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

diff --git a/tests/testframe.c b/tests/testframe.c
index 2abb83249b15af7202439363c67319a4d0499971..0070f5a3a9cc987e53e170375c50ba6c9581dfce 100644 (file)
--- a/tests/testframe.c
+++ b/tests/testframe.c
@@ -24,27 +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 (frame)->style->xthickness;
-  rcstyle->ythickness = gtk_spin_button_get_value (spin);
-  gtk_widget_modify_style (frame, rcstyle);
-  gtk_rc_style_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 (frame)->style->ythickness;
-  gtk_widget_modify_style (frame, rcstyle);
-
-  gtk_rc_style_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
@@ -66,21 +107,32 @@ double_normalize (gdouble n)
 static void
 spin_xalign_cb (GtkSpinButton *spin, GtkFrame *frame)
 {
-  gdouble xalign = double_normalize (gtk_spin_button_get_value (spin));
-  gtk_frame_set_label_align (frame, xalign, frame->label_yalign);
+  gdouble xalign;
+  gfloat yalign;
+
+  xalign = double_normalize (gtk_spin_button_get_value (spin));
+  gtk_frame_get_label_align (frame, NULL, &yalign);
+  gtk_frame_set_label_align (frame, xalign, yalign);
 }
 
 static void
 spin_yalign_cb (GtkSpinButton *spin, GtkFrame *frame)
 {
-  gdouble yalign = double_normalize (gtk_spin_button_get_value (spin));
-  gtk_frame_set_label_align (frame, frame->label_xalign, yalign);
+  gdouble yalign;
+  gfloat xalign;
+
+  yalign = double_normalize (gtk_spin_button_get_value (spin));
+  gtk_frame_get_label_align (frame, &xalign, NULL);
+  gtk_frame_set_label_align (frame, xalign, yalign);
 }
 
 int main (int argc, char **argv)
 {
+  GtkStyleContext *context;
+  GtkBorder *pad;
   GtkWidget *window, *frame, *xthickness_spin, *ythickness_spin, *vbox;
   GtkWidget *xalign_spin, *yalign_spin, *button, *table, *label;
+  gfloat xalign, yalign;
 
   gtk_init (&argc, &argv);
 
@@ -90,7 +142,7 @@ int main (int argc, char **argv)
 
   g_signal_connect (G_OBJECT (window), "delete-event", gtk_main_quit, NULL);
 
-  vbox = gtk_vbox_new (FALSE, 5);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
   gtk_container_add (GTK_CONTAINER (window), vbox);
 
   frame = gtk_frame_new ("Testing");
@@ -102,13 +154,16 @@ int main (int argc, char **argv)
   table = gtk_table_new (4, 2, FALSE);
   gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
 
+  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: ");
   gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 0, 1);
 
   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), frame->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 */
@@ -117,16 +172,20 @@ 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), frame->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 */
   label = gtk_label_new ("xalign: ");
   gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 2, 3);
 
   xalign_spin = gtk_spin_button_new_with_range (0.0, 1.0, 0.1);
   g_signal_connect (G_OBJECT (xalign_spin), "value-changed", G_CALLBACK (spin_xalign_cb), frame);
-  gtk_spin_button_set_value (GTK_SPIN_BUTTON (xalign_spin), GTK_FRAME (frame)->label_xalign);
+  gtk_spin_button_set_value (GTK_SPIN_BUTTON (xalign_spin), xalign);
   gtk_table_attach_defaults (GTK_TABLE (table), xalign_spin, 1, 2, 2, 3);
 
   /* Spin to control label yalign */
@@ -135,7 +194,7 @@ int main (int argc, char **argv)
 
   yalign_spin = gtk_spin_button_new_with_range (0.0, 1.0, 0.1);
   g_signal_connect (G_OBJECT (yalign_spin), "value-changed", G_CALLBACK (spin_yalign_cb), frame);
-  gtk_spin_button_set_value (GTK_SPIN_BUTTON (yalign_spin), GTK_FRAME (frame)->label_yalign);
+  gtk_spin_button_set_value (GTK_SPIN_BUTTON (yalign_spin), yalign);
   gtk_table_attach_defaults (GTK_TABLE (table), yalign_spin, 1, 2, 3, 4);
 
   gtk_widget_show_all (window);