[gnome-control-center/font-viewer-revamp: 3/4] [font-viewer] prevent vertical scrolling on the preview area

[Thomas Wood <thos src gnome org>]

commit 1a8087a18168c369f87b261a0b8607588f65785e
Author: Thomas Wood <thos gnome org>
Date:   Sun Jul 26 20:01:54 2009 +0100

    [font-viewer] prevent vertical scrolling on the preview area
    
    The preview is much wider than it is tall, so it is more advantageous to
    scroll horizontally rather than vertically.

 font-viewer/font-view.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/font-viewer/font-view.c b/font-viewer/font-view.c
index 7f0814a..5ef2f99 100644
--- a/font-viewer/font-view.c
+++ b/font-viewer/font-view.c
@@ -439,6 +439,7 @@ main(int argc, char **argv)
     GtkWidget *window, *hbox, *table, *swin, *drawing_area;
     GdkPixmap *pixmap;
     GdkColor white = { 0, 0xffff, 0xffff, 0xffff };
+    gint height;
 
     bindtextdomain(GETTEXT_PACKAGE, GNOMELOCALEDIR);
     bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
@@ -490,9 +491,8 @@ main(int argc, char **argv)
     gtk_container_add(GTK_CONTAINER(window), hbox);
 
     swin = gtk_scrolled_window_new(NULL, NULL);
-    gtk_widget_set_size_request(swin, 500, 200);
     gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swin),
-				   GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+				   GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER);
     gtk_box_pack_start(GTK_BOX(hbox), swin, TRUE, TRUE, 0);
 
     drawing_area = gtk_drawing_area_new();
@@ -502,6 +502,11 @@ main(int argc, char **argv)
 
     pixmap = create_text_pixmap(drawing_area, face);
 
+    /* set the minimum size on the scrolled window to prevent
+     * unnecessary scrolling */
+    gdk_drawable_get_size (GDK_DRAWABLE (pixmap), NULL, &height);
+    gtk_widget_set_size_request(swin, 500, height + 30);
+
     g_signal_connect(drawing_area, "expose_event",
 		     G_CALLBACK(expose_event), pixmap);
     g_signal_connect(window, "destroy", G_CALLBACK(gtk_main_quit), NULL);