Add GtkGrid

GtkGrid is a container similar to GtkTable, without legacy
properties and unnecessary restrictions.
It does height-for-width geometry management.

2 files changed, 270 insertions, 0 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 455bf4bf54..6132dc8743 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -48,6 +48,7 @@ noinst_PROGRAMS =  $(TEST_PROGS)	\
 	testfilechooserbutton		\
 	testframe			\
 	testgeometry			\
+	testgrid			\
 	testgtk				\
 	testheightforwidth		\
 	testiconview			\
@@ -137,6 +138,7 @@ testfilechooser_DEPENDENCIES = $(TEST_DEPS)
 testfilechooserbutton_DEPENDENCIES = $(TEST_DEPS)
 testframe_DEPENDENCIES = $(TEST_DEPS)
 testgeometry_DEPENDENCIES = $(TEST_DEPS)
+testgrid_DEPENDENCIES = $(TEST_DEPS)
 testgtk_DEPENDENCIES = $(TEST_DEPS)
 testinput_DEPENDENCIES = $(TEST_DEPS)
 testimage_DEPENDENCIES = $(TEST_DEPS)
@@ -202,6 +204,7 @@ testfilechooser_LDADD = $(LDADDS)
 testfilechooserbutton_LDADD = $(LDADDS)
 testframe_LDADD = $(LDADDS)
 testgeometry_LDADD = $(LDADDS)
+testgrid_LDADD = $(LDADDS)
 testgtk_LDADD = $(LDADDS)
 testheightforwidth_LDADD = $(LDADDS)
 testicontheme_LDADD = $(LDADDS)
@@ -266,6 +269,9 @@ testfilechooserbutton_SOURCES =	\
 	prop-editor.c		\
 	testfilechooserbutton.c
 
+testgrid_SOURCES =	\
+	testgrid.c
+
 testgtk_SOURCES =	\
 	prop-editor.c   \
 	testgtk.c
