UI tweaks.

diff --git a/src/fields.c b/src/fields.c
index 556bbed6e5694a55fa0bf8bbc02080284c2c16e2..db0e0ea5d3e1eb2d98ac093d4a5843c38cd12c3f 100644 (file)
--- a/src/fields.c
+++ b/src/fields.c
@@ -101,7 +101,7 @@ void fields_page_destroy_contents (void)
 
 GtkWidget *fields_page_contents (void)
 {
-    GtkWidget *table, *widget, *align, *border, *box, *table2, *hbox;
+    GtkWidget *table, *widget, *align, *border, *box, *table2, *hbox, *scroll;
     table = gtk_table_new (4, 5, FALSE);
 
     gtk_table_set_row_spacings (GTK_TABLE(table), 2);
@@ -270,7 +270,13 @@ GtkWidget *fields_page_contents (void)
     gtk_text_set_word_wrap (GTK_TEXT(attdefwidget), TRUE);
     GTK_WIDGET_UNSET_FLAGS (attdefwidget, GTK_CAN_FOCUS);
     gtk_widget_show (attdefwidget);
-    gtk_box_pack_start (GTK_BOX(box), attdefwidget, FALSE, FALSE, 0);
+    scroll = gtk_scrolled_window_new (NULL, NULL);
+    gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(scroll),
+                                    GTK_POLICY_AUTOMATIC,
+                                    GTK_POLICY_AUTOMATIC);
+    gtk_container_add (GTK_CONTAINER(scroll), attdefwidget);
+    gtk_widget_show (scroll);
+    gtk_box_pack_start (GTK_BOX(box), scroll, FALSE, FALSE, 0);
     gtk_widget_show (box);
     align = gtk_alignment_new (0.5, 0.5, 0.5, 0.0);
     gtk_container_add (GTK_CONTAINER(align), box);
@@ -283,7 +289,13 @@ GtkWidget *fields_page_contents (void)
     gtk_widget_set_usize (gmsgtext, 0, 46);
     gtk_widget_show (gmsgtext);
     GTK_WIDGET_UNSET_FLAGS (gmsgtext, GTK_CAN_FOCUS);
-    gtk_table_attach (GTK_TABLE(table2), gmsgtext, 0, 1, 0, 1,
+    scroll = gtk_scrolled_window_new (NULL, NULL);
+    gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(scroll),
+                                    GTK_POLICY_AUTOMATIC,
+                                    GTK_POLICY_AUTOMATIC);
+    gtk_container_add (GTK_CONTAINER(scroll), gmsgtext);
+    gtk_widget_show (scroll);
+    gtk_table_attach (GTK_TABLE(table2), scroll, 0, 1, 0, 1,
                       GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_SHRINK,
                       0, 0);
     gmsginput = gtk_entry_new_with_max_length (128);

diff --git a/src/partyline.c b/src/partyline.c
index fecfab23e3faa82f78980cf79be132218a9fa1c6..571329d337af19cad44b33b81a5613c03d30b1f3 100644 (file)
--- a/src/partyline.c
+++ b/src/partyline.c
@@ -36,7 +36,7 @@ static char *listtitles[] = {
 
 /* widgets that we have to do stuff with */
 static GtkWidget *playerlist, *textbox, *entrybox,
-    *namelabel, *teamlabel, *infolabel;
+    *namelabel, *teamlabel, *infolabel, *textboxscroll;
 
 /* some more widgets for layout */
 static GtkWidget *table, *leftbox, *rightbox;
@@ -58,19 +58,19 @@ GtkWidget *partyline_page_new (void)
     leftbox = gtk_vbox_new (FALSE, 4);
     /* chat thingy */
     /* textbox with scrollbars */
-    box = gtk_hbox_new (FALSE, 0);
     textbox = gtk_text_new (NULL, NULL);
     gtk_text_set_word_wrap (GTK_TEXT(textbox), TRUE);
     GTK_WIDGET_UNSET_FLAGS(textbox, GTK_CAN_FOCUS);
     gtk_signal_connect (GTK_OBJECT(textbox), "button_press_event",
                         GTK_SIGNAL_FUNC(partyline_entryfocus), NULL);
     gtk_widget_show (textbox);
-    gtk_box_pack_start (GTK_BOX(box), textbox, TRUE, TRUE, 0);
-    widget = gtk_vscrollbar_new (GTK_TEXT(textbox)->vadj);
-    gtk_widget_show (widget);
-    gtk_box_pack_start (GTK_BOX(box), widget, FALSE, FALSE, 0);
-    gtk_widget_show (box);
-    gtk_box_pack_start (GTK_BOX(leftbox), box, TRUE, TRUE, 0);
+    textboxscroll = gtk_scrolled_window_new (NULL, NULL);
+    gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(textboxscroll),
+                                   GTK_POLICY_AUTOMATIC,
+                                   GTK_POLICY_ALWAYS);
+    gtk_container_add (GTK_CONTAINER(textboxscroll), textbox);
+    gtk_widget_show(textboxscroll);
+    gtk_box_pack_start (GTK_BOX(leftbox), textboxscroll, TRUE, TRUE, 0);
     /* entry box */
     entrybox = gtk_entry_new_with_max_length (200);
     gtk_signal_connect (GTK_OBJECT(entrybox), "activate",