stylecontext: Do invalidation on first resize container

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

diff --git a/tests/testfontchooser.c b/tests/testfontchooser.c
index 580c614ebc5ce4ee532bd0f9f7ab5f16a45a384a..a2f54e042eea2e1fdeefe05a84c511df09558e36 100644 (file)
--- a/tests/testfontchooser.c
+++ b/tests/testfontchooser.c
@@ -12,17 +12,35 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gtk/gtk.h>
+#include "prop-editor.h"
 
 static void
-notify_font_name_cb (GObject *fontchooser, GParamSpec *pspec, gpointer data)
+notify_font_cb (GtkFontChooser *fontchooser, GParamSpec *pspec, gpointer data)
 {
-  g_debug ("Changed font name %s", gtk_font_chooser_get_font_name (GTK_FONT_CHOOSER (fontchooser)));
+  PangoFontFamily *family;
+  PangoFontFace *face;
+
+  g_debug ("Changed font name %s", gtk_font_chooser_get_font (fontchooser));
+
+  family = gtk_font_chooser_get_font_family (fontchooser);
+  face = gtk_font_chooser_get_font_face (fontchooser);
+  if (family)
+    {
+       g_debug ("  Family: %s is-monospace:%s",
+                pango_font_family_get_name (family),
+                pango_font_family_is_monospace (family) ? "true" : "false");
+    }
+  else
+    g_debug ("  No font family!");
+
+  if (face)
+    g_debug ("  Face description: %s", pango_font_face_get_face_name (face));
+  else
+    g_debug ("  No font face!");
 }
 
 static void
@@ -31,6 +49,12 @@ notify_preview_text_cb (GObject *fontchooser, GParamSpec *pspec, gpointer data)
   g_debug ("Changed preview text %s", gtk_font_chooser_get_preview_text (GTK_FONT_CHOOSER (fontchooser)));
 }
 
+static void
+font_activated_cb (GtkFontChooser *chooser, const gchar *font_name, gpointer data)
+{
+  g_debug ("font-activated: %s", font_name);
+}
+
 int
 main (int argc, char *argv[])
 {
@@ -40,7 +64,7 @@ main (int argc, char *argv[])
 
   gtk_init (NULL, NULL);
 
-  fontchooser = gtk_font_chooser_new ();
+  fontchooser = gtk_font_chooser_widget_new ();
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_widget_set_size_request (window, 600, 600);
@@ -52,15 +76,19 @@ main (int argc, char *argv[])
 
   g_signal_connect (window, "delete-event",
                     G_CALLBACK (gtk_main_quit), NULL);
-  g_signal_connect (fontchooser, "notify::font-name",
-                    G_CALLBACK (notify_font_name_cb), NULL);
+  g_signal_connect (fontchooser, "notify::font",
+                    G_CALLBACK (notify_font_cb), NULL);
   g_signal_connect (fontchooser, "notify::preview-text",
                     G_CALLBACK (notify_preview_text_cb), NULL);
+  g_signal_connect (fontchooser, "font-activated",
+                    G_CALLBACK (font_activated_cb), NULL);
 
-  gtk_font_chooser_set_font_name (GTK_FONT_CHOOSER (fontchooser), "Bitstream Vera Sans 45");
+  gtk_font_chooser_set_font (GTK_FONT_CHOOSER (fontchooser), "Bitstream Vera Sans 45");
   gtk_font_chooser_set_preview_text (GTK_FONT_CHOOSER (fontchooser), "[user@host ~]$ &>>");
   gtk_font_chooser_set_show_preview_entry (GTK_FONT_CHOOSER (fontchooser), FALSE);
 
+  create_prop_editor (G_OBJECT (fontchooser), GTK_TYPE_FONT_CHOOSER);
+
   gtk_main ();
 
   return 0;