diff --git a/tests/testgrid.c b/tests/testgrid.c
new file mode 100644
index 0000000000..76d1a8cb52
--- /dev/null
+++ b/tests/testgrid.c
@@ -0,0 +1,264 @@
+#include <gtk/gtk.h>
+
+static GtkWidget *
+oriented_test_widget (const gchar *label, const gchar *color, gdouble angle)
+{
+  GtkWidget *box;
+  GtkWidget *widget;
+  GdkColor c;
+
+  widget = gtk_label_new (label);
+  gtk_label_set_angle (GTK_LABEL (widget), angle);
+  box = gtk_event_box_new ();
+  gdk_color_parse (color, &c);
+  gtk_widget_modify_bg (box, GTK_STATE_NORMAL, &c);
+  gtk_container_add (GTK_CONTAINER (box), widget);
+
+  return box;
+}
+
+static GtkWidget *
+test_widget (const gchar *label, const gchar *color)
+{
+  return oriented_test_widget (label, color, 0.0);
+}
+
+static GtkOrientation o;
+
+static gboolean
+toggle_orientation (GtkWidget *window, GdkEventButton *event, GtkGrid *grid)
+{
+  o = 1 - o;
+
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (grid), o);
+
+  return FALSE;
+}
+
+static void
+simple_grid (void)
+{
+  GtkWidget *window;
+  GtkWidget *grid;
+  GtkWidget *child;
+
+  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  gtk_window_set_title (GTK_WINDOW (window), "Orientation");
+  grid = gtk_grid_new ();
+  gtk_container_add (GTK_CONTAINER (window), grid);
+  g_signal_connect (window, "button-press-event", G_CALLBACK (toggle_orientation), grid);
+
+  gtk_grid_set_column_spacing (GTK_GRID (grid), 5);
+  gtk_grid_set_row_spacing (GTK_GRID (grid), 5);
+  gtk_container_add (GTK_CONTAINER (grid), test_widget ("1", "red"));
+  gtk_container_add (GTK_CONTAINER (grid), test_widget ("2", "green"));
+  gtk_container_add (GTK_CONTAINER (grid), test_widget ("3", "blue"));
+  child = test_widget ("4", "green");
+  gtk_grid_attach (GTK_GRID (grid), child, 0, 1, 1, 1);
+  gtk_widget_set_vexpand (child, TRUE);
+  gtk_grid_attach_next_to (GTK_GRID (grid), test_widget ("5", "blue"), child, GTK_POS_RIGHT, 2, 1);
+  child = test_widget ("6", "yellow");
+  gtk_grid_attach (GTK_GRID (grid), child, -1, 0, 1, 2);
+  gtk_widget_set_hexpand (child, TRUE);
+
+  gtk_widget_show_all (window);
+}
+
+static void
+text_grid (void)
+{
+  GtkWidget *window;
+  GtkWidget *grid;
+  GtkWidget *paned1;
+  GtkWidget *box;
+  GtkWidget *label;
+
+  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  gtk_window_set_title (GTK_WINDOW (window), "Height-for-Width");
+  paned1 = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
+  gtk_container_add (GTK_CONTAINER (window), paned1);
+
+  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
+  gtk_paned_pack1 (GTK_PANED (paned1), box, TRUE, FALSE);
+  gtk_paned_pack2 (GTK_PANED (paned1), gtk_label_new ("Space"), TRUE, FALSE);
+
+  grid = gtk_grid_new ();
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (grid), GTK_ORIENTATION_VERTICAL);
+  gtk_container_add (GTK_CONTAINER (box), gtk_label_new ("Above"));
+  gtk_container_add (GTK_CONTAINER (box), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL));
+  gtk_container_add (GTK_CONTAINER (box), grid);
+  gtk_container_add (GTK_CONTAINER (box), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL));
+  gtk_container_add (GTK_CONTAINER (box), gtk_label_new ("Below"));
+
+  label = gtk_label_new ("Some text that may wrap if it has to");
+  gtk_label_set_width_chars (GTK_LABEL (label), 10);
+  gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+  gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1);
+
+  gtk_grid_attach (GTK_GRID (grid), test_widget ("1", "red"), 1, 0, 1, 1);
+  gtk_grid_attach (GTK_GRID (grid), test_widget ("2", "blue"), 0, 1, 1, 1);
+
+  label = gtk_label_new ("Some text that may wrap if it has to");
+  gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
+  gtk_label_set_width_chars (GTK_LABEL (label), 10);
+  gtk_grid_attach (GTK_GRID (grid), label, 1, 1, 1, 1);
+
+  gtk_widget_show_all (window);
+}
+
+static void
+box_comparison (void)
+{
+  GtkWidget *window;
+  GtkWidget *vbox;
+  GtkWidget *box;
+  GtkWidget *label;
+  GtkWidget *grid;
+
+  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  gtk_window_set_title (GTK_WINDOW (window), "Grid vs. Box");
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 5);
+  gtk_container_add (GTK_CONTAINER (window), vbox);
+
+  gtk_container_add (GTK_CONTAINER (vbox), gtk_label_new ("Above"));
+  gtk_container_add (GTK_CONTAINER (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL));
+
+  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0, FALSE);
+  gtk_container_add (GTK_CONTAINER (vbox), box);
+
+  gtk_box_pack_start (GTK_BOX (box), test_widget ("1", "white"), FALSE, FALSE, 0);
+
+  label = gtk_label_new ("Some ellipsizing text");
+  gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
+  gtk_label_set_width_chars (GTK_LABEL (label), 10);
+  gtk_box_pack_start (GTK_BOX (box), label, TRUE, FALSE, 0);
+
+  gtk_box_pack_start (GTK_BOX (box), test_widget ("2", "green"), FALSE, FALSE, 0);
+
+  label = gtk_label_new ("Some text that may wrap if needed");
+  gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+  gtk_label_set_width_chars (GTK_LABEL (label), 10);
+  gtk_box_pack_start (GTK_BOX (box), label, TRUE, FALSE, 0);
+
+  gtk_box_pack_start (GTK_BOX (box), test_widget ("3", "red"), FALSE, FALSE, 0);
+
+  grid = gtk_grid_new ();
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (grid), GTK_ORIENTATION_VERTICAL);
+  gtk_container_add (GTK_CONTAINER (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL));
+  gtk_container_add (GTK_CONTAINER (vbox), grid);
+
+  gtk_grid_attach (GTK_GRID (grid), test_widget ("1", "white"), 0, 0, 1, 1);
+
+  label = gtk_label_new ("Some ellipsizing text");
+  gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
+  gtk_label_set_width_chars (GTK_LABEL (label), 10);
+  gtk_grid_attach (GTK_GRID (grid), label, 1, 0, 1, 1);
+  gtk_widget_set_hexpand (label, TRUE);
+
+  gtk_grid_attach (GTK_GRID (grid), test_widget ("2", "green"), 2, 0, 1, 1);
+
+  label = gtk_label_new ("Some text that may wrap if needed");
+  gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+  gtk_label_set_width_chars (GTK_LABEL (label), 10);
+  gtk_grid_attach (GTK_GRID (grid), label, 3, 0, 1, 1);
+  gtk_widget_set_hexpand (label, TRUE);
+
+  gtk_grid_attach (GTK_GRID (grid), test_widget ("3", "red"), 4, 0, 1, 1);
+
+  gtk_container_add (GTK_CONTAINER (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL));
+  gtk_container_add (GTK_CONTAINER (vbox), gtk_label_new ("Below"));
+
+  gtk_widget_show_all (window);
+}
+
+static void
+empty_line (void)
+{
+  GtkWidget *window;
+  GtkWidget *grid;
+  GtkWidget *child;
+
+  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  gtk_window_set_title (GTK_WINDOW (window), "Empty row");
+  grid = gtk_grid_new ();
+  gtk_container_add (GTK_CONTAINER (window), grid);
+
+  gtk_grid_set_row_spacing (GTK_GRID (grid), 10);
+  gtk_grid_set_column_spacing (GTK_GRID (grid), 10);
+
+  child = test_widget ("(0, 0)", "red");
+  gtk_grid_attach (GTK_GRID (grid), child, 0, 0, 1, 1);
+  gtk_widget_set_hexpand (child, TRUE);
+  gtk_widget_set_vexpand (child, TRUE);
+
+  gtk_grid_attach (GTK_GRID (grid), test_widget ("(0, 1)", "blue"), 0, 1, 1, 1);
+
+  gtk_grid_attach (GTK_GRID (grid), test_widget ("(10, 0)", "green"), 10, 0, 1, 1);
+  gtk_grid_attach (GTK_GRID (grid), test_widget ("(10, 1)", "magenta"), 10, 1, 1, 1);
+
+  gtk_widget_show_all (window);
+}
+
+static void
+scrolling (void)
+{
+  GtkWidget *window;
+  GtkWidget *sw;
+  GtkWidget *viewport;
+  GtkWidget *grid;
+  GtkWidget *child;
+  gint i;
+
+  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  gtk_window_set_title (GTK_WINDOW (window), "Scrolling");
+  sw = gtk_scrolled_window_new (NULL, NULL);
+  viewport = gtk_viewport_new (NULL, NULL);
+  grid = gtk_grid_new ();
+
+  gtk_container_add (GTK_CONTAINER (window), sw);
+  gtk_container_add (GTK_CONTAINER (sw), viewport);
+  gtk_container_add (GTK_CONTAINER (viewport), grid);
+
+  child = oriented_test_widget ("#800080", "#800080", -45.0);
+  gtk_grid_attach (GTK_GRID (grid), child, 0, 0, 1, 1);
+  gtk_widget_set_hexpand (child, TRUE);
+  gtk_widget_set_vexpand (child, TRUE);
+
+  for (i = 1; i < 16; i++)
+    {
+      gchar *color;
+      color = g_strdup_printf ("#%02x00%02x", 128 + 8*i, 128 - 8*i);
+      child = test_widget (color, color);
+      gtk_grid_attach (GTK_GRID (grid), child, 0, i, i + 1, 1);
+      gtk_widget_set_hexpand (child, TRUE);
+      g_free (color);
+    }
+
+  for (i = 1; i < 16; i++)
+    {
+      gchar *color;
+      color = g_strdup_printf ("#%02x00%02x", 128 - 8*i, 128 + 8*i);
+      child = oriented_test_widget (color, color, -90.0);
+      gtk_grid_attach (GTK_GRID (grid), child, i, 0, 1, i);
+      gtk_widget_set_vexpand (child, TRUE);
+      g_free (color);
+    }
+
+  gtk_widget_show_all (window);
+}
+
+int
+main (int argc, char *argv[])
+{
+  gtk_init (NULL, NULL);
+
+  simple_grid ();
+  text_grid ();
+  box_comparison ();
+  empty_line ();
+  scrolling ();
+
+  gtk_main ();
+
+  return 0;
+}