ekiga r6603 - in trunk: . lib/engine/gui/gtk-frontend

[jschamp svn gnome org]

Author: jschamp
Date: Thu Aug 14 04:00:40 2008
New Revision: 6603
URL: http://svn.gnome.org/viewvc/ekiga?rev=6603&view=rev

Log:
Made the text area vertically scrollable (and thus fixed the
automatic resizing issue), added some space between the buttons



Modified:
   trunk/ChangeLog
   trunk/lib/engine/gui/gtk-frontend/chat-area.cpp

Modified: trunk/lib/engine/gui/gtk-frontend/chat-area.cpp
==============================================================================
--- trunk/lib/engine/gui/gtk-frontend/chat-area.cpp	(original)
+++ trunk/lib/engine/gui/gtk-frontend/chat-area.cpp	Thu Aug 14 04:00:40 2008
@@ -54,6 +54,7 @@
   GtkWidget* smiley_menu;
 
   /* we contain those, so no need to unref them */
+  GtkWidget* scrolled_text_window;
   GtkWidget* text_view;
   GtkWidget* entry;
 };
@@ -458,7 +459,14 @@
 					    ChatAreaPrivate);
   self->priv->chat = NULL;
 
-  /* first the area has a text view to display */
+  /* first the area has a text view to display
+     the GtkScrolledWindow is there to make
+     the GtkTextView scrollable */
+
+  self->priv->scrolled_text_window = gtk_scrolled_window_new (NULL, NULL);
+  gtk_scrolled_window_set_policy
+    (GTK_SCROLLED_WINDOW (self->priv->scrolled_text_window),
+     GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
 
   self->priv->text_view = gtk_text_view_new ();
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (self->priv->text_view));
@@ -471,9 +479,11 @@
   gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (self->priv->text_view),
 			       GTK_WRAP_WORD);
 
-  gtk_widget_show (self->priv->text_view);
-  gtk_box_pack_start (GTK_BOX (self), self->priv->text_view,
-		      TRUE, TRUE, 2);
+  gtk_container_add (GTK_CONTAINER (self->priv->scrolled_text_window),
+		     self->priv->text_view);
+  gtk_box_pack_start (GTK_BOX (self),
+		      self->priv->scrolled_text_window, TRUE, TRUE, 2);
+  gtk_widget_show_all (self->priv->scrolled_text_window);
 
   /* then we want to enhance this display */
 
@@ -551,6 +561,10 @@
   gtk_widget_show (vbox);
 
   bbox = gtk_hbutton_box_new ();
+  /* FIXME gtk_box_set_spacing() seems to be neccesary, though we
+     define a padding with the pack() methods */
+  /* FIXME the box doesn't do the 2px space at the left and right edges! */
+  gtk_box_set_spacing (GTK_BOX (bbox), 2);
   gtk_box_pack_start (GTK_BOX (vbox), bbox,
 		      FALSE, TRUE, 2);
   gtk_widget_show (bbox);