Improve icon legend appearance a bit

Remove extra space and replace scrolled window with a frame.

diff --git a/src/gtk/icon_legend.c b/src/gtk/icon_legend.c
index 1b3072b93a3c63aea1358f26edd124b8946dca1a..eb89c918dfbb1a50c1638d1affc7cb4bfe9938fb 100644 (file)
--- a/src/gtk/icon_legend.c
+++ b/src/gtk/icon_legend.c
@@ -34,6 +34,7 @@
 #include "prefs_gtk.h"
 
 #define ICONS 23
+#define ROWS ((ICONS % 2 == 0)? ICONS / 2: (ICONS + 1) / 2)
 
 StockPixmap legend_icons[ICONS] = {
        STOCK_PIXMAP_NEW,
@@ -118,8 +119,8 @@ static void legend_create(void)
        GtkWidget *label;
        GtkWidget *icon_label;
        GtkWidget *desc_label;
-       GtkWidget *scrolled_window;
        GtkWidget *table;
+       GtkWidget *frame;
        gint i, j, k;
 
        window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "icon_legend");
@@ -148,12 +149,7 @@ static void legend_create(void)
        gtk_widget_show(label);
        gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
 
-       scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
-                                        GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-       gtk_box_pack_start(GTK_BOX(vbox), scrolled_window, TRUE, TRUE, 0);
-
-       table = gtk_table_new(ICONS, 4, FALSE);
+       table = gtk_table_new(ROWS, 4, FALSE);
        gtk_container_set_border_width(GTK_CONTAINER(table), 8);
        gtk_table_set_row_spacings(GTK_TABLE(table), 4);
        gtk_table_set_col_spacings(GTK_TABLE(table), 8);
@@ -176,8 +172,8 @@ static void legend_create(void)
                }
        }
 
-       gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window),
-                                             table);
+       PACK_FRAME(vbox, frame, NULL);
+       gtk_container_add(GTK_CONTAINER(frame), table);
 
        gtkut_stock_button_set_create(&confirm_area, &close_button, GTK_STOCK_CLOSE,
                                      NULL, NULL, NULL, NULL);