[gtk+/wip/baseline2] testbaseline: Add more tests
- From: Alexander Larsson <alexl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/baseline2] testbaseline: Add more tests
- Date: Thu, 21 Mar 2013 22:55:28 +0000 (UTC)
commit 2725f74d92b97ba4de1ca785d50cd94e3ea58605
Author: Alexander Larsson <alexl redhat com>
Date: Thu Mar 21 15:10:02 2013 +0100
testbaseline: Add more tests
tests/testbaseline.c | 109 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 84 insertions(+), 25 deletions(-)
---
diff --git a/tests/testbaseline.c b/tests/testbaseline.c
index 4511960..b540c52 100644
--- a/tests/testbaseline.c
+++ b/tests/testbaseline.c
@@ -18,13 +18,39 @@
#include <gtk/gtk.h>
+static void
+baseline_row_value_changed (GtkSpinButton *spin_button,
+ GtkGrid *grid)
+{
+ gint row = gtk_spin_button_get_value_as_int (spin_button);
+
+ gtk_grid_set_baseline_row (grid, row);
+}
+
+static void
+homogeneous_changed (GtkToggleButton *toggle_button,
+ GtkGrid *grid)
+{
+ gtk_grid_set_row_homogeneous (grid, gtk_toggle_button_get_active (toggle_button));
+}
+
+static void
+baseline_position_changed (GtkComboBox *combo,
+ GtkBox *hbox)
+{
+ int i = gtk_combo_box_get_active (combo);
+
+ gtk_box_set_baseline_position (hbox, i);
+}
+
int
main (int argc,
char **argv)
{
GtkWidget *window, *label, *entry, *button, *grid;
- GtkWidget *vbox, *hbox;
+ GtkWidget *vbox, *hbox, *grid_hbox, *spin, *toggle, *combo;
PangoFontDescription *font;
+ GtkAdjustment *adjustment;
int i, j;
gtk_init (&argc, &argv);
@@ -35,36 +61,38 @@ main (int argc,
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add (GTK_CONTAINER (window), vbox);
- for (j = 0; j < 5; j++)
+ for (j = 0; j < 2; j++)
{
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
- gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 5);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 5);
+
+ char *aligns_names[] = { "FILL", "BASELINE" };
+ GtkAlign aligns[] = { GTK_ALIGN_FILL, GTK_ALIGN_BASELINE};
- char *aligns[] = { "FILL", "START", "END", "CENTER", "BASELINE" };
- label = gtk_label_new (aligns[j]);
+ label = gtk_label_new (aligns_names[j]);
gtk_container_add (GTK_CONTAINER (hbox), label);
for (i = 0; i < 3; i++) {
- label = gtk_label_new ("A string XYyj,Ö...");
+ label = gtk_label_new ("│XYyj,Ö...");
font = pango_font_description_new ();
- pango_font_description_set_size (font, 7*(i+1)* 1024);
+ pango_font_description_set_size (font, 5*(i+1)* 1024);
gtk_widget_override_font (label, font);
- gtk_widget_set_valign (label, j);
+ gtk_widget_set_valign (label, aligns[j]);
gtk_container_add (GTK_CONTAINER (hbox), label);
}
for (i = 0; i < 3; i++) {
entry = gtk_entry_new ();
- gtk_entry_set_text (GTK_ENTRY (entry), "A string XYyj,Ö...");
+ gtk_entry_set_text (GTK_ENTRY (entry), "│XYyj,Ö...");
font = pango_font_description_new ();
- pango_font_description_set_size (font, 9*(i+1)* 1024);
+ pango_font_description_set_size (font, 5*(i+1)* 1024);
gtk_widget_override_font (entry, font);
- gtk_widget_set_valign (entry, j);
+ gtk_widget_set_valign (entry, aligns[j]);
gtk_container_add (GTK_CONTAINER (hbox), entry);
}
@@ -74,7 +102,7 @@ main (int argc,
for (j = 0; j < 2; j++)
{
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
- gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 5);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 5);
if (j == 0)
label = gtk_label_new ("Baseline:");
@@ -87,7 +115,7 @@ main (int argc,
button = gtk_button_new_with_label ("│Xyj,Ö");
font = pango_font_description_new ();
- pango_font_description_set_size (font, 7*(i+1)* 1024);
+ pango_font_description_set_size (font, 5*(i+1)* 1024);
gtk_widget_override_font (button, font);
if (j == 0)
@@ -105,7 +133,7 @@ main (int argc,
gtk_button_set_always_show_image (GTK_BUTTON (button), TRUE);
font = pango_font_description_new ();
- pango_font_description_set_size (font, 7*(i+1)* 1024);
+ pango_font_description_set_size (font, 5*(i+1)* 1024);
gtk_widget_override_font (button, font);
if (j == 0)
@@ -115,33 +143,43 @@ main (int argc,
}
}
+ grid_hbox = hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 5);
+
+ label = gtk_label_new ("Align me:");
+ gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
+
+ gtk_container_add (GTK_CONTAINER (hbox), label);
+
grid = gtk_grid_new ();
+ gtk_widget_set_valign (grid, GTK_ALIGN_BASELINE);
gtk_grid_set_column_spacing (GTK_GRID (grid), 8);
gtk_grid_set_row_spacing (GTK_GRID (grid), 8);
- for (j = 0; j < 3; j++)
+ for (j = 0; j < 4; j++)
{
- if (j != 1)
- label = gtk_label_new ("Baseline:");
- else
- label = gtk_label_new ("Normal:");
+ char *labels[] = { "Normal:", "Baseline (top):", "Baseline (center):", "Baseline (bottom):"};
+ label = gtk_label_new (labels[j]);
gtk_grid_attach (GTK_GRID (grid),
label,
0, j,
1, 1);
-
gtk_widget_set_vexpand (label, TRUE);
+ if (j != 0)
+ gtk_grid_set_row_baseline_position (GTK_GRID (grid),
+ j, (GtkBaselinePosition)(j-1));
+
for (i = 0; i < 3; i++)
{
label = gtk_label_new ("Xyjg,Ö.");
font = pango_font_description_new ();
- pango_font_description_set_size (font, 7*(i+1)* 1024);
+ pango_font_description_set_size (font, 5*(i+1)* 1024);
gtk_widget_override_font (label, font);
- if (j != 1)
+ if (j != 0)
gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
gtk_grid_attach (GTK_GRID (grid),
@@ -159,10 +197,10 @@ main (int argc,
gtk_button_set_always_show_image (GTK_BUTTON (button), TRUE);
font = pango_font_description_new ();
- pango_font_description_set_size (font, 7*(i+1)* 1024);
+ pango_font_description_set_size (font, 5*(i+1)* 1024);
gtk_widget_override_font (button, font);
- if (j != 1)
+ if (j != 0)
gtk_widget_set_valign (button, GTK_ALIGN_BASELINE);
gtk_grid_attach (GTK_GRID (grid),
@@ -173,7 +211,28 @@ main (int argc,
}
- gtk_container_add (GTK_CONTAINER (vbox), grid);
+ gtk_container_add (GTK_CONTAINER (hbox), grid);
+
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 5);
+
+ adjustment = gtk_adjustment_new (0.0, -1.0, 5.0, 1.0, 1.0, 0.0);
+ spin = gtk_spin_button_new (adjustment, 1.0, 0);
+ g_signal_connect (spin, "value-changed", (GCallback)baseline_row_value_changed, grid);
+ gtk_container_add (GTK_CONTAINER (hbox), spin);
+
+ toggle = gtk_toggle_button_new_with_label ("Homogeneous");
+ g_signal_connect (toggle, "toggled", (GCallback)homogeneous_changed, grid);
+ gtk_container_add (GTK_CONTAINER (hbox), toggle);
+
+ combo = gtk_combo_box_text_new ();
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "BASELINE_POSITION_TOP");
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "BASELINE_POSITION_CENTER");
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "BASELINE_POSITION_BOTTOM");
+ gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 1);
+ g_signal_connect (G_OBJECT (combo), "changed",
+ G_CALLBACK (baseline_position_changed), grid_hbox);
+ gtk_container_add (GTK_CONTAINER (hbox), combo);
gtk_widget_show_all (window);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]