X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=tests%2Ftestellipsise.c;h=291caaf7355966b89db91b696e89f5b48d0641f6;hb=b928664471e13505cfcd923a80266e933d0ad91b;hp=5b8b46dabb47e0a270565a1b0450cb09ee425ca7;hpb=c659d1a505dbf141aefa266fb0e97c6dac218cee;p=~andy%2Fgtk

diff --git a/tests/testellipsise.c b/tests/testellipsise.c
index 5b8b46dab..291caaf73 100644
--- a/tests/testellipsise.c
+++ b/tests/testellipsise.c
@@ -58,80 +58,65 @@ scale_changed_cb (GtkRange *range,
 {
   double angle = gtk_range_get_value (range);
   GtkWidget *label = GTK_WIDGET (data);
-
+  
   gtk_label_set_angle (GTK_LABEL (label), angle);
   redraw_event_box (label);
 }
 
 static gboolean
-ebox_expose_event_cb (GtkWidget      *widget,
-                      GdkEventExpose *event,
-                      gpointer        data)
+ebox_draw_cb (GtkWidget *widget,
+              cairo_t   *cr,
+              gpointer   data)
 {
   PangoLayout *layout;
   const double dashes[] = { 6, 18 };
-  GtkRequisition natural_size;
+  GtkAllocation label_allocation;
+  GtkRequisition minimum_size, natural_size;
   GtkWidget *label = data;
-  gint x, y, dx, dy;
-  gchar *markup;
-  cairo_t *cr;
-
-  gtk_widget_translate_coordinates (label, widget, 0, 0, &x, &y);
+  gint x, y;
 
-  cr = gdk_cairo_create (widget->window);
   cairo_translate (cr, -0.5, -0.5);
   cairo_set_line_width (cr, 1);
 
+  cairo_set_source_rgb (cr, 1, 1, 1);
+  cairo_paint (cr);
+
+  gtk_widget_translate_coordinates (label, widget, 0, 0, &x, &y);
+  layout = gtk_widget_create_pango_layout (widget, "");
+
+  gtk_widget_get_preferred_size (label, &minimum_size, &natural_size); 
+
+  pango_layout_set_markup (layout,
+    "<span color='#c33'>\342\227\217 requisition</span>\n"
+    "<span color='#3c3'>\342\227\217 natural size</span>\n"
+    "<span color='#33c'>\342\227\217 allocation</span>", -1);
+
+  pango_cairo_show_layout (cr, layout);
+  g_object_unref (layout);
+
+  gtk_widget_get_allocation (label, &label_allocation);
+
   cairo_rectangle (cr,
-                   x + 0.5 * (label->allocation.width - label->requisition.width),
-                   y + 0.5 * (label->allocation.height - label->requisition.height),
-                   label->requisition.width, label->requisition.height);
+                   x + 0.5 * (label_allocation.width - minimum_size.width),
+                   y + 0.5 * (label_allocation.height - minimum_size.height),
+                   minimum_size.width, minimum_size.height);
   cairo_set_source_rgb (cr, 0.8, 0.2, 0.2);
   cairo_set_dash (cr, NULL, 0, 0);
   cairo_stroke (cr);
 
-  cairo_rectangle (cr, x, y, label->allocation.width, label->allocation.height);
+  cairo_rectangle (cr, x, y, label_allocation.width, label_allocation.height);
   cairo_set_source_rgb (cr, 0.2, 0.2, 0.8);
   cairo_set_dash (cr, dashes, 2, 0.5);
   cairo_stroke (cr);
 
-  gtk_extended_layout_get_desired_size (GTK_EXTENDED_LAYOUT (label),
-                                        NULL, &natural_size);
-
   cairo_rectangle (cr,
-                   x + 0.5 * (label->allocation.width - natural_size.width),
-                   y + 0.5 * (label->allocation.height - natural_size.height),
+                   x + 0.5 * (label_allocation.width - natural_size.width),
+                   y + 0.5 * (label_allocation.height - natural_size.height),
                    natural_size.width, natural_size.height);
   cairo_set_source_rgb (cr, 0.2, 0.8, 0.2);
   cairo_set_dash (cr, dashes, 2, 12.5);
   cairo_stroke (cr);
 
-  markup = g_strdup_printf (
-    "<span color='#c33'>\342\200\242 requisition:\t%dx%d</span>\n"
-    "<span color='#3c3'>\342\200\242 natural size:\t%dx%d</span>\n"
-    "<span color='#33c'>\342\200\242 allocation:\t%dx%d</span>",
-    label->requisition.width, label->requisition.height,
-    natural_size.width, natural_size.height,
-    label->allocation.width, label->allocation.height);
-
-  layout = gtk_widget_create_pango_layout (widget, NULL);
-  pango_layout_set_markup (layout, markup, -1);
-  pango_layout_get_pixel_size (layout, &dx, &dy);
-
-  g_free (markup);
-
-  cairo_translate (cr, 0, widget->allocation.height - dy - 8);
-
-  cairo_set_source_rgba (cr, 1, 1, 1, 0.8);
-  cairo_rectangle (cr, 0, 0, dx + 12, dy + 8);
-  cairo_fill (cr);
-
-  cairo_translate (cr, 6, 4);
-  pango_cairo_show_layout (cr, layout);
-
-  g_object_unref (layout);
-  cairo_destroy (cr);
-
   return FALSE;
 }
 
@@ -148,17 +133,18 @@ main (int argc, char *argv[])
   gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
   g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_add (GTK_CONTAINER (window), vbox);
 
-  combo = gtk_combo_box_new_text ();
-  scale = gtk_hscale_new_with_range (0, 360, 1);
+  combo = gtk_combo_box_text_new ();
+  scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL,
+                                    0, 360, 1);
   label = gtk_label_new ("This label may be ellipsized\nto make it fit.");
 
-  gtk_combo_box_append_text (GTK_COMBO_BOX (combo), "NONE");
-  gtk_combo_box_append_text (GTK_COMBO_BOX (combo), "START");
-  gtk_combo_box_append_text (GTK_COMBO_BOX (combo), "MIDDLE");
-  gtk_combo_box_append_text (GTK_COMBO_BOX (combo), "END");
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "NONE");
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "START");
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "MIDDLE");
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "END");
   gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0);
 
   align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
@@ -176,7 +162,7 @@ main (int argc, char *argv[])
 
   g_signal_connect (combo, "changed", G_CALLBACK (combo_changed_cb), label);
   g_signal_connect (scale, "value-changed", G_CALLBACK (scale_changed_cb), label);
-  g_signal_connect_after (ebox, "expose-event", G_CALLBACK (ebox_expose_event_cb), label);
+  g_signal_connect (ebox, "draw", G_CALLBACK (ebox_draw_cb), label);
 
   gtk_widget_show_all (window);